Incorporate Nathan's fix
Merge pull request #4 from dcurrier/master

Incorporate Nathan's fix