update
Merge branch 'master' of https://github.com/mrxiaohe/WRScpp

Conflicts:
	README.md