Bug fix, Error handling.
Merge branch 'master' of github.com:lucaboieru/node-test