prepared 0.9.4 branch