Herman rogers merge

Merge Herman-Rogers back to master.