merge branch 0.1.6