Merge pull request #178 from ripplerm/develop

configurable maxAttempts
Merge remote-tracking branch 'upstream/develop' into develop