adding updates from HPSTR:master
Merge branch 'mmistakes-master'