More cosmetics
Merge pull request #25 from korczis/master

Merge Master to Stable