v2

New functions implemented on 4/may, after discussions and new
objectives.