Added in choice method.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Return the index instead of the choice.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge branch '4.1'