fixes #19
fixes #22
fixes #21
fixes #20
Merge branch 'develop'