JS fix
Merge pull request #62 from canzalon/develop

JS fix