my changes
Merge branch 'lrm' of github.com:kyzhai/SMURF into lrm

forgot to commit this apparently