Update setup version
Fix requires directive in setup.py
Improve exception handling in Registrar
Update version
Merge branch 'develop'

Conflicts:
	setup.py