Merge pull request #1 from benjimarshall/master

Merge