Improves catalog config implementation
Merge pull request #80 from nsendetzky/master

Improves catalog config implementation