Added sending an ack on incoming non-ack message
Merge branch 'peter'