added 'Retry' on error
Merge branch 'retry-on-error' into develop: resolved issue #12