More fixes
Merge branch 'master' into hotfix-comments
Merge pull request #9 from aquilax/hotfix-comments

Hotfix better comments