Merge pull request #29 from GiantCowFilms/master

Updating to master
Merge pull request #33 from GiantCowFilms/X-27Dev

Merge pull request #29 from GiantCowFilms/master