Changed some things
Merge branch 'master' of github.com:openpizza/openpizza