minor fixes
resolving conflicts and merging issue-100 into develop
Merge branch 'issue-100' into develop