Fixed version to 1.0.2
Merge branch '1.0'