fixed some things
git push oMerge branch 'master' of https://github.com/filippobrizzi/soma