Version 1.0 Fixes

Fixed option name prefix and other items.
Merge pull request #1 from sdsweb/dev

Version 1.0 Fixes