for pull
Commit clean

Merge branch 'master' of https://github.com/abarbour/irisws

Conflicts:
	NAMESPACE