Backport to 2.6
Merge pull request #3 from prakashpp/2.6

Backport to 2.6