hahah
merge with no--ff
fix bug 101
merge bug fix 101