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

merge from js
add comments
Merge pull request #204 from forumbyr/master

add comments
add comment
add c
Merge pull request #205 from forumbyr/master

add c
add c
Merge pull request #206 from forumbyr/master

add c
Merge pull request #1 from cnnic/master

m c