Merge pull request #60 from FWAJL/master

Master to DEV
Bug correction: handle quote in SQL data
Merge pull request #61 from FWAJL/Development

Development