Merge branch 'tag_support'

Conflicts:
	setup.py