Update package.json to 3.0.1
Merge remote-tracking branch 'upstream/master'