Merge pull request #1 from sharanf/sharanf-patch-1