Merge pull request #384 from pwnall/update_cpp

Update C++ style guide