Fixed some more things
Merge pull request #9 from CodebyteStudios/Cameron

Fixed some more things