Speed reporting bugfixes, minor speed improvements
Merge branch 'master' of github.com:CRogers/OxSkeiner