Merge pull request #5 from petemmitchell/master

Updating