Issue/fact 472/sync facter 2 to master