Hopefully fixed all compilation issues
Merge pull request #8 from CodebyteStudios/Cameron

Hopefully fixed all compilation issues