changes for confirmation token and other bugs
Merge pull request #116 from deepak496/bugs_11dec_branch

changes for confirmation token and other bugs