fixes #847 Option handling methods should be optional
22 files changed