Trying out mahinders solution to issue 62
(from master branch)
Merge pull request #65 from mityaz/1-3-stable

Trying out mahinders solution to issue 62