Updated to 1.0.1.Final