Merge pull request #37 from bbn-bernard/master

id-chapter9.5