Merge pull request #69 from schumy21/master

Schumy21