merge 0.7.0