Merge pull request #125 from clacote/master

Fixed 16.sql
Merge pull request #126 from clacote/master

Bug fixes