small fixes
Merge branch 'issue-234' into develop
Merge branch 'develop'