beta3
Merge branch 'master' of github.com:Bingo1992/beta