Update for Nathaniel.
Merge pull request #227 from thewatts/patch-1

Update for Nathaniel.