ngp branch commit

Conflicts:
	readme.txt