cbedetti test pull request

update of cbedetti/toad from master