Merge pull request #9 from gmuecke/development

Release 1
fixed test incompatibility with build server
Merge branch 'master' into development
hopefully fixed test incompatibility with build server