Merge pull request #3 from nrleuenb/master

Hopefully I'm not screwing anything up here
Merge pull request #4 from nrleuenb/EmBoyd

Merge pull request #3 from nrleuenb/master