Merge branch 'master' of github.com:turtl/js
wording fix
new wording fix merge