Merge pull request #1 from InMobi/master

Merge
Changes for issue reported in FALCON-397, submitting on behalf of @venkateshs
Merge pull request #18 from sriksun/master

Changes for issue reported in FALCON-397, submitting on behalf of @venkateshs