Auth
Merge branch 'vladimir'