Make appearance nicer.
Merge branch 'master' into TreasureHunter/distribution