Improving Computer Science Education by Charoula Angeli & Djordje Kadijevich