Merge pull request #375 from raphink/dev/facts_perfs