#macplus / added popups #16