refactored the Consumer. fixes #15
Merge pull request #43 from youbs/feat-refactor-consumer

refactored the Consumer. fixes #15