Merge pull request #221 from pbrunet/set_typing

Set typing