Updates and changes
Merge remote-tracking branch 'origin/Niemand-Brunch'