Updated to PM 1.0.4