Stride.cpp ready for merge into master