Fix for #8
Merge pull request #21 from mischak/development

Fix for #8