Fixes from my project :3
Indentation
Merge pull request #671 from comedinha/master

Monsters change