Changed version to 1.0.2
Merge branch 'develop'