Merge pull request #193 from tebriel/master

Merged latest PRs

I approve my PR.
Merge branch 'master' of github.com:mhevery/jasmine-node