Merge pull request #4 from CodebyteStudios/master

Cameron