Added simple token authentication
Merge