Colin was here
Merge pull request #1 from cgc49/master

Trial