Merge pull request #92 from amenk/patch-1