Merge pull request #6 from Vogeltak/master

Merged master with dev
Merge pull request #7 from Vogeltak/dev

Merge pull request #6 from Vogeltak/master