JSed some
Merge pull request #1 from jeversmann/master

JSed some