Fixing issues with building under node 0.10
Merge branch 'node10'