0.0.7: merge branch