merge
Merge remote-tracking branch 'origin/lql' into lql
removed erlang from drift example to compare with grammar branch