Addresses issue #44
Merge pull request #45 from Mafio/master

Addresses issue #44