9.27 update2
Merge pull request #12 from ChilokWang/master

9.27 update2