v2.5 - Fixes #15 and starts to implement #5