Master2u b

@dwightguth please review.
Unfortunately this looks a bit ugly because I got into line ending problems again.