Merge pull request #64 from schumy21/master

Schumy19