Merge pull request #81 from emilsjolander/development

merge from Development
Merge commit 'e763d0db78f8987a1f209a292a8e267bc5e24c2b' into development