Added comments
Merge composer/master