merge with no-ff
fix bug 101
merge fix bug 101
merge the dev branch

Conflicts:
	README.md
add files