JS fix
Merge pull request #61 from canzalon/develop

JS fix