merging the code branch
Merge branch 'interp_dev' of https://github.com/kyzhai/SMURF into interp_dev