Merge all changes made by Malte and Nilsding

This merges all changes made by Malte and Nilsding. Thank you guys for that awesome work!