Bug fix for last commit
Merge pull request #79 from pajcho/development

Bug fix for last commit