changed relation structure
added output formatting
Merge remote-tracking branch 'origin/master'