Merge pull request #5 from britram/master

First pass draft-iab