Some fixes
Merge branch 'master' of github.com:compojoom/lib_compojoom