Merge pull request #699 from yakolee/master

sqlwall improve