wakatara Merge pull request #4 from Sgregory42/patch-1