Merged Nico's config plus extra goodies

Closes #21

Signed-off-by: Quentin