Merge pull request #46 from pakozm/devel

New merge of devel with master
Removed net
Removed net
Removed stats/test/data/sample.txt.gz
Merge branch 'maint'
Merge branch 'pako-devel' into devel