Merge pull request #11 from CacheCake/master

merge
3.2.2
999
Merge pull request #13 from panningwjr/master

merge