Merged matthiasbreuer pull request