Merge pull request #32 from GiantCowFilms/master

Merge pull request #31 from GiantCowFilms/GiantCowFilmsDev
Merge pull request #34 from GiantCowFilms/GiantCowFilmsDev

Merge pull request #32 from GiantCowFilms/master