MAINFEST hostfix
Merge branch 'hotfix/0.0.1' into develop

Conflicts:
	MANIFEST.in
	setup.py