Fix option key fetching
Checking in changes prior to tagging of version 2.0.6.