Merge pull request #1 from korczis/master

Merge korczis master