Simple authorization

merging simple authorization with master