Merge pull request #39 from varholl/master

Master
Fixes
Merge pull request #40 from varholl/development

fixes