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

Issues are fixed