added more config
updated package.json
merge done