v1.0.2

continuing commit
new develop

develop
Merge remote-tracking branch 'origin/develop'