Merge pull request #4 from donthorp/p004-full-compile

Fixed up typos, added two TODOs. 1 for SUBSCRIBE to have a real value from @donthorp
Merge remote-tracking branch 'upstream/master'