Fix #104

This is a pull request for #104.

Unfortunately, there are 3 other commits showing up in the list which I am sure is already merged upstream. I am not sure why this happened. Probably when you merge, git should fast forward it.