Merge pull request #49 from jvrdom/jd-dev

Remove script SQL
Merge pull request #51 from jvrdom/jd-dev

Merge from jd-dev