even littler speedbug
2nd attempt upload littler speedbug - other computer
Merge branch 'jgooderham' into msharman
Issue #134 and #130