Merge pull request #29 from GiantCowFilms/master

Updating to master