Fixed settings panel.
Merge pull request #11 from acperez/development

Fixed settings panel.