changes from kati
Merge branch 'master' of github.com:00stefan00/Gameon