Merge pull request #1 from JinoLi/master

ok