Updated to 1.0.2.Final