Merge pull request #53 from ffrensch/master

commenting out of hbb and hmm
right label
Merge remote-tracking branch 'upstream/master'