Feature added to send extra parameters.

Feature adds an extra param to the constructor to send it to the done function.
Fix changes OK button to confirm.

Fix changes OK Button to confirm when Cancel button is shown.
Merge branch 'fix-confirm-button'