Cosmetics
Merge pull request #24 from korczis/master

Merge Master to Stable