Fix Where before Join statement
Merge pull request #21 from jaapjolman/2.0/develop

Fix Where before Join statement