Merge pull request #19 from GiantCowFilms/master

Merge pull request #18 from GiantCowFilms/GiantCowFilmsDev
Merge pull request #22 from GiantCowFilms/GiantCowFilmsDev

Merge pull request #19 from GiantCowFilms/master