add remember token
Merge branch 'hotfix/0.2.2'