change argument order for Terminal. See #62