Before implementing array expression transformation for subqueries
Fixes #40
Merge origin/master