Merge pull request #1 from simonjbeaumont/master

Syncing with upstream
Craig beat Tony
Merge pull request #4 from craigemery/master

Craig beat Tony