Merge branch 'master' of https://github.com/kyzhai/SMURF into proposal
Merge branch 'proposal' of https://github.com/kyzhai/SMURF into proposal