prepared for deploy
Merge pull request #18 from tiagom87/hot_fixes

prepared for deploy