Merge pull request #4 from JinoLi/master

123