kpi changes, utf-8 and special char fixes
Merge pull request #15 from nuggad/master

kpi changes, utf-8 and special char fixes