Release 0.05 from c0df5a6