Merge pull request #7 from lhenze/master

Sprucing up metadata display
Merge remote-tracking branch 'upstream/master'
formatting