practice adding to a fork
Merge pull request #1 from coconn/master

ok I'm going to confirm merge, lets see how this works!