Fix issue #2
Merge pull request #7 from marcoscarpetta/master

Fix issue #2