Merge pull request #2 from CacheCake/master

merge
Merge pull request #3 from CacheCake/master

merge
4.9
4.9
4.9
Merge pull request #7 from panningwjr/master

merge4.9