Merge remote-tracking branch 'i-c0112/master'

Conflicts:
	README.md
Merge remote-tracking branch 'i-c0112/master'

Conflicts:
	README.md
Merge pull request #11 from peishanyen/master

...