Changes from old repo
Merge pull request #2 from korczis/master

Changes from old repo