Added fit_width and fit_height options