Issues are fixed
Merge pull request #72 from rajthilakmca/master

Issues are fixed