added better node support
Merge pull request #11 from fxa/master

Better node support