Closes #3. Thanks squeek!

Git being dumb and won't let merge, so did it by hand.