First commit, hopefully everything is ok..
Merge http://github.com/ChristofferGoude/1DV450_cg222gb