Updated with version 0.3.0.M4