Settings and Some improvments
Merge branch 'master' of https://github.com/Denni007/4Winns