all seems working, starting optimization
Merge branch 'master' of https://github.com/filippobrizzi/soma
fixed minor bugs