Fixed NODE1 functionality
Merge branch 'master' of https://github.com/brasey/ws-admin