RO-6: edit modules
Merge pull request #6 from WitRange/develop

RO-6: edit modules