Changes made on bug3 branch

Changes made on bug3
Fixing review comments

Fixing review comments
Merge pull request #2 from indraShan/bug3

Changes made on bug3 branch