Fixes #2
Merge pull request #7 from fiveplusone/devel

Fixes #2