Merge remote-tracking branch 'ecometrica/master' v0.4.1

Conflicts:
	setup.py