Use ansi standard SQL as per the coding guidelines
Merge pull request #446 from fahadhatib/develop

Use ansi standard SQL as per the coding guidelines