Norb:
refactored config
Merge pull request #19 from igorez/develop

Norb: