Adding proper credits for Niklas