Merge pull request #89 from markdotto/patch-1