Fixed error under Windows (missed file in the buid)
Merge branch 'dev' into datagraph