Merge 2.0.0-wip into master #64

Closed javier-godoy closed 1 year ago