Takes care of #1. I forked and manually applied the pull request without a branch to reference. This should be much easier for the maintainer to merge now.
