c++ updates
Merge pull request #4 from kmsquire/c++-updates

c++ updates