minor fixes
Merge branch 'issue-219' into develop