Corrected wrongly removed code from commit 3cfcd929448ba295b17d36a4a96de2b87976633b
Merge branch 'master' of https://github.com/cs-au-dk/Artemis