Merge pull request #7 from AlexanderNaehring/master

dev pull
Merge pull request #8 from AlexanderNaehring/dev

Merge pull request #7 from AlexanderNaehring/master