Merge pull request #200 from github/edburns/rework-187-optional

Merge pull request #200 from github/edburns/rework-187-optional #149