Merge pull request #48 from TobyPalmer/Jimmie

Jimmie
Merge remote-tracking branch 'origin/master' into Jimmie