fix bug 101
fix bug 101
conflict fixed
fix bug 101
merged bug fix 101

Conflicts:
	readme.txt