Merge pull request #142 from d3scomp/newgen-iliasg

merging quick fix to master
Merge remote-tracking branch 'origin/master' into newgen-iliasg