add SQL behaviour
Merge branch 'release-1.0.4'