issue #196 issue #195 fixed issues and tests - moved statistics counting out of Get Function
Merge pull request #237 from aurbroszniowski/issue-196

PR #237 closes #196 closes #195 fixed issues and tests