add cell swapping
Merge branch 'master' of https://github.com/conte91/X-Mazzi