Merge branch 'master' of github.com:wallaceyuan/spatest
Merge branch 'master' of github.com:wallaceyuan/spatest

Conflicts:
	spatest/readme.md