v1.0.2
repo conflicts fixed