Merge pull request #4 from kamaradclimber/master

Fix issues created by previous PR
Avoid normal attributes where simple override works

A new upload of nodes file (or knife node edit) might be needed to reset
the normal attributes