Merge pull request #11 from panningwjr/master

merge
Merge pull request #10 from CacheCake/master

merge