Merge pull request #18 from MikeJeong/master

Usermenu update
Merge pull request #6 from ConvTeam/master

Usermenu update