More changes to view
Merge branch 'master' of https://github.com/jgao/tldr