Fixes #122
Merge pull request #125 from sivakumar-kailasam/master

Fixes #122