now it actually works (hope)
bugs fix
Merge branch 'master' into federico