0.4.1: Various improvements and bug fixes