Corrected path problem.
Merge branch 'NOV_branch_0.0.7.0'