Switched to relative imports.
Merge branch 'v0.1.x'

Conflicts:
	setup.py