Rev to 0.0.4-pre