Don't show null objects
Merge branch 'gh-pages' of github.com:va3c/viewer into gh-pages