Merge branch 'june_edit' of https://github.com/congnk/melon.git into june_edit