Fix header guards and namespace trailing comments.
Merge pull request #13 from mkurdej/fix/header-guards

Fix header guards and namespace trailing comments.