Merge pull request #12 from hans-d/fix-hd

fix connection errors / add consumer options
Merge branch 'upstream'