JavaScript version
Merge pull request #4 from ashmoran/master

JavaScript version