Merge pull request #6 from jonathanworth/master

Pulling in any changes Jonathan may have
Manually combined ollieflumeland & jemble changes
Merge pull request #17 from ollieflumeland/master

Pull From Master