Feature/preparegui

Could you please merge that into develop (if it's ok for you) ?

Thx
VIncent