changed token default length
Merge branch 'fix_token_length' into devel