Adding a rudimentary preview window
Merge branch 'master' into gh-pages