Fix settings (run boss)
Merge pull request #15 from bilabou/code_cleanup

Fix settings (run boss)