Merge pull request #29 from f3cuk/master

Sync both versions
Merge pull request #32 from f3cuk/Testbranch

Merge pull request #29 from f3cuk/master