Fixing minor issues.
Merge pull request #2 from pedroigor/master

Fixing minor issues.