minor fixes
Merge branch 'master' of github.com:pierreberthet/demo2.2-bg