Fixed some code errors
Merge pull request #1 from shambu1985/master

Fixed some code errors