Merge branch 'master' into Permission-rewrite
Merge pull request #5 from pinoniq/Permission-rewrite

Merge branch 'master' into Permission-rewrite