Release 4.0.4 #69