Fixes #92
Merge pull request #93 from Jiar/master

Fixes #92