More authentication
Merge branch 'beta'