Fixed issues from first set of comments
Merge pull request #2 from vikassimpragma/b1

Merging the fixes to issues from first set of comments.