Merge branch 'hotfix/0.1.1'
Fixes typo in classifiers.
Merge branch 'hotfix/0.1.2' into develop

Conflicts:
	CHANGES.txt
	setup.py