don't remove attribtues on node
Merge branch 'master' into gh-pages