Fixed some of the bugs
Merge pull request #1 from pradeepchhetri/master

Fixed some of the bugs