Close #58. Changed the @retry from boolean to number
Make retry backward compatible
Fix merge conflict on retries.