Fixed a few stuff
Merge branch 'master' of github.com:kbladin/Modeling-project