super merge
Merge pull request #48 from ecasilla/morejs

super merge