Fixes #40
Merge pull request #41 from chrisfp/dev

Fixes #40