Merge pull request #207 from poupotte/master

debug issue #205
update controller token recovery