fix bug 0.1
feature a 2.0
Merge branch 'fixbug-0.1' into develop
bug-1.1 fixed
Merge branch 'bug-1.1'
feature-a 1.0
Merge branch 'feature-a'