default join bugfix
refactoring
Merge branch 'develop'
version 3.3