* Modified check for pre_option_* to also include option_*

Addresses issue 163 from github

Conflicts:
	readme.txt
Merge pull request #184 from ylefebvre/issue-163

Modified check for pre_option_* to also include option_*