update
Merge pull request #1308 from dynasource/counting-elements

Element counting enhancement