Merge pull request #4 from CodebyteStudios/master

Cameron
Merge pull request #5 from CodebyteStudios/dev

Merge pull request #4 from CodebyteStudios/master