Nick's initial changes, adding -n option