Fixes #269; moved all config to the etc file
Merge branch 'bug/269'