Clean up implementation of resolve_path
Update changelog and version