moved to c++
fix includes
Merge pull request #1 from leifwalsh/cxx

Cxx