Working token save
Working pre beta
Merge pull request #8 from glesage/dev

Working pre beta