v2.7 backport
Merge pull request #39 from SariniLynn/master

v2.7 backport