Fix wrong main path
Merge branch 'master' into npm