0.9.4 merge