Merge pull request #28 from GiantCowFilms/master

Adding Master Changes