Adding support to repl and close #2