Version 2

@dduponchel do you have any thoughts before this gets merged?