LAST COMMIT BEFORE v1.0.4