Fixed some bad formatting and a missing include guard.
Merge pull request #31 from ThePhD/master

Fixed some bad formatting and a missing include guard