Merge pull request #1 from ToastyToast/master

wow
Merge pull request #2 from ToastyToast/search

Merge pull request #1 from ToastyToast/master