Fixed issues
Merge pull request #1 from sureshram/master

Fixed issues