Merge pull request #3 from nrleuenb/master

Hopefully I'm not screwing anything up here