Fixes #151.
Merge pull request #154 from apotheos/master

Fixes #151.