Changed if to check for variable instead of node
Merge branch 'development' of github.com:aakb/odaa_dk into development