Much more cosmetics
Merge pull request #28 from korczis/master

Merge Master to Stable