Merge and squash #23
Release v0.4.1
Merging v4.1 from upstream