Merge pull request #62 from amir20/1.8-fix

Merges latest fixes from my branch
Merge branch 'master' of github.com:sgentle/phantomjs-node