Customize retry time
Modify naming
Merge pull request #117 from KKBOX/master_wendy

Customize retry time
Merge branch 'master' into dev