Merge pull request #12 from CacheCake/master

merge
merge
Merge pull request #14 from panningwjr/master

merge