Fix issues
Merge pull request #16 from rajthilakmca/master

Fix issues