Added autoHeight option