Various improvements
Renamed package.json to package.json.dust to avoid npm publish error
Bug fixes
Updated package.json