add commits
add comments
Merge pull request #201 from forumbyr/master

merge from js