This commit was not squashed so that it can be easily undone when issue #10 is solved. Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>