9.27 update1
Merge pull request #11 from ChilokWang/master

9.27 update1