Merge pull request #52 from viniciusgama/master

Fix for issue #47