Fixes #15
Merge branch 'master' into join