Commit 1.15

Update with token behaviour.