Fixes #13 (in upstream)
Merge pull request #41 from mccartney/master

Fixes #13 (in upstream)