fixed smoke style issue #33 and fixed email is use issue #27