Merge pull request #247 from acz-icm/master

Filtering input data in statistics generator
Fixed errors in statistics generator
Merge branch 'master' of git://github.com/CeON/CoAnSys