v2.0.4 + changes = mycuratio branch