bug fix
Merge composer/master