Merge v0.4 changes from main #61

Closed petebankhead closed 1 year ago