icywind Merge pull request #5 from AgoraIO-Community/dev/refactor1