change structure for git flow style
Merge branch 'release/0.1.6.1'