initial prototype for 2.6
Merge branch 'master' of https://github.com/spiffman/pmc-counting