Merge pull request #1 from gavinmh/master

Updating my fork