fixed #95, #100
Merge composer/master