fixed bug delete with token.
other stuff
Merge remote-tracking branch 'origin/master'