Ready for 0.3 and 0.4