Merge pull request #541 from valentinewallace/fix-node-features