Manual merge of Pull Request #201 by @ChALkeR (Revert "Merge pull request #151 from brunob/hotfixes")