syncing with master

Ok, I have resolved the conflicts. Does it work now?