Apache POI XLSX compatibility

My modifications for issue #52