Included Philipp's changes after peer review.