Merge pull request #32 from Jnesselr/master

Fixes #25 - thanks justin