Fixed: [Issue 125] Support for custom options.

Code cleanup.
8 files changed