another commit
Merge pull request #2 from geoteller34/master

another commit