Corrected some include guards.
Merge pull request #26 from Makman2/head

Corrected some include guards.