Merge branch 'release/1.0.2' into develop
fix test module file name reference
Merge branch 'develop'
Merge branch 'master' into travis-ci