added authorization conditions
added authorization conditions
added authorization control
Merge remote-tracking branch 'clearsoup/master'