Add pmc-analystics
Fix minor bug