Fixed token
Merge branch 'develop'