Merge branch 'hotfix_issue#7' into future
Using a retry dialog to catch intermittent IllegalArgumentException.
Merge branch 'issue#6' into future
Merge branch 'future'