Merge pull request #1 from Ayrx/master

Local Storage // History Tokens // Bug fix