Fixed logger in Demo
fixed copy warning
fixed strtok warning
Merge branch 'master' into Demo
error free main