use method_exists() instead of is_callable() to prevent strict standards error message
Merge remote-tracking branch 'origin/master'