minor fixes
Merge branch 'issue-212' into develop