remove ack
Merge remote-tracking branch 'lanej/master'