minor fixes
Merge branch 'issue-81' into develop