commit by jayli
comti by jayli
1.4 demo modified
commit by jayli
Merge pull request #6 from jayli/master

add 1.4