Merge pull request #25 from GiantCowFilms/master

Updating X-27 Branch