Merge branch 'dev'

merge with no-ff dev
fix issue 101
Merge branch 'dev' with '--no-ff'
Merge branch 'dev' to master
Merge branch 'dev' all
dev have content issue-101