Merge branches 'master' and 'MHD' of http://github.com/BN-KA-KM-H6-DIKU/oop-dicks