Add the class 'Stats' and remove former inner class; update test
Merge pull request #245 from dr0i/stats

Add the class 'Stats' and remove former inner class; update test