fixes done
Merge branch 'issue-205' into develop