katrins changes; update on statistics report + unittests
Merge pull request #7 from naehrlich/master

katrins changes; update on statistics report + unittests