Final small changes
Merge branch 'master' of github.com:Fishgate/BB