More fun with C++
Fixed missing typename
Merge branch '0.9.5' into angle