Fixes #33
Merge branch 'master' of https://github.com/cwrc/CWRC-Dialogs
Merge commit '7ff703b618869d7982fab55fb5a80c0e7e5cdd1c' into orodrigu
Merge branch 'orodrigu'
Code clean up