Fixes #33
Merge pull request #34 from distantcam/master

Fixes #33