Latest changes
Merge branch 'master' of https://github.com/belfazt/MatComp
Fixed stuff, changed scripts and made it look prettier