Fix #163
Merge pull request #165 from iurisilvio/bug_163

Fix #163