Bringing this branch up to version 0.4.1 so that beta testers can
use this alongside the main 0.4.1 release.