Kixunil Merge pull request #38 from DanGould/patch-1