Merge authorization branch with master