Merge pull request #15 from thouveng/separate-configuration

Move the configuration into a separate state