Updated to 0.6.0-M2