Merge pull request #25 from GiantCowFilms/master

Updating X-27 Branch
Merge pull request #26 from GiantCowFilms/X-27Dev

Merge pull request #25 from GiantCowFilms/master