lots of new stuff
Merge branch 'master' of https://github.com/villa7/Blag