Add option parameter to addtoken and addoption

Closes #1