Fix
Merge pull request #11 from pajcho/development

Fix