fixes #15
Merge pull request #44 from rcaravita/master

fixes #15