Merge pull request #10 from CacheCake/master

merge
Merge pull request #12 from panningwjr/master

merge