jaywink Merge pull request #15 from Valodim/patch-1