Merge pull request #14 from CacheCake/master

merge
Merge pull request #15 from CacheCake/master

merge
Merge pull request #16 from panningwjr/master

ko
Merge pull request #17 from GavinRL/master

merge
3.25.1
3.25.1
3.26.1
3.31.1
Merge pull request #5 from CacheCake/master

130331