Corrected parsing errors when hostname has spaces in it.
corrected typo with FactoryAV
Merge branch 'hotfix/parse_spaces'