commit by jayli
Merge pull request #11 from jayli/master

1.3 version => 1.4