Revert pull request #30
Merge pull request #31 from sshirokov/revert-30

Revert pull request #30 -- No more Plus Plus