Merge pull request #31 from GiantCowFilms/GiantCowFilmsDev

Merge pull request #28 from GiantCowFilms/master
Merge pull request #32 from GiantCowFilms/master

Merge pull request #31 from GiantCowFilms/GiantCowFilmsDev