Fix issue #1
Merge remote branch 'issue_1/issue_1'

Conflicts:
	config_form.php
	plugin.php
merged with issue_1 fix