Merge pull request #1 from junlyyouny/master

ok
Merge pull request #2 from junlyyouny/master

.ok
fix bug