Option values

This should fix #1, comes with test case