Add a first draft for #12
Add a first draft for #12
Merge master change
Polished for release #12