fixed bugs
Merge branch 'master' of https://github.com/yurfly/yurfly.github.com