fix autorization
Merge origin/master