Add flipping arrows
Merge origin/master