Mostly bugfixes, with_ngi_config wrapper is still WIP
Merge pull request #45 from mariogiov/devel

Mostly bugfixes, with_ngi_config wrapper is still WIP