fe4aa96 Merge pull request #87 from wilddeer/patch-1