rev to 0.9.4beta