Merge pull request #20 from panningwjr/master

merge
Merge pull request #18 from CacheCake/master

merge