fixed # bug
Merge branch 'master' of https://github.com/yye0528/study.git