Pull 1.0.4 into fork