Move to C++
Merge pull request #1 from jona-t4/branch-2

Move to C++