Merge pull request #1 from ToastyToast/master

wow