Modified count calculation and fixed nomenclature usage
Merge pull request #473 from APAdmin/master

Modified count calculation and fixed nomenclature usage