Updates
Merge branch 'master' of http://github.com/cgkineo/adapt-diffuseAssessment