Merge branch 'next' of github.com:kronusaturn/lw2-viewer into next