Fixes #20
Merge pull request #21 from tdt/development

Fix #20