Merge branch 'hotfix/0.1.2'
Fixes typo in copying and MANIFEST.
Merge branch 'hotfix/0.1.3' into develop

Conflicts:
	CHANGES.txt
	setup.py