Merge pull request #120 from schumy21/master

schumy11