Craig Duncan - 2016-09-21

Great stuff, I've opened some pull requests there to tidy it up a bit.