Fixes
Merge branch 'jj'

Conflicts:
	__init__.py