PENET

parse params
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_module/penet/lib/core.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_module/penet/lib/core.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_module/penet/lib/core.js