0.9.4merge