Fixes #103
Merge pull request #129 from kkasravi/master

Fixes #103
    Fixes #130
Merge pull request #134 from kkasravi/master

Fixes #130
testing codecov.io
Merge pull request #131 from smarthi/suneel

testing codecov.io