Merge branch 'issue54-1'

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/michewan/testQQ