Fixes #115
Merge pull request #116 from elpaso/master

Fixes #115