uniphil Merge pull request #96 from uniphil/change/92-expect …