fixes
Merge branch 'master' of https://github.com/kimama1997/kimama1997.github.com