Updated version number. Also fixes #16
Fixed issue with metadata contaminating data
Fixed several bugs with missing imports and changed variable names
Fixed merge conflicts

Conflicts:
	DESCRIPTION