Merge pull request #14 from panningwjr/master

merge
Merge pull request #13 from CacheCake/master

merge