Update composer, fix #407
Fix the brases to new line
Merge pull request #412 from harikt/nosquash

Sorry no squash, it is easy to start a new branch and work.