1.0 Beta - fix of some bugs and improvements

Change-Id: I170d1c8375cc3a85f1f0f080ef1490c9aa7ef79d
Signed-off-by: Aurélien PIERRE <aurelien@aurelienpierre.com>
Merge branch 'gui'