Added swap(x,y) according to 3.1.3