Merge pull request #1 from jemble/master

Test pull
Updates
Merge pull request #1 from ollieflumeland/master

get latest changes