small issues
Minor fixed
Merge branch 'issue-203' into develop