Merge pull request #1 from eisenachalex/test_branch

first commit
Merge pull request #2 from eisenachalex/master

Merge pull request #1 from eisenachalex/test_branch