Merge pull request #7 from AlexanderNaehring/master

dev pull