* Better pretty printing
* Better descriptions
Merge remote-tracking branch 'origin/master'