New revision following LWG review in Rapperswil.
Fix duplicate ID.
Merge pull request #3 from jwakely/lwg-review

New revision following LWG review in Rapperswil.