Second attempt to pull request

Created by: boyin

This will teach me never to use -f in git, I was totally unable to unwind my way out of the resulting mess. As a result, I deleted the forked repo, re-checked out the original repo, re-committed.

Please close the other pull request if it has not vanished with the first star-crossed repo.