Add #45 and fix image scaling for height/width