This closes #144
This closes #143
Merge pull request #145 from eprogramming/master

Fechando mais 2 issues