0.0.6: merge branch