Merge pull request #89 from csmith/master

Change optionals.
Fix compile error.