Bug fixes.
Recognises flippedData flag.
Aesthetic changes to output.
Bug fixes.
Recognises flippedData flag.
Aesthetic changes to output.
Merge remote-tracking branch 'origin/master'