commit
Merge remote-tracking branch 'albertshaw/master'

Conflicts:
	README.md
Merge pull request #2 from Long-Xiao/master

test