Merge pull request #2 from dirkolbrich/master

merge master back to dev - hotfix-0.3.1
changed dev to hotfix-0.3.1
Merge pull request #3 from dirkolbrich/dev

hotfix-0.3.1 dev to master