Merge pull request #17 from schumy21/master

Schumy
Merge pull request #119 from mackk/master

merge