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

Conflicts:
	readme.txt
finish