merge tidy_up_for_v0.4.0