Dev - merge 1.0.2 for release