Added to and from parameters for resolve, fixes #64