e8johan Merge pull request #4 from e8johan/settings