ii
Merge remote branch 'upstream/master' into current

Conflicts:
	.gitignore
Merge pull request #2 from lucknessbuaa/master

modify the verify function