Composer support and bug fix branch.