Fixed some and testeted
Merge branch 'master' of github.com:steinsholt/Master-Thesis