Updated to 1.0-beta4-pre