WIP: Adding join option
ENHANCEMENT: Module now installable with composer
Merge remote-tracking branch 'origin/dev31'

Conflicts:
	composer.json