Fixes #106
Merge pull request #107 from bleporini/master

Fixes #106