aa
Merged with branch develop
Fixed problem with SQL parser with []