Commit some stuff
Merge pull request #1 from wagnert/master

Commit some stuff