minor fixex
Merge branch 'issue-264' into develop
Merge branch 'develop'