Updates

-Improved some functionality
Merge branch 'master' of https://github.com/cking24343/ToasterSample