Added #ifndef block to fix issues with multiple includes
Merge pull request #1 from sgonzalez/master

Added #ifndef block to fix issues with multiple includes