Link consumer#21

Fix #21 Fix #8 Fix #26