Merge pull request #1 from jemble/master

Update from master
Merge pull request #4 from ollieflumeland/master

new commit