Added max attemps to guaranteed messages
Merge branch 'release/0.3.5'