Merge tim's "ack" option