JS fix
Merge pull request #58 from canzalon/develop

JS fix