fixes #136
follow up on #136
fixes #132
fixes #137
typo
fix for outer join issue
Merge branch 'master' into dev