Merge branch 'pullrequest-30' into develop

fixes #18
fixes #19
fixes #28
fixes #2