Code

Merge and cleanup of GSoC C++-ification project.