Merge pull request #171 from yashodha/issue-9394