fixed tokenformating in input
Merge branch 'master' into jupis