fix #15
fix #13
Merge branch 'master' of https://github.com/s1012703/mokoversity-camp3