More cleanup
Merge branch 'release-1.1.0' of https://github.com/ngerakines/preview into release-1.1.0