bug fix
import / export added