package descriptor fixes
Merge branch 'master' of github.com:pinf/pinf-for-nodejs

Conflicts:
	package.json