tomdeakin Merge pull request #71 from aGIToz/patch-1