Corrected
Merge pull request #26 from tiagom87/hotfixes

Corrected