Expand on `optional`
Merge pull request #391 from dandv/patch-1

Expand on `optional`