Adding changes from Marcio's forked repository
Merge pull request #52 from oliviagj/marcio-bug-fix

Adding changes from Marcio's forked repository