merge with no-ff
fix bug 101
merge bug fix 101
merge
Merge branch 'master' into dev