0.4.1 updates

Conflicts:
	conf.py