issue 2206
issue 2069
Merge pull request #445 from timrae/previewer

Previewer fixes