Merge branch 'hotfix/1.0.1'
added tags for code update
bump version to 1.0.2
Merge branch 'hotfix/1.0.2' into develop