Commit to merge

~ merge v1.0.2 to master