Merge pull request #74 from hsheth2/patch-1