testing
Merge pull request #7 from DominikJS/master

testing