update to new NERD client v0.5
Merge branch 'feature/NERDv0.5' into dev