Fixed minor issues
Merge branch 'issue-29' into develop