Version bump
Add choice fallback for Ruby 1.8