Merge pull request #85 from allanjude/patch-1