1.0 Beta - fix of some bugs and improvements

Change-Id: I3c2f9472c391123f8f5c8105b68d4f7d62e52ff7
Signed-off-by: Aurélien PIERRE <aurelien@aurelienpierre.com>