Changes for better usage

Signed-off-by: Emmanuel Mathot <emmanuel.mahot@gmail.com>