Version 1.0.2.0 for last merge