C++ style
Merge pull request #6 from kobake/cpp-style

C++ style