1st try at pushing
Merge pull request #10 from ChrisEbsch/master

1st try at pushing