Merge pull request #10 from thouveng/seperate-config

Separate the configuration into a specific state