A lot of changes
Merge branch 'master' of github.com:TheRedMood/dot-yeah