Fixes issue #51
Merge pull request #58 from aaccomazzi/master

Fixes issue #51