Initially from PR #2. I just wanted an issue for this to make it visible that this has been requested and is being worked on.
