1. fixed package.json
2. added test cases
merged with origin/master