Merged interpreter.lisp from master