dev branch
fix bug 101
merged bug fix 101
ss
Merge branch 'dev'

Conflicts:
	test.txt