Better handling of callables#1

fernandowaitman merged 4 commits intofernandowaitman:masterfernandowaitman/proof:masterfrom

alexandre-forks:better-handling-of-callablesalexandre-forks/proof:better-handling-of-callablesCopy head branch name to clipboard