add Nack support
better test
Merge branch 'feature/issue-23-102-nack' into develop