setting up units in an assignement the return

[Xavier Ordoquy]

Hi,

I'll hope this time it'll be ok. It still needs somewhere a dialog box
for input error which is left as an exercice ;))

This should close #302

Regards.