11 Commits (feature/settings-window)