Use the option values as option names only if the option is empty
Add a parser which performs binary operations to the current and the parsed value
Update the test app