Merge branch 'orig'

Conflicts:
	README.md
Merge branch 'master' of github.com:chinasaur/qcml