small changes
Merge branch 'master' of https://github.com/sungkwang/test
small changes