Update setup.py
Merge branch 'patch-4' of https://github.com/cool-RR/shpaml into cool-RR-patch-4

Conflicts:
	setup.py
Merge branch 'refs/heads/cool-RR-patch-4'