Fix for issue #3
Merge pull request #4 from szaffarano/fix-issue-3

Fix for issue #3