Cleaning up the options class a little bit.
Merge pull request #31 from chrissalij/options_cleanup

Cleaning up the options class a little bit.