Updated by JS
Merge branch 'master' of https://github.com/jstulips/lovis