#1 - Fixes for non-OptionValues

Issue: #1 (closed)

It worked for OptionValues but there were a couple typos and E_NOTICEs for other entities that prevented it from working for those.

added 3 commits

• a3ec4a8b...65f9a2ab - 2 commits from branch extensions:master
• 60534435 - Merge branch 'master' into 'non-option-values'

Compare with previous version

merged

mentioned in commit 5a30ea7c

Thanks!