merge
Merge branch 'master' of https://github.com/mredar/harvester

Conflicts:
	setup.py