Renamed some options. Bumped version.