Fix some bugs and add comments
Merge branch 'master' of github.com:blittle/node-wrapper