This MR closes issue #53 (closed).
@Armael can you review/check if this sufficient for what you had in mind?