Some testing and fixing
Merge branch 'master' of github.com:Mikkomario/MateDrinkKillRepeat