Simplify npm check
Merge branch 'master' into admit