very minor speed improvements
Merge remote-tracking branch 'origin/master' into cmake
improved cmake