Merge pull request #2 from leomoty/master

syncing
Merge pull request #15 from Timmaeh/dev

Merge pull request #2 from leomoty/master