Fix #25
Merge pull request #26 from tdt/development

Fix #25