Fix malware path
Merge local branch 'dev' for fixing bugs