Merge pull request #68 from gregorybesson/develop

Refactoring authorization layer