* Modified check for pre_option_* to also include option_*

Addresses issue 163 from github

Conflicts:
	readme.txt