Updating to 0.4.1 (work in progress)