Merge pull request #247 from randy-waterhouse/master

C++ flags turned on.