Merge pull request #2 from johankool/master

Fixes
Merge branch 'master' of ssh://github.com/Koolistov/Convenience