Fixes #16
Merge pull request #17 from jamesaanderson/master

Fixes #16