Reverting master to 1.0.2 tag