Updated version for 0.9.7 branch
Merge branch 'master' into simd