Fixed package.json
Merge branch 'step1' into step2