added in a little bit more checking
Merge branch 'code' of github.com:kyzhai/SMURF into code
Merge branch 'code' of github.com:kyzhai/SMURF into code
Merge branch 'code' of github.com:kyzhai/SMURF into code
everything seems to be working