Fix mistakes on previous pull requests
Merge pull request #219 from Marsup/fixes

Fix mistakes on previous pull requests