Merged pull request in emats:patch-1 ...  slight modification made
to check for __call__