NodeJS 0.10.2 compatibility
Merge branch 'develop'