Fix for issue #306
Merge branch 'error-object-as-term' into Fix-settings-issues

Conflicts:
	readme.txt