Merge branch 'resolution_to_factor'