Toast fixes
Toast fixes again
Merge pull request #11 from nt1m/master

Toast fixes