Fixed issues
Merge pull request #43 from rajthilakmca/master

Fixed issues