Handling some issues in enrichment data generation (closes #76)

It was the IDE, I can't claim to have found it on my own ;)