fixes #23, #24
fixes #25
Merge branch 'develop'