Ncd

Merge ncd into master