pull master to deuanz_comatooltip