Fixed Toast issue (Issue #17)