Merge pull request #81 from nabinhait/master

authorization control and company