Make all settings changeable (see Issue #22)
Merge branch 'issue22'