Merging alja's changes with resolved conflict

Hope it works :)