Added '-e' option