Fix typo
Fix race condition on JS inclusion
Merge pull request #37 from bperel/sql_objects_refactoring

Sql objects refactoring fix