9.24 update
Merge pull request #6 from ChilokWang/master

9.24 update