Updated for openpyxl 2.x