update 24 25
Merge pull request #108 from jun-lu/master

update 24 25