Your first pull-request.  Yay open-source!

Take a look at the commits to see my diffs.