Merge pull request #5 from raphink/dev/cleanup

Cleanup, refactor…
Do not call concat::setup anymore