Merge pull request #218 from wmathurin/unstable20

Smart SQL for iOS