Added KPI Support
Merge pull request #2 from omenar/kpi-support

Added KPI Support