fixed #79
fixed #80
Merge pull request #81 from emilsjolander/development

merge from Development