Merge pull request #18 from joshuamaxwell/more-javascript

More javascript
Merge remote-tracking branch 'origin/master' into more-javascript