Updated to 23rd October
Merge pull request #19 from acrossthesound/patch-1

Updated to 23rd October
Merge pull request #20 from SimonbJohnson/master

Sync to master