Made sure if it is already an option, then just return it.
Added the concept of a tuple.
Merge pull request #20 from alexfalkowski/arf/tuple

Arf/tuple