Release 0.04 from 50956ab