Pulled r3wald composer part 2 (pr #2)