Merge pull request #4 from paufsc/master

Fixed
Merge pull request #5 from paufsc/master

Fixed
Merge pull request #19 from saltintop64/master

Package Fixed