Merge branch 'issue/41' into 'master'

Issue #41: Fix join in adapter

See merge request !34
1 job for master in 42 seconds (queued for 7 seconds)