Fixes #769
Merge pull request #18 from kenwheeler/master

Fixes #769