Small fixes and make it work with webpack#2
Open
yktoo wants to merge 2 commits intocornflourblue:masterfrom
yktoo:master
Open
Small fixes and make it work with webpack#2yktoo wants to merge 2 commits intocornflourblue:masterfrom yktoo:master
yktoo wants to merge 2 commits intocornflourblue:masterfrom
yktoo:master