Update for 1.0.2.Final