Merge pull request #34 from cnlpete/c++

C++ Settings