Prototype v1. Name & address ok
Merge branch 'master' of https://github.com/twistedogic/ProjectNS

Conflicts:
	README.md
v2 issue 503