add dev test
add test 2
merge & fix
add test
Merge branch 'dev'

Conflicts:
	readme.txt