Merge pull request #31 from GiantCowFilms/GiantCowFilmsDev

Merge pull request #28 from GiantCowFilms/master