Fix #187. Add the ACK part
Merge pull request #202 from willyaranda/issue/187

Fix #187. Add the ACK part