updated files
Merge pull request #494 from gloryming/master

updated files