Moving last changes to master

accidentally put them into a branch instead of the master.