[#36, #38] change roles
Merge pull request #62 from BrandyMint/development

[#36, #38] change roles