minor fixes
Merge branch 'issue-134' into develop