Merge pull request #170 from lowjoel/use-boost-option
Use boost::optional

(main@2aa0e871bae27b903242f8ee4076514683063ad5)