Merge pull request #270 from acz-icm/master

Work on statistics generator