fix the bug of ndawco
Merge branch 'libertas/dev' into dev

Conflicts:
	divide.py