preference dialog complete
Merge pull request #1835 from diegosarmentero/master

preference dialog complete