Removed duplicate function and duplicate hook-in
Added deprecated notice for 'removed' function
Merge branch 'remove-duplicate-function'

Conflicts:
	readme.txt