9.26 update2
Merge pull request #9 from ChilokWang/master

9.26 update2