Merge pull request #29 from f3cuk/master

Sync both versions