Updated Flip method top take both directions
Merge remote-tracking branch 'origin/dev'