Ready for 1.0.4 tag