Merge pull request #2 from Chalkface/master