MBH: adding changes for dean
Merge branch 'master' of github.com:aims-group/sample