Merge pull request #7 from nrleuenb/master

Adding
Merge pull request #8 from nrleuenb/EmBoyd

Merge pull request #8 from nrleuenb/master