more authentication
merging branch to master