diff --git a/_common.php b/_common.php
index 2ed94c3fb..e29eb0bc1 100644
--- a/_common.php
+++ b/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('./common.php');
-?>
\ No newline at end of file
+include_once('./common.php');
\ No newline at end of file
diff --git a/_head.php b/_head.php
index 79e267fb7..2a12509c5 100644
--- a/_head.php
+++ b/_head.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_PATH.'/head.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/head.php');
\ No newline at end of file
diff --git a/_tail.php b/_tail.php
index ae47c3b51..d4b52cfec 100644
--- a/_tail.php
+++ b/_tail.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.php');
\ No newline at end of file
diff --git a/adm/_common.php b/adm/_common.php
index 316c629c3..a61a0623a 100644
--- a/adm/_common.php
+++ b/adm/_common.php
@@ -7,5 +7,4 @@ if( isset($token) ){
     $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
 }
 
-run_event('admin_common');
-?>
\ No newline at end of file
+run_event('admin_common');
\ No newline at end of file
diff --git a/adm/admin.head.php b/adm/admin.head.php
index 53adc6e39..0f91ddbd1 100644
--- a/adm/admin.head.php
+++ b/adm/admin.head.php
@@ -32,17 +32,23 @@ function print_menu2($key, $no='')
 {
     global $menu, $auth_menu, $is_admin, $auth, $g5, $sub_menu;
 
-    $str .= "<ul>";
+    $str = "<ul>";
     for($i=1; $i<count($menu[$key]); $i++)
     {
+        if( ! isset($menu[$key][$i]) ){
+            continue;
+        }
+
         if ($is_admin != 'super' && (!array_key_exists($menu[$key][$i][0],$auth) || !strstr($auth[$menu[$key][$i][0]], 'r')))
             continue;
+        
+        $gnb_grp_div = $gnb_grp_style = '';
 
-        if (($menu[$key][$i][4] == 1 && $gnb_grp_style == false) || ($menu[$key][$i][4] != 1 && $gnb_grp_style == true)) $gnb_grp_div = 'gnb_grp_div';
-        else $gnb_grp_div = '';
+        if (isset($menu[$key][$i][4])){
+            if (($menu[$key][$i][4] == 1 && $gnb_grp_style == false) || ($menu[$key][$i][4] != 1 && $gnb_grp_style == true)) $gnb_grp_div = 'gnb_grp_div';
 
-        if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style';
-        else $gnb_grp_style = '';
+            if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style';
+        }
 
         $current_class = '';
 
@@ -124,7 +130,7 @@ function imageview(id, w, h)
             foreach($amenu as $key=>$value) {
                 $href1 = $href2 = '';
 
-                if ($menu['menu'.$key][0][2]) {
+                if (isset($menu['menu'.$key][0][2]) && $menu['menu'.$key][0][2]) {
                     $href1 = '<a href="'.$menu['menu'.$key][0][2].'" class="gnb_1da">';
                     $href2 = '</a>';
                 } else {
diff --git a/adm/admin.lib.php b/adm/admin.lib.php
index c5d4ada2b..af780a2ff 100644
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@@ -184,7 +184,7 @@ function get_theme_config_value($dir, $key='*')
         } else {
             $keys = array_map('trim', explode(',', $key));
             foreach($keys as $v) {
-                $tconfig[$v] = trim($theme_config[$v]);
+                $tconfig[$v] = isset($theme_config[$v]) ? trim($theme_config[$v]) : '';
             }
         }
     }
@@ -230,6 +230,14 @@ function get_member_id_select($name, $level, $selected="", $event="")
     return $str;
 }
 
+// php8 버전 호환 권한 검사 함수
+function auth_check_menu($auth, $sub_menu, $attr, $return=false) {
+
+    $check_auth = isset($auth[$sub_menu]) ? $auth[$sub_menu] : '';
+    return auth_check($check_auth, $attr, $return);
+
+}
+
 // 권한 검사
 function auth_check($auth, $attr, $return=false)
 {
@@ -435,7 +443,7 @@ function check_admin_token()
 // 관리자 페이지 referer 체크
 function admin_referer_check($return=false)
 {
-    $referer = trim($_SERVER['HTTP_REFERER']);
+    $referer = isset($_SERVER['HTTP_REFERER']) ? trim($_SERVER['HTTP_REFERER']) : '';
     if(!$referer) {
         $msg = '정보가 올바르지 않습니다.';
 
@@ -511,7 +519,7 @@ function admin_menu_find_by($call, $search_key){
     }
 
     if( isset($cache_menu[$call]) && isset($cache_menu[$call][$search_key]) ){
-        return$cache_menu[$call][$search_key];
+        return $cache_menu[$call][$search_key];
     }
 
     return '';
@@ -551,7 +559,11 @@ if (get_session('ss_mb_key') !== $admin_key) {
     alert_close('정상적으로 로그인하여 접근하시기 바랍니다.');
 }
 
-@ksort($auth);
+if(isset($auth) && is_array($auth)) {
+    @ksort($auth);
+} else {
+    $auth = array();
+}
 
 // 가변 메뉴
 unset($auth_menu);
@@ -592,5 +604,4 @@ if ( isset($_REQUEST) && $_REQUEST ){
 }
 
 // 관리자에서는 추가 스크립트는 사용하지 않는다.
-//$config['cf_add_script'] = '';
-?>
\ No newline at end of file
+//$config['cf_add_script'] = '';
\ No newline at end of file
diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php
index 6658e18c5..3f1455db5 100644
--- a/adm/admin.menu100.php
+++ b/adm/admin.menu100.php
@@ -20,5 +20,4 @@ if(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') &&
 }
 
 $menu['menu100'][] = array('100410', 'DB업그레이드', G5_ADMIN_URL.'/dbupgrade.php', 'db_upgrade');
-$menu['menu100'][] = array('100400', '부가서비스', G5_ADMIN_URL.'/service.php', 'cf_service');
-?>
\ No newline at end of file
+$menu['menu100'][] = array('100400', '부가서비스', G5_ADMIN_URL.'/service.php', 'cf_service');
\ No newline at end of file
diff --git a/adm/admin.menu200.php b/adm/admin.menu200.php
index 1e41855db..eec9564e7 100644
--- a/adm/admin.menu200.php
+++ b/adm/admin.menu200.php
@@ -8,5 +8,4 @@ $menu['menu200'] = array (
     array('200820', '접속자로그삭제', G5_ADMIN_URL.'/visit_delete.php', 'mb_delete', 1),
     array('200200', '포인트관리', G5_ADMIN_URL.'/point_list.php', 'mb_point'),
     array('200900', '투표관리', G5_ADMIN_URL.'/poll_list.php', 'mb_poll')
-);
-?>
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/adm/admin.menu300.php b/adm/admin.menu300.php
index 65f848587..4af1e15ba 100644
--- a/adm/admin.menu300.php
+++ b/adm/admin.menu300.php
@@ -9,5 +9,4 @@ $menu['menu300'] = array (
     array('300600', '내용관리', G5_ADMIN_URL.'/contentlist.php', 'scf_contents', 1),
     array('300700', 'FAQ관리', G5_ADMIN_URL.'/faqmasterlist.php', 'scf_faq', 1),
     array('300820', '글,댓글 현황', G5_ADMIN_URL.'/write_count.php', 'scf_write_count'),
-);
-?>
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/adm/admin.menu900.php b/adm/admin.menu900.php
index f8d4fb063..0d911ce1a 100644
--- a/adm/admin.menu900.php
+++ b/adm/admin.menu900.php
@@ -11,5 +11,4 @@ $menu["menu900"] = array (
     array('900700', '휴대폰번호 그룹', ''.G5_SMS5_ADMIN_URL.'/num_group.php' , 'hp_group', 1),
     array('900800', '휴대폰번호 관리', ''.G5_SMS5_ADMIN_URL.'/num_book.php', 'hp_manage', 1),
     array('900900', '휴대폰번호 파일', ''.G5_SMS5_ADMIN_URL.'/num_book_file.php' , 'hp_file', 1)
-);
-?>
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/adm/admin.tail.php b/adm/admin.tail.php
index 1033fd2f5..3e4944a84 100644
--- a/adm/admin.tail.php
+++ b/adm/admin.tail.php
@@ -150,5 +150,4 @@ function menu_rearrange(el)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/adm/ajax.token.php b/adm/ajax.token.php
index f6a100a1f..74744f5e0 100644
--- a/adm/ajax.token.php
+++ b/adm/ajax.token.php
@@ -10,5 +10,4 @@ if($error)
 
 $token = get_admin_token();
 
-die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
-?>
\ No newline at end of file
+die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
\ No newline at end of file
diff --git a/adm/ajax.use_captcha.php b/adm/ajax.use_captcha.php
index 8f7de32b1..750f4af07 100644
--- a/adm/ajax.use_captcha.php
+++ b/adm/ajax.use_captcha.php
@@ -3,5 +3,4 @@ include_once('./_common.php');
 
 if( isset($_POST['admin_use_captcha']) ){
     set_session('ss_admin_use_captcha', true);
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/adm/auth_list.php b/adm/auth_list.php
index fea4626e8..8391432ef 100644
--- a/adm/auth_list.php
+++ b/adm/auth_list.php
@@ -266,5 +266,4 @@ function fauthlist_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/auth_list_delete.php b/adm/auth_list_delete.php
index c378d75ec..8bce63d36 100644
--- a/adm/auth_list_delete.php
+++ b/adm/auth_list_delete.php
@@ -10,6 +10,7 @@ if ($is_admin != 'super')
 check_admin_token();
 
 $count = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
+$post_act_button = isset($_POST['act_button']) ? clean_xss_tags($_POST['act_button'], 1, 1) : '';
 
 if (!$count)
     alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
@@ -21,10 +22,10 @@ if ( (isset($_POST['mb_id']) && ! is_array($_POST['mb_id'])) || (isset($_POST['a
 for ($i=0; $i<$count; $i++)
 {
     // 실제 번호를 넘김
-    $k = $chk[$i];
+    $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
     
-    $mb_id = preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['mb_id'][$k]);
-    $au_menu = preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['au_menu'][$k]);
+    $mb_id = isset($_POST['mb_id'][$k]) ? preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['mb_id'][$k]) : '';
+    $au_menu = isset($_POST['au_menu'][$k]) ? preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['au_menu'][$k]) : '';
 
     $sql = " delete from {$g5['auth_table']} where mb_id = '".$mb_id."' and au_menu = '".$au_menu."' ";
     sql_query($sql);
@@ -32,5 +33,4 @@ for ($i=0; $i<$count; $i++)
     run_event('adm_auth_delete_member', $mb_id, $au_menu);
 }
 
-goto_url('./auth_list.php?'.$qstr);
-?>
+goto_url('./auth_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/auth_update.php b/adm/auth_update.php
index 4b0a58fef..5f90a056a 100644
--- a/adm/auth_update.php
+++ b/adm/auth_update.php
@@ -3,6 +3,11 @@ $sub_menu = "100200";
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
+$au_menu = isset($_POST['au_menu']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['au_menu']) : '';
+$post_r = isset($_POST['r']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['r']) : '';
+$post_w = isset($_POST['w']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['w']) : '';
+$post_d = isset($_POST['d']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['d']) : '';
+
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
@@ -19,15 +24,15 @@ if (!chk_captcha()) {
 }
 
 $sql = " insert into {$g5['auth_table']}
-            set mb_id   = '{$_POST['mb_id']}',
-                au_menu = '{$_POST['au_menu']}',
-                au_auth = '{$_POST['r']},{$_POST['w']},{$_POST['d']}' ";
+            set mb_id   = '$mb_id',
+                au_menu = '$au_menu',
+                au_auth = '{$post_r},{$post_w},{$post_d}' ";
 $result = sql_query($sql, FALSE);
 if (!$result) {
     $sql = " update {$g5['auth_table']}
-                set au_auth = '{$_POST['r']},{$_POST['w']},{$_POST['d']}'
-              where mb_id   = '{$_POST['mb_id']}'
-                and au_menu = '{$_POST['au_menu']}' ";
+                set au_auth = '{$post_r},{$post_w},{$post_d}'
+              where mb_id   = '$mb_id'
+                and au_menu = '$au_menu' ";
     sql_query($sql);
 }
 
@@ -45,5 +50,4 @@ if( str_replace('-', '', G5_TIME_YMD) !== get_session('adm_auth_update') ){
 
 run_event('adm_auth_update', $mb);
 
-goto_url('./auth_list.php?'.$qstr);
-?>
+goto_url('./auth_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/board_copy.php b/adm/board_copy.php
index fb889174a..f0588585a 100644
--- a/adm/board_copy.php
+++ b/adm/board_copy.php
@@ -2,7 +2,7 @@
 $sub_menu = "300100";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $g5['title'] = '게시판 복사';
 include_once(G5_PATH.'/head.sub.php');
@@ -82,5 +82,4 @@ function fboardcopy_check(f)
 
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index 7a44a9c48..a0452345f 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -4,12 +4,12 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-$target_table   = trim($_POST['target_table']);
-$target_subject = trim($_POST['target_subject']);
+$target_table   = isset($_POST['target_table']) ? trim($_POST['target_table']) : '';
+$target_subject = isset($_POST['target_subject']) ? trim($_POST['target_subject']) : '';
 
 $target_subject = strip_tags(clean_xss_attributes($target_subject));
 
@@ -74,6 +74,7 @@ $sql = " insert into {$g5['board_table']}
                 bo_use_ip_view = '{$board['bo_use_ip_view']}',
                 bo_use_list_view = '{$board['bo_use_list_view']}',
                 bo_use_list_content = '{$board['bo_use_list_content']}',
+                bo_use_list_file = '{$board['bo_use_list_file']}',
                 bo_table_width = '{$board['bo_table_width']}',
                 bo_subject_len = '{$board['bo_subject_len']}',
                 bo_mobile_subject_len = '{$board['bo_mobile_subject_len']}',
@@ -220,4 +221,3 @@ delete_cache_latest($target_table);
 echo "<script>opener.document.location.reload();</script>";
 
 alert("복사에 성공 했습니다.", './board_copy.php?bo_table='.$bo_table.'&amp;'.$qstr);
-?>
\ No newline at end of file
diff --git a/adm/board_delete.inc.php b/adm/board_delete.inc.php
index e043d3555..4e1490520 100644
--- a/adm/board_delete.inc.php
+++ b/adm/board_delete.inc.php
@@ -32,5 +32,4 @@ sql_query(" delete from {$g5['board_good_table']} where bo_table = '{$tmp_bo_tab
 delete_cache_latest($tmp_bo_table);
 
 // 게시판 폴더 전체 삭제
-rm_rf(G5_DATA_PATH.'/file/'.$tmp_bo_table);
-?>
\ No newline at end of file
+rm_rf(G5_DATA_PATH.'/file/'.$tmp_bo_table);
\ No newline at end of file
diff --git a/adm/board_form.php b/adm/board_form.php
index ec8676883..b82ad4eb9 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -3,7 +3,7 @@ $sub_menu = "300100";
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $sql = " select count(*) as cnt from {$g5['group_table']} ";
 $row = sql_fetch($sql);
@@ -11,6 +11,8 @@ if (!$row['cnt'])
     alert('게시판그룹이 한개 이상 생성되어야 합니다.', './boardgroup_form.php');
 
 $html_title = '게시판';
+$reaonly = '';
+$required_valid = '';
 
 if (!isset($board['bo_device'])) {
     // 게시판 사용 필드 추가
@@ -84,6 +86,57 @@ if (!isset($board['bo_select_editor'])) {
     sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` ", false);
 }
 
+$board_default = array(
+'bo_mobile_subject'=>'',
+'bo_device'=>'',
+'bo_use_category'=>0,
+'bo_category_list'=>'',
+'bo_admin'=>'',
+'bo_list_level'=>0,
+'bo_read_level'=>0,
+'bo_write_level'=>0,
+'bo_reply_level'=>0,
+'bo_comment_level'=>0,
+'bo_link_level'=>0,
+'bo_upload_level'=>0,
+'bo_download_level'=>0,
+'bo_html_level'=>0,
+'bo_use_sideview'=>0,
+'bo_select_editor'=>'',
+'bo_use_rss_view'=>0,
+'bo_use_good'=>0,
+'bo_use_nogood'=>0,
+'bo_use_name'=>0,
+'bo_use_signature'=>0,
+'bo_use_ip_view'=>0,
+'bo_use_list_content'=>0,
+'bo_use_list_file'=>0,
+'bo_use_list_view'=>0,
+'bo_use_email'=>0,
+'bo_use_file_content'=>0,
+'bo_use_cert'=>'',
+'bo_write_min'=>0,
+'bo_write_max'=>0,
+'bo_comment_min'=>0,
+'bo_comment_max'=>0,
+'bo_use_sns'=>0,
+'bo_order'=>0,
+'bo_use_captcha'=>0,
+'bo_content_head'=>'',
+'bo_content_tail'=>'',
+'bo_mobile_content_head'=>'',
+'bo_mobile_content_tail'=>'',
+'bo_insert_content'=>'',
+'bo_sort_field'=>'',
+);
+
+for($i=0;$i<=10;$i++){
+    $board_default['bo_'.$i.'_subj'] = '';
+    $board_default['bo_'.$i] = '';
+}
+
+$board = array_merge($board_default, $board);
+
 run_event('adm_board_form_before', $board, $w);
 
 $required = "";
@@ -188,7 +241,7 @@ $pg_anchor = '<ul class="anchor">
         <tr>
             <th scope="row"><label for="bo_table">TABLE<?php echo $sound_only ?></label></th>
             <td colspan="2">
-                <input type="text" name="bo_table" value="<?php echo $board['bo_table'] ?>" id="bo_table" <?php echo $required ?> <?php echo $readonly ?> class="frm_input <?php echo $reaonly ?> <?php echo $required ?> <?php echo $required_valid ?>" maxlength="20">
+                <input type="text" name="bo_table" value="<?php echo $board['bo_table'] ?>" id="bo_table" <?php echo $required ?> <?php echo $readonly ?> class="frm_input <?php echo $readonly ?> <?php echo $required ?> <?php echo $required_valid ?>" maxlength="20">
                 <?php if ($w == '') { ?>
                     영문자, 숫자, _ 만 가능 (공백없이 20자 이내)
                 <?php } else { ?>
@@ -1439,5 +1492,4 @@ function fboardform_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index 79a882870..557a1a2a6 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -5,25 +5,27 @@ include_once('./_common.php');
 if ($w == 'u')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
 $gr_id = isset($_POST['gr_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_POST['gr_id']) : '';
 $bo_admin = isset($_POST['bo_admin']) ? preg_replace('/[^a-z0-9_\, \|\#]/i', '', $_POST['bo_admin']) : '';
+$bo_subject = isset($_POST['bo_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_subject'])) : '';
+$bo_mobile_subject = isset($_POST['bo_mobile_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_mobile_subject'])) : '';
 
 if (!$gr_id) { alert('그룹 ID는 반드시 선택하세요.'); }
 if (!$bo_table) { alert('게시판 TABLE명은 반드시 입력하세요.'); }
 if (!preg_match("/^([A-Za-z0-9_]{1,20})$/", $bo_table)) { alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)'); }
-if (!$_POST['bo_subject']) { alert('게시판 제목을 입력하세요.'); }
+if (!$bo_subject) { alert('게시판 제목을 입력하세요.'); }
 
 // 게시판명이 금지된 단어로 되어 있으면
 if ( $w == '' && in_array($bo_table, get_bo_table_banned_word()) ){
     alert('입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.');
 }
 
-$bo_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($bo_include_head, 0, 255));
-$bo_include_tail = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($bo_include_tail, 0, 255));
+$bo_include_head = isset($_POST['bo_include_head']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['bo_include_head'], 0, 255)) : '';
+$bo_include_tail = isset($_POST['bo_include_tail']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['bo_include_tail'], 0, 255)) : '';
 
 // 관리자가 자동등록방지를 사용해야 할 경우
 if ($board && ($board['bo_include_head'] !== $bo_include_head || $board['bo_include_tail'] !== $bo_include_tail) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
@@ -40,7 +42,6 @@ if ($file = $bo_include_head) {
     if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) || ! preg_match('/^.*\.(php|htm|html)$/i', $file) ) {
         alert('상단 파일 경로의 확장자는 php, htm, html 만 허용합니다.');
     }
-    $_POST['bo_include_head'] = $file;
 }
 
 if ($file = $bo_include_tail) {
@@ -49,7 +50,6 @@ if ($file = $bo_include_tail) {
     if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) || ! preg_match('/^.*\.(php|htm|html)$/i', $file) ) {
         alert('하단 파일 경로의 확장자는 php, htm, html 만 허용합니다.');
     }
-    $_POST['bo_include_tail'] = $file;
 }
 
 if(!is_include_path_check($bo_include_head, 1)) {
@@ -73,10 +73,11 @@ $board_path = G5_DATA_PATH.'/file/'.$bo_table;
 
 // 디렉토리에 있는 파일의 목록을 보이지 않게 한다.
 $file = $board_path . '/index.php';
-$f = @fopen($file, 'w');
-@fwrite($f, '');
-@fclose($f);
-@chmod($file, G5_FILE_PERMISSION);
+if( $f = @fopen($file, 'w') ){
+    @fwrite($f, '');
+    @fclose($f);
+    @chmod($file, G5_FILE_PERMISSION);
+}
 
 // 분류에 & 나 = 는 사용이 불가하므로 2바이트로 바꾼다.
 $src_char = array('&', '=');
@@ -85,108 +86,178 @@ $bo_category_list = isset($_POST['bo_category_list']) ? str_replace($src_char, $
 //https://github.com/gnuboard/gnuboard5/commit/f5f4925d4eb28ba1af728e1065fc2bdd9ce1da58 에 따른 조치
 $str_bo_category_list = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $bo_category_list);
 
-$_POST['bo_subject'] = strip_tags(clean_xss_attributes($_POST['bo_subject']));
-$_POST['bo_mobile_subject'] = strip_tags(clean_xss_attributes($_POST['bo_mobile_subject']));
+$bo_use_category = isset($_POST['bo_use_category']) ? (int) $_POST['bo_use_category'] : 0;
+$bo_use_sideview = isset($_POST['bo_use_sideview']) ? (int) $_POST['bo_use_sideview'] : 0;
+$bo_use_dhtml_editor = isset($_POST['bo_use_dhtml_editor']) ? (int) $_POST['bo_use_dhtml_editor'] : 0;
+$bo_use_good = isset($_POST['bo_use_good']) ? (int) $_POST['bo_use_good'] : 0;
+$bo_use_nogood = isset($_POST['bo_use_nogood']) ? (int) $_POST['bo_use_nogood'] : 0;
+$bo_use_name = isset($_POST['bo_use_name']) ? (int) $_POST['bo_use_name'] : 0;
+$bo_use_signature = isset($_POST['bo_use_signature']) ? (int) $_POST['bo_use_signature'] : 0;
+$bo_use_ip_view = isset($_POST['bo_use_ip_view']) ? (int) $_POST['bo_use_ip_view'] : 0;
+$bo_use_list_view = isset($_POST['bo_use_list_view']) ? (int) $_POST['bo_use_list_view'] : 0;
+$bo_use_list_file = isset($_POST['bo_use_list_file']) ? (int) $_POST['bo_use_list_file'] : 0;
+$bo_use_list_content = isset($_POST['bo_use_list_content']) ? (int) $_POST['bo_use_list_content'] : 0;
+$bo_use_email = isset($_POST['bo_use_email']) ? (int) $_POST['bo_use_email'] : 0;
+$bo_use_sns = isset($_POST['bo_use_sns']) ? (int) $_POST['bo_use_sns'] : 0;
+$bo_use_captcha = isset($_POST['bo_use_captcha']) ? (int) $_POST['bo_use_captcha'] : 0;
+$bo_table_width = isset($_POST['bo_table_width']) ? (int) $_POST['bo_table_width'] : 0;
+$bo_subject_len = isset($_POST['bo_subject_len']) ? (int) $_POST['bo_subject_len'] : 0;
+$bo_mobile_subject_len = isset($_POST['bo_mobile_subject_len']) ? (int) $_POST['bo_mobile_subject_len'] : 0;
+$bo_page_rows = isset($_POST['bo_page_rows']) ? (int) $_POST['bo_page_rows'] : 0;
+$bo_mobile_page_rows = isset($_POST['bo_mobile_page_rows']) ? (int) $_POST['bo_mobile_page_rows'] : 0;
+$bo_use_rss_view = isset($_POST['bo_use_rss_view']) ? (int) $_POST['bo_use_rss_view'] : 0;
+$bo_use_secret = isset($_POST['bo_use_secret']) ? (int) $_POST['bo_use_secret'] : 0;
+$bo_use_file_content = isset($_POST['bo_use_file_content']) ? (int) $_POST['bo_use_file_content'] : 0;
+$bo_new = isset($_POST['bo_new']) ? (int) $_POST['bo_new'] : 0;
+$bo_hot = isset($_POST['bo_hot']) ? (int) $_POST['bo_hot'] : 0;
+$bo_image_width = isset($_POST['bo_image_width']) ? (int) $_POST['bo_image_width'] : 0;
+$bo_use_search = isset($_POST['bo_use_search']) ? (int) $_POST['bo_use_search'] : 0;
+$bo_use_cert = isset($_POST['bo_use_cert']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['bo_use_cert']) : '';
+$bo_device = isset($_POST['bo_device']) ? clean_xss_tags($_POST['bo_device'], 1, 1) : '';
+$bo_list_level = isset($_POST['bo_list_level']) ? (int) $_POST['bo_list_level'] : 0;
+$bo_read_level = isset($_POST['bo_read_level']) ? (int) $_POST['bo_read_level'] : 0;
+$bo_write_level = isset($_POST['bo_write_level']) ? (int) $_POST['bo_write_level'] : 0;
+$bo_reply_level = isset($_POST['bo_reply_level']) ? (int) $_POST['bo_reply_level'] : 0;
+$bo_comment_level = isset($_POST['bo_comment_level']) ? (int) $_POST['bo_comment_level'] : 0;
+$bo_html_level = isset($_POST['bo_html_level']) ? (int) $_POST['bo_html_level'] : 0;
+$bo_link_level = isset($_POST['bo_link_level']) ? (int) $_POST['bo_link_level'] : 0;
+$bo_count_modify = isset($_POST['bo_count_modify']) ? (int) $_POST['bo_count_modify'] : 0;
+$bo_count_delete = isset($_POST['bo_count_delete']) ? (int) $_POST['bo_count_delete'] : 0;
+$bo_upload_level = isset($_POST['bo_upload_level']) ? (int) $_POST['bo_upload_level'] : 0;
+$bo_download_level = isset($_POST['bo_download_level']) ? (int) $_POST['bo_download_level'] : 0;
+$bo_read_point = isset($_POST['bo_read_point']) ? (int) $_POST['bo_read_point'] : 0;
+$bo_write_point = isset($_POST['bo_write_point']) ? (int) $_POST['bo_write_point'] : 0;
+$bo_comment_point = isset($_POST['bo_comment_point']) ? (int) $_POST['bo_comment_point'] : 0;
+$bo_download_point = isset($_POST['bo_download_point']) ? (int) $_POST['bo_download_point'] : 0;
+$bo_select_editor = isset($_POST['bo_select_editor']) ? clean_xss_tags($_POST['bo_select_editor'], 1, 1) : '';
+$bo_skin = isset($_POST['bo_skin']) ? clean_xss_tags($_POST['bo_skin'], 1, 1) : '';
+$bo_mobile_skin = isset($_POST['bo_mobile_skin']) ? clean_xss_tags($_POST['bo_mobile_skin'], 1, 1) : '';
+$bo_content_head = isset($_POST['bo_content_head']) ? $_POST['bo_content_head'] : '';
+$bo_content_tail = isset($_POST['bo_content_tail']) ? $_POST['bo_content_tail'] : '';
+$bo_mobile_content_head = isset($_POST['bo_mobile_content_head']) ? $_POST['bo_mobile_content_head'] : '';
+$bo_mobile_content_tail = isset($_POST['bo_mobile_content_tail']) ? $_POST['bo_mobile_content_tail'] : '';
+$bo_insert_content = isset($_POST['bo_insert_content']) ? $_POST['bo_insert_content'] : '';
+$bo_gallery_cols = isset($_POST['bo_gallery_cols']) ? (int) $_POST['bo_gallery_cols'] : 0;
+$bo_gallery_width = isset($_POST['bo_gallery_width']) ? (int) $_POST['bo_gallery_width'] : 0;
+$bo_gallery_height = isset($_POST['bo_gallery_height']) ? (int) $_POST['bo_gallery_height'] : 0;
+$bo_mobile_gallery_width = isset($_POST['bo_mobile_gallery_width']) ? (int) $_POST['bo_mobile_gallery_width'] : 0;
+$bo_mobile_gallery_height = isset($_POST['bo_mobile_gallery_height']) ? (int) $_POST['bo_mobile_gallery_height'] : 0;
+$bo_upload_count = isset($_POST['bo_upload_count']) ? (int) $_POST['bo_upload_count'] : 0;
+$bo_upload_size = isset($_POST['bo_upload_size']) ? (int) $_POST['bo_upload_size'] : 0;
+$bo_reply_order = isset($_POST['bo_reply_order']) ? (int) $_POST['bo_reply_order'] : 0;
+$bo_order = isset($_POST['bo_order']) ? (int) $_POST['bo_order'] : 0;
+$bo_write_min = isset($_POST['bo_write_min']) ? (int) $_POST['bo_write_min'] : 0;
+$bo_write_max = isset($_POST['bo_write_max']) ? (int) $_POST['bo_write_max'] : 0;
+$bo_comment_min = isset($_POST['bo_comment_min']) ? (int) $_POST['bo_comment_min'] : 0;
+$bo_comment_max = isset($_POST['bo_comment_max']) ? (int) $_POST['bo_comment_max'] : 0;
+$bo_sort_field = isset($_POST['bo_sort_field']) ? clean_xss_tags($_POST['bo_sort_field'], 1, 1) : '';
+
+$etcs = array();
+
+for($i=1;$i<=10;$i++){
+    $etcs['bo_'.$i.'_subj'] = ${'bo_'.$i.'_subj'} = isset($_POST['bo_'.$i.'_subj']) ? $_POST['bo_'.$i.'_subj'] : '';
+    $etcs['bo_'.$i] = ${'bo_'.$i} = isset($_POST['bo_'.$i]) ? $_POST['bo_'.$i] : '';
+}
 
 $sql_common = " gr_id               = '{$gr_id}',
-                bo_subject          = '{$_POST['bo_subject']}',
-                bo_mobile_subject   = '{$_POST['bo_mobile_subject']}',
-                bo_device           = '{$_POST['bo_device']}',
+                bo_subject          = '{$bo_subject}',
+                bo_mobile_subject   = '{$bo_mobile_subject}',
+                bo_device           = '{$bo_device}',
                 bo_admin            = '{$bo_admin}',
-                bo_list_level       = '{$_POST['bo_list_level']}',
-                bo_read_level       = '{$_POST['bo_read_level']}',
-                bo_write_level      = '{$_POST['bo_write_level']}',
-                bo_reply_level      = '{$_POST['bo_reply_level']}',
-                bo_comment_level    = '{$_POST['bo_comment_level']}',
-                bo_html_level       = '{$_POST['bo_html_level']}',
-                bo_link_level       = '{$_POST['bo_link_level']}',
-                bo_count_modify     = '{$_POST['bo_count_modify']}',
-                bo_count_delete     = '{$_POST['bo_count_delete']}',
-                bo_upload_level     = '{$_POST['bo_upload_level']}',
-                bo_download_level   = '{$_POST['bo_download_level']}',
-                bo_read_point       = '{$_POST['bo_read_point']}',
-                bo_write_point      = '{$_POST['bo_write_point']}',
-                bo_comment_point    = '{$_POST['bo_comment_point']}',
-                bo_download_point   = '{$_POST['bo_download_point']}',
-                bo_use_category     = '{$_POST['bo_use_category']}',
+                bo_list_level       = '{$bo_list_level}',
+                bo_read_level       = '{$bo_read_level}',
+                bo_write_level      = '{$bo_write_level}',
+                bo_reply_level      = '{$bo_reply_level}',
+                bo_comment_level    = '{$bo_comment_level}',
+                bo_html_level       = '{$bo_html_level}',
+                bo_link_level       = '{$bo_link_level}',
+                bo_count_modify     = '{$bo_count_modify}',
+                bo_count_delete     = '{$bo_count_delete}',
+                bo_upload_level     = '{$bo_upload_level}',
+                bo_download_level   = '{$bo_download_level}',
+                bo_read_point       = '{$bo_read_point}',
+                bo_write_point      = '{$bo_write_point}',
+                bo_comment_point    = '{$bo_comment_point}',
+                bo_download_point   = '{$bo_download_point}',
+                bo_use_category     = '{$bo_use_category}',
                 bo_category_list    = '{$str_bo_category_list}',
-                bo_use_sideview     = '{$_POST['bo_use_sideview']}',
-                bo_use_file_content = '{$_POST['bo_use_file_content']}',
-                bo_use_secret       = '{$_POST['bo_use_secret']}',
-                bo_use_dhtml_editor = '{$_POST['bo_use_dhtml_editor']}',
-                bo_select_editor    = '{$_POST['bo_select_editor']}',
-                bo_use_rss_view     = '{$_POST['bo_use_rss_view']}',
-                bo_use_good         = '{$_POST['bo_use_good']}',
-                bo_use_nogood       = '{$_POST['bo_use_nogood']}',
-                bo_use_name         = '{$_POST['bo_use_name']}',
-                bo_use_signature    = '{$_POST['bo_use_signature']}',
-                bo_use_ip_view      = '{$_POST['bo_use_ip_view']}',
-                bo_use_list_view    = '{$_POST['bo_use_list_view']}',
-                bo_use_list_file    = '{$_POST['bo_use_list_file']}',
-                bo_use_list_content = '{$_POST['bo_use_list_content']}',
-                bo_use_email        = '{$_POST['bo_use_email']}',
-                bo_use_cert         = '{$_POST['bo_use_cert']}',
-                bo_use_sns          = '{$_POST['bo_use_sns']}',
-                bo_use_captcha      = '{$_POST['bo_use_captcha']}',
-                bo_table_width      = '{$_POST['bo_table_width']}',
-                bo_subject_len      = '{$_POST['bo_subject_len']}',
-                bo_mobile_subject_len      = '{$_POST['bo_mobile_subject_len']}',
-                bo_page_rows        = '{$_POST['bo_page_rows']}',
-                bo_mobile_page_rows = '{$_POST['bo_mobile_page_rows']}',
-                bo_new              = '{$_POST['bo_new']}',
-                bo_hot              = '{$_POST['bo_hot']}',
-                bo_image_width      = '{$_POST['bo_image_width']}',
-                bo_skin             = '{$_POST['bo_skin']}',
-                bo_mobile_skin      = '{$_POST['bo_mobile_skin']}',
+                bo_use_sideview     = '{$bo_use_sideview}',
+                bo_use_file_content = '{$bo_use_file_content}',
+                bo_use_secret       = '{$bo_use_secret}',
+                bo_use_dhtml_editor = '{$bo_use_dhtml_editor}',
+                bo_select_editor    = '{$bo_select_editor}',
+                bo_use_rss_view     = '{$bo_use_rss_view}',
+                bo_use_good         = '{$bo_use_good}',
+                bo_use_nogood       = '{$bo_use_nogood}',
+                bo_use_name         = '{$bo_use_name}',
+                bo_use_signature    = '{$bo_use_signature}',
+                bo_use_ip_view      = '{$bo_use_ip_view}',
+                bo_use_list_view    = '{$bo_use_list_view}',
+                bo_use_list_file    = '{$bo_use_list_file}',
+                bo_use_list_content = '{$bo_use_list_content}',
+                bo_use_email        = '{$bo_use_email}',
+                bo_use_cert         = '{$bo_use_cert}',
+                bo_use_sns          = '{$bo_use_sns}',
+                bo_use_captcha      = '{$bo_use_captcha}',
+                bo_table_width      = '{$bo_table_width}',
+                bo_subject_len      = '{$bo_subject_len}',
+                bo_mobile_subject_len      = '{$bo_mobile_subject_len}',
+                bo_page_rows        = '{$bo_page_rows}',
+                bo_mobile_page_rows = '{$bo_mobile_page_rows}',
+                bo_new              = '{$bo_new}',
+                bo_hot              = '{$bo_hot}',
+                bo_image_width      = '{$bo_image_width}',
+                bo_skin             = '{$bo_skin}',
+                bo_mobile_skin      = '{$bo_mobile_skin}',
                 ";
 
 // 최고 관리자인 경우에만 수정가능
 if ($is_admin === 'super'){
 $sql_common .= " bo_include_head     = '".$bo_include_head."',
                 bo_include_tail     = '".$bo_include_tail."',
-                bo_content_head     = '{$_POST['bo_content_head']}',
-                bo_content_tail     = '{$_POST['bo_content_tail']}',
-                bo_mobile_content_head     = '{$_POST['bo_mobile_content_head']}',
-                bo_mobile_content_tail     = '{$_POST['bo_mobile_content_tail']}',
+                bo_content_head     = '{$bo_content_head}',
+                bo_content_tail     = '{$bo_content_tail}',
+                bo_mobile_content_head     = '{$bo_mobile_content_head}',
+                bo_mobile_content_tail     = '{$bo_mobile_content_tail}',
                 ";
 }
 
-$sql_common .= " bo_insert_content   = '{$_POST['bo_insert_content']}',
-                bo_gallery_cols     = '{$_POST['bo_gallery_cols']}',
-                bo_gallery_width    = '{$_POST['bo_gallery_width']}',
-                bo_gallery_height   = '{$_POST['bo_gallery_height']}',
-                bo_mobile_gallery_width = '{$_POST['bo_mobile_gallery_width']}',
-                bo_mobile_gallery_height= '{$_POST['bo_mobile_gallery_height']}',
-                bo_upload_count     = '{$_POST['bo_upload_count']}',
-                bo_upload_size      = '{$_POST['bo_upload_size']}',
-                bo_reply_order      = '{$_POST['bo_reply_order']}',
-                bo_use_search       = '{$_POST['bo_use_search']}',
-                bo_order            = '{$_POST['bo_order']}',
-                bo_write_min        = '{$_POST['bo_write_min']}',
-                bo_write_max        = '{$_POST['bo_write_max']}',
-                bo_comment_min      = '{$_POST['bo_comment_min']}',
-                bo_comment_max      = '{$_POST['bo_comment_max']}',
-                bo_sort_field       = '{$_POST['bo_sort_field']}',
-                bo_1_subj           = '{$_POST['bo_1_subj']}',
-                bo_2_subj           = '{$_POST['bo_2_subj']}',
-                bo_3_subj           = '{$_POST['bo_3_subj']}',
-                bo_4_subj           = '{$_POST['bo_4_subj']}',
-                bo_5_subj           = '{$_POST['bo_5_subj']}',
-                bo_6_subj           = '{$_POST['bo_6_subj']}',
-                bo_7_subj           = '{$_POST['bo_7_subj']}',
-                bo_8_subj           = '{$_POST['bo_8_subj']}',
-                bo_9_subj           = '{$_POST['bo_9_subj']}',
-                bo_10_subj          = '{$_POST['bo_10_subj']}',
-                bo_1                = '{$_POST['bo_1']}',
-                bo_2                = '{$_POST['bo_2']}',
-                bo_3                = '{$_POST['bo_3']}',
-                bo_4                = '{$_POST['bo_4']}',
-                bo_5                = '{$_POST['bo_5']}',
-                bo_6                = '{$_POST['bo_6']}',
-                bo_7                = '{$_POST['bo_7']}',
-                bo_8                = '{$_POST['bo_8']}',
-                bo_9                = '{$_POST['bo_9']}',
-                bo_10               = '{$_POST['bo_10']}' ";
+$sql_common .= " bo_insert_content   = '{$bo_insert_content}',
+                bo_gallery_cols     = '{$bo_gallery_cols}',
+                bo_gallery_width    = '{$bo_gallery_width}',
+                bo_gallery_height   = '{$bo_gallery_height}',
+                bo_mobile_gallery_width = '{$bo_mobile_gallery_width}',
+                bo_mobile_gallery_height= '{$bo_mobile_gallery_height}',
+                bo_upload_count     = '{$bo_upload_count}',
+                bo_upload_size      = '{$bo_upload_size}',
+                bo_reply_order      = '{$bo_reply_order}',
+                bo_use_search       = '{$bo_use_search}',
+                bo_order            = '{$bo_order}',
+                bo_write_min        = '{$bo_write_min}',
+                bo_write_max        = '{$bo_write_max}',
+                bo_comment_min      = '{$bo_comment_min}',
+                bo_comment_max      = '{$bo_comment_max}',
+                bo_sort_field       = '{$bo_sort_field}',
+                bo_1_subj           = '{$bo_1_subj}',
+                bo_2_subj           = '{$bo_2_subj}',
+                bo_3_subj           = '{$bo_3_subj}',
+                bo_4_subj           = '{$bo_4_subj}',
+                bo_5_subj           = '{$bo_5_subj}',
+                bo_6_subj           = '{$bo_6_subj}',
+                bo_7_subj           = '{$bo_7_subj}',
+                bo_8_subj           = '{$bo_8_subj}',
+                bo_9_subj           = '{$bo_9_subj}',
+                bo_10_subj          = '{$bo_10_subj}',
+                bo_1                = '{$bo_1}',
+                bo_2                = '{$bo_2}',
+                bo_3                = '{$bo_3}',
+                bo_4                = '{$bo_4}',
+                bo_5                = '{$bo_5}',
+                bo_6                = '{$bo_6}',
+                bo_7                = '{$bo_7}',
+                bo_8                = '{$bo_8}',
+                bo_9                = '{$bo_9}',
+                bo_10               = '{$bo_10}' ";
 
 if ($w == '') {
 
@@ -355,8 +426,8 @@ if (is_checked('chk_grp_use_search'))           $grp_fields .= " , bo_use_search
 if (is_checked('chk_grp_order'))                $grp_fields .= " , bo_order = '{$bo_order}' ";
 for ($i=1; $i<=10; $i++) {
     if (is_checked('chk_grp_'.$i)) {
-        $grp_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
-        $grp_fields .= " , bo_{$i} = '".$_POST['bo_'.$i]."' ";
+        $grp_fields .= " , bo_{$i}_subj = '".$etcs['bo_'.$i.'_subj']."' ";
+        $grp_fields .= " , bo_{$i} = '".$etcs['bo_'.$i]."' ";
     }
 }
 
@@ -445,8 +516,8 @@ if (is_checked('chk_all_use_search'))           $all_fields .= " , bo_use_search
 if (is_checked('chk_all_order'))                $all_fields .= " , bo_order = '{$bo_order}' ";
 for ($i=1; $i<=10; $i++) {
     if (is_checked('chk_all_'.$i)) {
-        $all_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
-        $all_fields .= " , bo_{$i} = '".$_POST['bo_'.$i]."' ";
+        $all_fields .= " , bo_{$i}_subj = '".$etcs['bo_'.$i.'_subj']."' ";
+        $all_fields .= " , bo_{$i} = '".$etcs['bo_'.$i]."' ";
     }
 }
 
@@ -461,5 +532,4 @@ if(function_exists('get_admin_captcha_by'))
 
 run_event('admin_board_form_update', $bo_table, $w);
 
-goto_url("./board_form.php?w=u&bo_table={$bo_table}&amp;{$qstr}");
-?>
+goto_url("./board_form.php?w=u&bo_table={$bo_table}&amp;{$qstr}");
\ No newline at end of file
diff --git a/adm/board_list.php b/adm/board_list.php
index d4ed4282e..3d6babfa9 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "300100";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['board_table']} a ";
 $sql_search = " where (1) ";
@@ -63,9 +63,9 @@ $colspan = 15;
 
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="bo_table"<?php echo get_selected($_GET['sfl'], "bo_table", true); ?>>TABLE</option>
-    <option value="bo_subject"<?php echo get_selected($_GET['sfl'], "bo_subject"); ?>>제목</option>
-    <option value="a.gr_id"<?php echo get_selected($_GET['sfl'], "a.gr_id"); ?>>그룹ID</option>
+    <option value="bo_table"<?php echo get_selected($sfl, "bo_table", true); ?>>TABLE</option>
+    <option value="bo_subject"<?php echo get_selected($sfl, "bo_subject"); ?>>제목</option>
+    <option value="a.gr_id"<?php echo get_selected($sfl, "a.gr_id"); ?>>그룹ID</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -81,7 +81,7 @@ $colspan = 15;
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
 <input type="hidden" name="stx" value="<?php echo $stx ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="<?php echo isset($token) ? $token : ''; ?>">
 
 <div class="tbl_head01 tbl_wrap">
     <table>
@@ -235,5 +235,4 @@ $(function(){
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/board_list_update.php b/adm/board_list_update.php
index 552f60d99..9952804fd 100644
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@@ -4,28 +4,42 @@ include_once('./_common.php');
 
 check_demo();
 
-if (!count($_POST['chk'])) {
-    alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
+$post_count_chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
+$chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? $_POST['chk'] : array();
+$act_button = isset($_POST['act_button']) ? strip_tags($_POST['act_button']) : '';
+$board_table = (isset($_POST['board_table']) && is_array($_POST['board_table'])) ? $_POST['board_table'] : array();
+
+if (! $post_count_chk) {
+    alert($act_button." 하실 항목을 하나 이상 체크하세요.");
 }
 
 check_admin_token();
 
-$act_button = isset($_POST['act_button']) ? strip_tags($_POST['act_button']) : '';
-$chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? $_POST['chk'] : array();
-$board_table = (isset($_POST['board_table']) && is_array($_POST['board_table'])) ? $_POST['board_table'] : array();
+if ($act_button === "선택수정") {
 
-if ($_POST['act_button'] == "선택수정") {
+    auth_check_menu($auth, $sub_menu, 'w');
 
-    auth_check($auth[$sub_menu], 'w');
-
-    for ($i=0; $i<count($_POST['chk']); $i++) {
+    for ($i=0; $i<$post_count_chk; $i++) {
 
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
+        $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
+
+        $post_gr_id = isset($_POST['gr_id'][$k]) ? clean_xss_tags($_POST['gr_id'][$k], 1, 1) : '';
+        $post_bo_device = isset($_POST['bo_device'][$k]) ? clean_xss_tags($_POST['bo_device'][$k], 1, 1) : '';
+        $post_bo_skin = isset($_POST['bo_skin'][$k]) ? clean_xss_tags($_POST['bo_skin'][$k], 1, 1) : '';
+        $post_bo_mobile_skin = isset($_POST['bo_mobile_skin'][$k]) ? clean_xss_tags($_POST['bo_mobile_skin'][$k], 1, 1) : '';
+        $post_bo_read_point = isset($_POST['bo_read_point'][$k]) ? clean_xss_tags($_POST['bo_read_point'][$k], 1, 1) : '';
+        $post_bo_write_point = isset($_POST['bo_write_point'][$k]) ? clean_xss_tags($_POST['bo_write_point'][$k], 1, 1) : '';
+        $post_bo_comment_point = isset($_POST['bo_comment_point'][$k]) ? clean_xss_tags($_POST['bo_comment_point'][$k], 1, 1) : '';
+        $post_bo_download_point = isset($_POST['bo_download_point'][$k]) ? clean_xss_tags($_POST['bo_download_point'][$k], 1, 1) : '';
+        $post_bo_use_search = isset($_POST['bo_use_search'][$k]) ? clean_xss_tags($_POST['bo_use_search'][$k], 1, 1) : '';
+        $post_bo_use_sns = isset($_POST['bo_use_sns'][$k]) ? clean_xss_tags($_POST['bo_use_sns'][$k], 1, 1) : '';
+        $post_bo_order = isset($_POST['bo_order'][$k]) ? clean_xss_tags($_POST['bo_order'][$k], 1, 1) : '';
+        $post_board_table = isset($_POST['board_table'][$k]) ? clean_xss_tags($_POST['board_table'][$k], 1, 1) : '';
 
         if ($is_admin != 'super') {
             $sql = " select count(*) as cnt from {$g5['board_table']} a, {$g5['group_table']} b
-                      where a.gr_id = '".sql_real_escape_string($_POST['gr_id'][$k])."'
+                      where a.gr_id = '".sql_real_escape_string($post_gr_id)."'
                         and a.gr_id = b.gr_id
                         and b.gr_admin = '{$member['mb_id']}' ";
             $row = sql_fetch($sql);
@@ -36,39 +50,39 @@ if ($_POST['act_button'] == "선택수정") {
         $p_bo_subject = is_array($_POST['bo_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_subject'][$k])) : '';
 
         $sql = " update {$g5['board_table']}
-                    set gr_id               = '".sql_real_escape_string(strip_tags($_POST['gr_id'][$k]))."',
+                    set gr_id               = '".sql_real_escape_string($post_gr_id)."',
                         bo_subject          = '".$p_bo_subject."',
-                        bo_device           = '".sql_real_escape_string(strip_tags($_POST['bo_device'][$k]))."',
-                        bo_skin             = '".sql_real_escape_string(strip_tags($_POST['bo_skin'][$k]))."',
-                        bo_mobile_skin      = '".sql_real_escape_string(strip_tags($_POST['bo_mobile_skin'][$k]))."',
-                        bo_read_point       = '".sql_real_escape_string(strip_tags($_POST['bo_read_point'][$k]))."',
-                        bo_write_point      = '".sql_real_escape_string(strip_tags($_POST['bo_write_point'][$k]))."',
-                        bo_comment_point    = '".sql_real_escape_string(strip_tags($_POST['bo_comment_point'][$k]))."',
-                        bo_download_point   = '".sql_real_escape_string(strip_tags($_POST['bo_download_point'][$k]))."',
-                        bo_use_search       = '".sql_real_escape_string(strip_tags($_POST['bo_use_search'][$k]))."',
-                        bo_use_sns          = '".sql_real_escape_string(strip_tags($_POST['bo_use_sns'][$k]))."',
-                        bo_order            = '".sql_real_escape_string(strip_tags($_POST['bo_order'][$k]))."'
-                  where bo_table            = '".sql_real_escape_string($_POST['board_table'][$k])."' ";
+                        bo_device           = '".sql_real_escape_string($post_bo_device)."',
+                        bo_skin             = '".sql_real_escape_string($post_bo_skin)."',
+                        bo_mobile_skin      = '".sql_real_escape_string($post_bo_mobile_skin)."',
+                        bo_read_point       = '".sql_real_escape_string($post_bo_read_point)."',
+                        bo_write_point      = '".sql_real_escape_string($post_bo_write_point)."',
+                        bo_comment_point    = '".sql_real_escape_string($post_bo_comment_point)."',
+                        bo_download_point   = '".sql_real_escape_string($post_bo_download_point)."',
+                        bo_use_search       = '".sql_real_escape_string($post_bo_use_search)."',
+                        bo_use_sns          = '".sql_real_escape_string($post_bo_use_sns)."',
+                        bo_order            = '".sql_real_escape_string($post_bo_order)."'
+                  where bo_table            = '".sql_real_escape_string($post_board_table)."' ";
 
         sql_query($sql);
     }
 
-} else if ($_POST['act_button'] == "선택삭제") {
+} else if ($act_button === "선택삭제") {
 
     if ($is_admin != 'super')
         alert('게시판 삭제는 최고관리자만 가능합니다.');
 
-    auth_check($auth[$sub_menu], 'd');
+    auth_check_menu($auth, $sub_menu, 'd');
 
     // _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
     define('_BOARD_DELETE_', true);
 
-    for ($i=0; $i<count($_POST['chk']); $i++) {
+    for ($i=0; $i<$post_count_chk; $i++) {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
+        $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
 
         // include 전에 $bo_table 값을 반드시 넘겨야 함
-        $tmp_bo_table = trim($_POST['board_table'][$k]);
+        $tmp_bo_table = isset($_POST['board_table'][$k]) ? trim(clean_xss_tags($_POST['board_table'][$k], 1, 1)) : '';
 
         if( preg_match("/^[A-Za-z0-9_]+$/", $tmp_bo_table) ){
             include ('./board_delete.inc.php');
@@ -80,5 +94,4 @@ if ($_POST['act_button'] == "선택수정") {
 
 run_event('admin_board_list_update', $act_button, $chk, $board_table, $qstr);
 
-goto_url('./board_list.php?'.$qstr);
-?>
+goto_url('./board_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/board_thumbnail_delete.php b/adm/board_thumbnail_delete.php
index 720cad4f9..93024ca44 100644
--- a/adm/board_thumbnail_delete.php
+++ b/adm/board_thumbnail_delete.php
@@ -2,7 +2,7 @@
 $sub_menu = '300100';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if(!$board['bo_table'])
     alert('존재하지 않는 게시판입니다.');
@@ -48,5 +48,4 @@ if(is_dir($dir)) {
 <div class="btn_confirm01 btn_confirm"><a href="./board_form.php?w=u&amp;bo_table=<?php echo $bo_table; ?>&amp;<?php echo $qstr; ?>">게시판 수정으로 돌아가기</a></div>
 
 <?php
-include_once('./admin.tail.php');
-?>
\ No newline at end of file
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php
index c9e8338bd..e240e1fc6 100644
--- a/adm/boardgroup_form.php
+++ b/adm/boardgroup_form.php
@@ -2,17 +2,24 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.');
 
 $html_title = '게시판그룹';
 $gr_id_attr = '';
 $sound_only = '';
+
+if( ! isset($group['gr_id']) ){
+    $group['gr_id'] = '';
+    $group['gr_subject'] = '';
+    $group['gr_device'] = '';
+}
+
 if ($w == '') {
     $gr_id_attr = 'required';
     $sound_only = '<strong class="sound_only"> 필수</strong>';
-    $gr = array('gr_use_access' => 0);
+    $gr = array('gr_use_access' => 0, 'gr_admin'=>'');
     $html_title .= ' 생성';
 } else if ($w == 'u') {
     $gr_id_attr = 'readonly';
@@ -115,9 +122,9 @@ include_once('./admin.head.php');
         <th scope="row">여분필드<?php echo $i ?></th>
         <td class="td_extra">
             <label for="gr_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
-            <input type="text" name="gr_<?php echo $i ?>_subj" value="<?php echo get_text($group['gr_'.$i.'_subj']) ?>" id="gr_<?php echo $i ?>_subj" class="frm_input">
+            <input type="text" name="gr_<?php echo $i ?>_subj" value="<?php echo isset($group['gr_'.$i.'_subj']) ? get_text($group['gr_'.$i.'_subj']) : ''; ?>" id="gr_<?php echo $i ?>_subj" class="frm_input">
             <label for="gr_<?php echo $i ?>">여분필드 <?php echo $i ?> 내용</label>
-            <input type="text" name="gr_<?php echo $i ?>" value="<?php echo get_sanitize_input($gr['gr_'.$i]); ?>" id="gr_<?php echo $i ?>" class="frm_input">
+            <input type="text" name="gr_<?php echo $i ?>" value="<?php echo isset($gr['gr_'.$i]) ? get_sanitize_input($gr['gr_'.$i]) : ''; ?>" id="gr_<?php echo $i ?>" class="frm_input">
         </td>
     </tr>
     <?php } ?>
@@ -148,5 +155,4 @@ function fboardgroup_check(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php
index 35d8843c1..937198184 100644
--- a/adm/boardgroup_form_update.php
+++ b/adm/boardgroup_form_update.php
@@ -5,42 +5,63 @@ include_once('./_common.php');
 if ($w == 'u')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.');
 
 check_admin_token();
 
-if (!preg_match("/^([A-Za-z0-9_]{1,10})$/", $_POST['gr_id']))
+$gr_id = isset($_POST['gr_id']) ? $_POST['gr_id'] : '';
+
+if (!preg_match("/^([A-Za-z0-9_]{1,10})$/", $gr_id))
     alert('그룹 ID는 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (10자 이내)');
 
 if (!$gr_subject) alert('그룹 제목을 입력하세요.');
 
-$gr_subject = isset($_POST['gr_subject']) ? strip_tags(clean_xss_attributes($_POST['gr_subject'])) : '';
+$posts = array();
 
-$sql_common = " gr_subject = '{$gr_subject}',
-                gr_device = '{$_POST['gr_device']}',
-                gr_admin  = '{$_POST['gr_admin']}',
-                gr_1_subj = '{$_POST['gr_1_subj']}',
-                gr_2_subj = '{$_POST['gr_2_subj']}',
-                gr_3_subj = '{$_POST['gr_3_subj']}',
-                gr_4_subj = '{$_POST['gr_4_subj']}',
-                gr_5_subj = '{$_POST['gr_5_subj']}',
-                gr_6_subj = '{$_POST['gr_6_subj']}',
-                gr_7_subj = '{$_POST['gr_7_subj']}',
-                gr_8_subj = '{$_POST['gr_8_subj']}',
-                gr_9_subj = '{$_POST['gr_9_subj']}',
-                gr_10_subj = '{$_POST['gr_10_subj']}',
-                gr_1 = '{$_POST['gr_1']}',
-                gr_2 = '{$_POST['gr_2']}',
-                gr_3 = '{$_POST['gr_3']}',
-                gr_4 = '{$_POST['gr_4']}',
-                gr_5 = '{$_POST['gr_5']}',
-                gr_6 = '{$_POST['gr_6']}',
-                gr_7 = '{$_POST['gr_7']}',
-                gr_8 = '{$_POST['gr_8']}',
-                gr_9 = '{$_POST['gr_9']}',
-                gr_10 = '{$_POST['gr_10']}' ";
+$check_keys = array(
+'gr_subject'=>'',
+'gr_device'=>'',
+'gr_admin'=>'',
+);
+
+for($i=1;$i<=10;$i++){
+    $check_keys['gr_'.$i.'_subj'] = isset($_POST['gr_'.$i.'_subj']) ? $_POST['gr_'.$i.'_subj'] : '';
+    $check_keys['gr_'.$i] = isset($_POST['gr_'.$i]) ? $_POST['gr_'.$i] : '';
+}
+
+foreach( $check_keys as $key=>$value ){
+    if( $key === 'gr_subject' ){
+        $posts[$key] = isset($_POST[$key]) ? strip_tags(clean_xss_attributes($_POST[$key])) : '';
+    } else {
+        $posts[$key] = isset($_POST[$key]) ? $_POST[$key] : '';
+    }
+}
+
+$sql_common = " gr_subject = '{$posts['gr_subject']}',
+                gr_device = '{$posts['gr_device']}',
+                gr_admin  = '{$posts['gr_admin']}',
+                gr_1_subj = '{$posts['gr_1_subj']}',
+                gr_2_subj = '{$posts['gr_2_subj']}',
+                gr_3_subj = '{$posts['gr_3_subj']}',
+                gr_4_subj = '{$posts['gr_4_subj']}',
+                gr_5_subj = '{$posts['gr_5_subj']}',
+                gr_6_subj = '{$posts['gr_6_subj']}',
+                gr_7_subj = '{$posts['gr_7_subj']}',
+                gr_8_subj = '{$posts['gr_8_subj']}',
+                gr_9_subj = '{$posts['gr_9_subj']}',
+                gr_10_subj = '{$posts['gr_10_subj']}',
+                gr_1 = '{$posts['gr_1']}',
+                gr_2 = '{$posts['gr_2']}',
+                gr_3 = '{$posts['gr_3']}',
+                gr_4 = '{$posts['gr_4']}',
+                gr_5 = '{$posts['gr_5']}',
+                gr_6 = '{$posts['gr_6']}',
+                gr_7 = '{$posts['gr_7']}',
+                gr_8 = '{$posts['gr_8']}',
+                gr_9 = '{$posts['gr_9']}',
+                gr_10 = '{$posts['gr_10']}' ";
 if (isset($_POST['gr_use_access']))
     $sql_common .= ", gr_use_access = '{$_POST['gr_use_access']}' ";
 else
@@ -48,13 +69,13 @@ else
 
 if ($w == '') {
 
-    $sql = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$_POST['gr_id']}' ";
+    $sql = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$gr_id}' ";
     $row = sql_fetch($sql);
     if ($row['cnt'])
         alert('이미 존재하는 그룹 ID 입니다.');
 
     $sql = " insert into {$g5['group_table']}
-                set gr_id = '{$_POST['gr_id']}',
+                set gr_id = '{$gr_id}',
                      {$sql_common} ";
     sql_query($sql);
 
@@ -62,7 +83,7 @@ if ($w == '') {
 
     $sql = " update {$g5['group_table']}
                 set {$sql_common}
-                where gr_id = '{$_POST['gr_id']}' ";
+                where gr_id = '{$gr_id}' ";
     sql_query($sql);
 
 } else {
@@ -71,5 +92,4 @@ if ($w == '') {
 
 run_event('admin_boardgroup_form_update', $gr_id, $w);
 
-goto_url('./boardgroup_form.php?w=u&amp;gr_id='.$gr_id.'&amp;'.$qstr);
-?>
+goto_url('./boardgroup_form.php?w=u&amp;gr_id='.$gr_id.'&amp;'.$qstr);
\ No newline at end of file
diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index 08cd18382..793d5a28b 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 if (!isset($group['gr_device'])) {
     // 게시판 그룹 사용 필드 추가
@@ -10,7 +10,7 @@ if (!isset($group['gr_device'])) {
     // pc : pc 전용 사용
     // mobile : mobile 전용 사용
     // none : 사용 안함
-    sql_query(" ALTER TABLE  `{$g5['board_group_table']}` ADD  `gr_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `gr_subject` ", false);
+    sql_query(" ALTER TABLE  `{$g5['group_table']}` ADD  `gr_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `gr_subject` ", false);
 }
 
 $sql_common = " from {$g5['group_table']} ";
@@ -66,9 +66,9 @@ $colspan = 10;
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="gr_subject"<?php echo get_selected($_GET['sfl'], "gr_subject"); ?>>제목</option>
-    <option value="gr_id"<?php echo get_selected($_GET['sfl'], "gr_id"); ?>>ID</option>
-    <option value="gr_admin"<?php echo get_selected($_GET['sfl'], "gr_admin"); ?>>그룹관리자</option>
+    <option value="gr_subject"<?php echo get_selected($sfl, "gr_subject"); ?>>제목</option>
+    <option value="gr_id"<?php echo get_selected($sfl, "gr_id"); ?>>ID</option>
+    <option value="gr_admin"<?php echo get_selected($sfl, "gr_admin"); ?>>그룹관리자</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" id="stx" value="<?php echo $stx ?>" required class="required frm_input">
@@ -207,5 +207,4 @@ function fboardgrouplist_submit(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/boardgroup_list_update.php b/adm/boardgroup_list_update.php
index b49a673b9..94cbd96a6 100644
--- a/adm/boardgroup_list_update.php
+++ b/adm/boardgroup_list_update.php
@@ -6,7 +6,7 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
@@ -21,18 +21,21 @@ if(!$count)
 
 for ($i=0; $i<$count; $i++)
 {
-    $k     = $post_chk[$i];
+    $k     = isset($post_chk[$i]) ? (int) $post_chk[$i] : 0;
     $gr_id = preg_replace('/[^a-z0-9_]/i', '', $post_group_id[$k]);
-    $gr_subject = is_array($_POST['gr_subject']) ? strip_tags(clean_xss_attributes($_POST['gr_subject'][$k])) : '';
-    $gr_admin = is_array($_POST['gr_admin']) ? strip_tags(clean_xss_attributes($_POST['gr_admin'][$k])) : '';
+    $gr_subject = isset($_POST['gr_subject'][$k]) ? strip_tags(clean_xss_attributes($_POST['gr_subject'][$k])) : '';
+    $gr_admin = isset($_POST['gr_admin'][$k]) ? strip_tags(clean_xss_attributes($_POST['gr_admin'][$k])) : '';
+    $gr_device = isset($_POST['gr_device'][$k]) ? clean_xss_tags($_POST['gr_device'][$k], 1, 1, 10) : '';
+    $gr_use_access = isset($_POST['gr_use_access'][$k]) ? (int) $_POST['gr_use_access'][$k] : 0;
+    $gr_order = isset($_POST['gr_order'][$k]) ? (int) $_POST['gr_order'][$k] : 0;
 
     if($act_button == '선택수정') {
         $sql = " update {$g5['group_table']}
                     set gr_subject    = '{$gr_subject}',
-                        gr_device     = '".sql_real_escape_string($_POST['gr_device'][$k])."',
-                        gr_admin      = '".sql_real_escape_string($_POST['gr_admin'][$k])."',
-                        gr_use_access = '".sql_real_escape_string($_POST['gr_use_access'][$k])."',
-                        gr_order      = '".sql_real_escape_string($_POST['gr_order'][$k])."'
+                        gr_device     = '".sql_real_escape_string($gr_device)."',
+                        gr_admin      = '".sql_real_escape_string($gr_admin)."',
+                        gr_use_access = '".$gr_use_access."',
+                        gr_order      = '".$gr_order."'
                   where gr_id         = '{$gr_id}' ";
         if ($is_admin != 'super')
             $sql .= " and gr_admin    = '{$gr_admin}' ";
@@ -52,5 +55,4 @@ for ($i=0; $i<$count; $i++)
 
 run_event('admin_boardgroup_list_update', $act_button, $chk, $post_group_id, $qstr);
 
-goto_url('./boardgroup_list.php?'.$qstr);
-?>
+goto_url('./boardgroup_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/boardgroupmember_form.php b/adm/boardgroupmember_form.php
index 7a8c2d11d..529d7495d 100644
--- a/adm/boardgroupmember_form.php
+++ b/adm/boardgroupmember_form.php
@@ -2,10 +2,12 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $mb = get_member($mb_id);
-if (!$mb['mb_id'])
+$token = isset($token) ? $token : '';
+
+if (! (isset($mb['mb_id']) && $mb['mb_id']))
     alert('존재하지 않는 회원입니다.');
 
 $g5['title'] = '접근가능그룹';
@@ -51,7 +53,7 @@ $colspan = 4;
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>" id="sfl">
 <input type="hidden" name="stx" value="<?php echo $stx ?>" id="stx">
 <input type="hidden" name="page" value="<?php echo $page ?>" id="page">
-<input type="hidden" name="token" value="<?php echo $token ?>" id="token">
+<input type="hidden" name="token" value="<?php echo get_sanitize_input($token); ?>" id="token">
 <input type="hidden" name="mb_id" value="<?php echo $mb['mb_id'] ?>" id="mb_id">
 <input type="hidden" name="w" value="d" id="w">
 
@@ -128,5 +130,4 @@ function boardgroupmember_form_check(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/boardgroupmember_list.php b/adm/boardgroupmember_list.php
index 8827df7f1..2cfad069d 100644
--- a/adm/boardgroupmember_list.php
+++ b/adm/boardgroupmember_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $gr = get_group($gr_id);
 if (!$gr['gr_id']) {
@@ -59,7 +59,7 @@ $colspan = 7;
 <input type="hidden" name="gr_id" value="<?php echo $gr_id ?>">
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="a.mb_id"<?php echo get_selected($_GET['sfl'], "a.mb_id") ?>>회원아이디</option>
+    <option value="a.mb_id"<?php echo get_selected($sfl, "a.mb_id") ?>>회원아이디</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -152,5 +152,4 @@ function fboardgroupmember_submit(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/boardgroupmember_update.php b/adm/boardgroupmember_update.php
index 56de9c4cc..4d943b30d 100644
--- a/adm/boardgroupmember_update.php
+++ b/adm/boardgroupmember_update.php
@@ -6,7 +6,7 @@ sql_query(" ALTER TABLE {$g5['group_member_table']} CHANGE `gm_id` `gm_id` INT(
 
 if ($w == '')
 {
-    auth_check($auth[$sub_menu], 'w');
+    auth_check_menu($auth, $sub_menu, 'w');
 
     $mb = get_member($mb_id);
     if (!$mb['mb_id']) {
@@ -39,7 +39,7 @@ if ($w == '')
 }
 else if ($w == 'd' || $w == 'ld')
 {
-    auth_check($auth[$sub_menu], 'd');
+    auth_check_menu($auth, $sub_menu, 'd');
 
     $count = count($_POST['chk']);
     if(!$count)
@@ -66,5 +66,4 @@ else if ($w == 'd' || $w == 'ld')
 if ($w == 'ld')
     goto_url('./boardgroupmember_list.php?gr_id='.$gr_id);
 else
-    goto_url('./boardgroupmember_form.php?mb_id='.$mb_id);
-?>
+    goto_url('./boardgroupmember_form.php?mb_id='.$mb_id);
\ No newline at end of file
diff --git a/adm/browscap.php b/adm/browscap.php
index 0c287c14e..d26fc6ab1 100644
--- a/adm/browscap.php
+++ b/adm/browscap.php
@@ -41,5 +41,4 @@ $(function() {
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
\ No newline at end of file
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/browscap_convert.php b/adm/browscap_convert.php
index 7c0dfc880..9f0eac4ca 100644
--- a/adm/browscap_convert.php
+++ b/adm/browscap_convert.php
@@ -8,7 +8,7 @@ if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE')
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-$rows = preg_replace('#[^0-9]#', '', $_GET['rows']);
+$rows = isset($_GET['rows']) ? preg_replace('#[^0-9]#', '', $_GET['rows']) : 0;
 if(!$rows)
     $rows = 100;
 
@@ -42,5 +42,4 @@ $(function() {
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
\ No newline at end of file
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/browscap_converter.php b/adm/browscap_converter.php
index f7572edb7..a89aca909 100644
--- a/adm/browscap_converter.php
+++ b/adm/browscap_converter.php
@@ -71,5 +71,4 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
 if(($total_count - $cnt) == 0 || $total_count == 0)
     echo '<div class="check_processing"></div><p>변환완료</p>';
 else
-    echo '<p>총 '.number_format($total_count).'건 중 '.number_format($cnt).'건 변환완료<br><br>접속로그를 추가로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.</p><button type="button" id="run_update">업데이트</button>';
-?>
\ No newline at end of file
+    echo '<p>총 '.number_format($total_count).'건 중 '.number_format($cnt).'건 변환완료<br><br>접속로그를 추가로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.</p><button type="button" id="run_update">업데이트</button>';
\ No newline at end of file
diff --git a/adm/browscap_update.php b/adm/browscap_update.php
index e27a73974..2e7001018 100644
--- a/adm/browscap_update.php
+++ b/adm/browscap_update.php
@@ -20,5 +20,4 @@ $browscap->updateMethod = 'cURL';
 $browscap->cacheFilename = 'browscap_cache.php';
 $browscap->updateCache();
 
-die('');
-?>
\ No newline at end of file
+die('');
\ No newline at end of file
diff --git a/adm/cache_file_delete.php b/adm/cache_file_delete.php
index 544fad52b..808842c93 100644
--- a/adm/cache_file_delete.php
+++ b/adm/cache_file_delete.php
@@ -56,5 +56,4 @@ echo '<div class="local_desc01 local_desc"><p><strong>최신글 캐시파일 '.$
 ?>
 
 <?php
-include_once('./admin.tail.php');
-?>
\ No newline at end of file
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/captcha_file_delete.php b/adm/captcha_file_delete.php
index 65cb56535..e3d0f4981 100644
--- a/adm/captcha_file_delete.php
+++ b/adm/captcha_file_delete.php
@@ -49,5 +49,4 @@ echo '<div class="local_desc01 local_desc"><p><strong>캡챠파일 '.$cnt.'건
 ?>
 
 <?php
-include_once('./admin.tail.php');
-?>
\ No newline at end of file
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/config_form.php b/adm/config_form.php
index 4a8bdd8e9..c14f294f5 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -2,7 +2,7 @@
 $sub_menu = "100100";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
@@ -304,6 +304,7 @@ $pg_anchor = '<ul class="anchor">
 if (!$config['cf_icode_server_ip'])   $config['cf_icode_server_ip'] = '211.172.232.124';
 if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
 
+$userinfo = array('payment'=>'');
 if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
 }
@@ -338,14 +339,14 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row"><label for="cf_admin_email">관리자 메일 주소<strong class="sound_only">필수</strong></label></th>
             <td colspan="3">
                 <?php echo help('관리자가 보내고 받는 용도로 사용하는 메일 주소를 입력합니다. (회원가입, 인증메일, 테스트, 회원메일발송 등에서 사용)') ?>
-                <input type="text" name="cf_admin_email" value="<?php echo $config['cf_admin_email'] ?>" id="cf_admin_email" required class="required email frm_input" size="40">
+                <input type="text" name="cf_admin_email" value="<?php echo get_sanitize_input($config['cf_admin_email']); ?>" id="cf_admin_email" required class="required email frm_input" size="40">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_admin_email_name">관리자 메일 발송이름<strong class="sound_only">필수</strong></label></th>
             <td colspan="3">
                 <?php echo help('관리자가 보내고 받는 용도로 사용하는 메일의 발송이름을 입력합니다. (회원가입, 인증메일, 테스트, 회원메일발송 등에서 사용)') ?>
-                <input type="text" name="cf_admin_email_name" value="<?php echo $config['cf_admin_email_name'] ?>" id="cf_admin_email_name" required class="required frm_input" size="40">
+                <input type="text" name="cf_admin_email_name" value="<?php echo get_sanitize_input($config['cf_admin_email_name']); ?>" id="cf_admin_email_name" required class="required frm_input" size="40">
             </td>
         </tr>
         <tr>
@@ -356,79 +357,79 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row"><label for="cf_login_point">로그인시 포인트<strong class="sound_only">필수</strong></label></th>
             <td>
                 <?php echo help('회원이 로그인시 하루에 한번만 적립') ?>
-                <input type="text" name="cf_login_point" value="<?php echo $config['cf_login_point'] ?>" id="cf_login_point" required class="required frm_input" size="5"> 점
+                <input type="text" name="cf_login_point" value="<?php echo (int) $config['cf_login_point'] ?>" id="cf_login_point" required class="required frm_input" size="5"> 점
             </td>
             <th scope="row"><label for="cf_memo_send_point">쪽지보낼시 차감 포인트<strong class="sound_only">필수</strong></label></th>
             <td>
                  <?php echo help('양수로 입력하십시오. 0점은 쪽지 보낼시 포인트를 차감하지 않습니다.') ?>
-                <input type="text" name="cf_memo_send_point" value="<?php echo $config['cf_memo_send_point'] ?>" id="cf_memo_send_point" required class="required frm_input" size="5"> 점
+                <input type="text" name="cf_memo_send_point" value="<?php echo (int) $config['cf_memo_send_point']; ?>" id="cf_memo_send_point" required class="required frm_input" size="5"> 점
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_cut_name">이름(닉네임) 표시</label></th>
             <td colspan="3">
-                <input type="text" name="cf_cut_name" value="<?php echo $config['cf_cut_name'] ?>" id="cf_cut_name" class="frm_input" size="5"> 자리만 표시
+                <input type="text" name="cf_cut_name" value="<?php echo (int) $config['cf_cut_name'] ?>" id="cf_cut_name" class="frm_input" size="5"> 자리만 표시
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_nick_modify">닉네임 수정</label></th>
-            <td>수정하면 <input type="text" name="cf_nick_modify" value="<?php echo $config['cf_nick_modify'] ?>" id="cf_nick_modify" class="frm_input" size="3"> 일 동안 바꿀 수 없음</td>
+            <td>수정하면 <input type="text" name="cf_nick_modify" value="<?php echo (int) $config['cf_nick_modify'] ?>" id="cf_nick_modify" class="frm_input" size="3"> 일 동안 바꿀 수 없음</td>
             <th scope="row"><label for="cf_open_modify">정보공개 수정</label></th>
-            <td>수정하면 <input type="text" name="cf_open_modify" value="<?php echo $config['cf_open_modify'] ?>" id="cf_open_modify" class="frm_input" size="3"> 일 동안 바꿀 수 없음</td>
+            <td>수정하면 <input type="text" name="cf_open_modify" value="<?php echo (int) $config['cf_open_modify'] ?>" id="cf_open_modify" class="frm_input" size="3"> 일 동안 바꿀 수 없음</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_new_del">최근게시물 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 최근게시물 자동 삭제') ?>
-                <input type="text" name="cf_new_del" value="<?php echo $config['cf_new_del'] ?>" id="cf_new_del" class="frm_input" size="5"> 일
+                <input type="text" name="cf_new_del" value="<?php echo (int) $config['cf_new_del'] ?>" id="cf_new_del" class="frm_input" size="5"> 일
             </td>
             <th scope="row"><label for="cf_memo_del">쪽지 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 쪽지 자동 삭제') ?>
-                <input type="text" name="cf_memo_del" value="<?php echo $config['cf_memo_del'] ?>" id="cf_memo_del" class="frm_input" size="5"> 일
+                <input type="text" name="cf_memo_del" value="<?php echo (int) $config['cf_memo_del'] ?>" id="cf_memo_del" class="frm_input" size="5"> 일
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_visit_del">접속자로그 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 접속자 로그 자동 삭제') ?>
-                <input type="text" name="cf_visit_del" value="<?php echo $config['cf_visit_del'] ?>" id="cf_visit_del" class="frm_input" size="5"> 일
+                <input type="text" name="cf_visit_del" value="<?php echo (int) $config['cf_visit_del'] ?>" id="cf_visit_del" class="frm_input" size="5"> 일
             </td>
             <th scope="row"><label for="cf_popular_del">인기검색어 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 인기검색어 자동 삭제') ?>
-                <input type="text" name="cf_popular_del" value="<?php echo $config['cf_popular_del'] ?>" id="cf_popular_del" class="frm_input" size="5"> 일
+                <input type="text" name="cf_popular_del" value="<?php echo (int) $config['cf_popular_del'] ?>" id="cf_popular_del" class="frm_input" size="5"> 일
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_login_minutes">현재 접속자</label></th>
             <td>
                 <?php echo help('설정값 이내의 접속자를 현재 접속자로 인정') ?>
-                <input type="text" name="cf_login_minutes" value="<?php echo $config['cf_login_minutes'] ?>" id="cf_login_minutes" class="frm_input" size="3"> 분
+                <input type="text" name="cf_login_minutes" value="<?php echo (int) $config['cf_login_minutes'] ?>" id="cf_login_minutes" class="frm_input" size="3"> 분
             </td>
             <th scope="row"><label for="cf_new_rows">최근게시물 라인수</label></th>
             <td>
                 <?php echo help('목록 한페이지당 라인수') ?>
-                <input type="text" name="cf_new_rows" value="<?php echo $config['cf_new_rows'] ?>" id="cf_new_rows" class="frm_input" size="3"> 라인
+                <input type="text" name="cf_new_rows" value="<?php echo (int) $config['cf_new_rows'] ?>" id="cf_new_rows" class="frm_input" size="3"> 라인
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_page_rows">한페이지당 라인수</label></th>
             <td>
                 <?php echo help('목록(리스트) 한페이지당 라인수') ?>
-                <input type="text" name="cf_page_rows" value="<?php echo $config['cf_page_rows'] ?>" id="cf_page_rows" class="frm_input" size="3"> 라인
+                <input type="text" name="cf_page_rows" value="<?php echo (int) $config['cf_page_rows'] ?>" id="cf_page_rows" class="frm_input" size="3"> 라인
             </td>
             <th scope="row"><label for="cf_mobile_page_rows">모바일 한페이지당 라인수</label></th>
             <td>
                 <?php echo help('모바일 목록 한페이지당 라인수') ?>
-                <input type="text" name="cf_mobile_page_rows" value="<?php echo $config['cf_mobile_page_rows'] ?>" id="cf_mobile_page_rows" class="frm_input" size="3"> 라인
+                <input type="text" name="cf_mobile_page_rows" value="<?php echo (int) $config['cf_mobile_page_rows'] ?>" id="cf_mobile_page_rows" class="frm_input" size="3"> 라인
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_write_pages">페이지 표시 수<strong class="sound_only">필수</strong></label></th>
-            <td><input type="text" name="cf_write_pages" value="<?php echo $config['cf_write_pages'] ?>" id="cf_write_pages" required class="required numeric frm_input" size="3"> 페이지씩 표시</td>
+            <td><input type="text" name="cf_write_pages" value="<?php echo (int) $config['cf_write_pages'] ?>" id="cf_write_pages" required class="required numeric frm_input" size="3"> 페이지씩 표시</td>
             <th scope="row"><label for="cf_mobile_pages">모바일 페이지 표시 수<strong class="sound_only">필수</strong></label></th>
-            <td><input type="text" name="cf_mobile_pages" value="<?php echo $config['cf_mobile_pages'] ?>" id="cf_mobile_pages" required class="required numeric frm_input" size="3"> 페이지씩 표시</td>
+            <td><input type="text" name="cf_mobile_pages" value="<?php echo (int) $config['cf_mobile_pages'] ?>" id="cf_mobile_pages" required class="required numeric frm_input" size="3"> 페이지씩 표시</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_new_skin">최근게시물 스킨<strong class="sound_only">필수</strong></label></th>
@@ -515,13 +516,13 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
 			<th scope="row"><label for="cf_recaptcha_site_key">구글 reCAPTCHA Site key</label></th>
 			<td colspan="3">
             <?php echo help('reCAPTCHA V2와 Invisible reCAPTCHA 캡챠의 sitekey 와 secret 키는 동일하지 않고, 서로 발급받는 키가 다릅니다.') ?>
-            <input type="text" name="cf_recaptcha_site_key" value="<?php echo $config['cf_recaptcha_site_key']; ?>" id="cf_recaptcha_site_key" class="frm_input" size="52"> <a href="https://www.google.com/recaptcha/admin" target="_blank" class="btn_frmline">reCAPTCHA 등록하기</a>
+            <input type="text" name="cf_recaptcha_site_key" value="<?php echo get_sanitize_input($config['cf_recaptcha_site_key']); ?>" id="cf_recaptcha_site_key" class="frm_input" size="52"> <a href="https://www.google.com/recaptcha/admin" target="_blank" class="btn_frmline">reCAPTCHA 등록하기</a>
             </td>
 		</tr>
 		<tr>
             <th scope="row"><label for="cf_recaptcha_secret_key">구글 reCAPTCHA Secret key</label></th>
             <td colspan="3">
-                <input type="text" name="cf_recaptcha_secret_key" value="<?php echo $config['cf_recaptcha_secret_key']; ?>" id="cf_recaptcha_secret_key" class="frm_input" size="52">
+                <input type="text" name="cf_recaptcha_secret_key" value="<?php echo get_sanitize_input($config['cf_recaptcha_secret_key']); ?>" id="cf_recaptcha_secret_key" class="frm_input" size="52">
             </td>
 		</tr>
         <tr>
@@ -535,33 +536,33 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row"><label for="cf_point_term">포인트 유효기간</label></th>
             <td colspan="3">
                 <?php echo help('기간을 0으로 설정시 포인트 유효기간이 적용되지 않습니다.') ?>
-                <input type="text" name="cf_point_term" value="<?php echo $config['cf_point_term']; ?>" id="cf_point_term" required class="required frm_input" size="5"> 일
+                <input type="text" name="cf_point_term" value="<?php echo (int) $config['cf_point_term']; ?>" id="cf_point_term" required class="required frm_input" size="5"> 일
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_possible_ip">접근가능 IP</label></th>
             <td>
                 <?php echo help('입력된 IP의 컴퓨터만 접근할 수 있습니다.<br>123.123.+ 도 입력 가능. (엔터로 구분)') ?>
-                <textarea name="cf_possible_ip" id="cf_possible_ip"><?php echo $config['cf_possible_ip'] ?></textarea>
+                <textarea name="cf_possible_ip" id="cf_possible_ip"><?php echo get_sanitize_input($config['cf_possible_ip']); ?></textarea>
             </td>
             <th scope="row"><label for="cf_intercept_ip">접근차단 IP</label></th>
             <td>
                 <?php echo help('입력된 IP의 컴퓨터는 접근할 수 없음.<br>123.123.+ 도 입력 가능. (엔터로 구분)') ?>
-                <textarea name="cf_intercept_ip" id="cf_intercept_ip"><?php echo $config['cf_intercept_ip'] ?></textarea>
+                <textarea name="cf_intercept_ip" id="cf_intercept_ip"><?php echo get_sanitize_input($config['cf_intercept_ip']); ?></textarea>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_analytics">방문자분석 스크립트</label></th>
             <td colspan="3">
                 <?php echo help('방문자분석 스크립트 코드를 입력합니다. 예) 구글 애널리틱스'); ?>
-                <textarea name="cf_analytics" id="cf_analytics"><?php echo $config['cf_analytics']; ?></textarea>
+                <textarea name="cf_analytics" id="cf_analytics"><?php echo get_text($config['cf_analytics']); ?></textarea>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_add_meta">추가 메타태그</label></th>
             <td colspan="3">
                 <?php echo help('추가로 사용하실 meta 태그를 입력합니다.'); ?>
-                <textarea name="cf_add_meta" id="cf_add_meta"><?php echo $config['cf_add_meta']; ?></textarea>
+                <textarea name="cf_add_meta" id="cf_add_meta"><?php echo get_text($config['cf_add_meta']); ?></textarea>
             </td>
         </tr>
         <tr>
@@ -569,14 +570,14 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td colspan="3">
                 <?php if (!function_exists('curl_init')) echo help('<b>경고) curl이 지원되지 않아 네이버 신디케이션을 사용할수 없습니다.</b>'); ?>
                 <?php echo help('네이버 신디케이션 연동키(token)을 입력하면 네이버 신디케이션을 사용할 수 있습니다.<br>연동키는 <a href="http://webmastertool.naver.com/" target="_blank"><u>네이버 웹마스터도구</u></a> -> 네이버 신디케이션에서 발급할 수 있습니다.') ?>
-                <input type="text" name="cf_syndi_token" value="<?php echo $config['cf_syndi_token'] ?>" id="cf_syndi_token" class="frm_input" size="70">
+                <input type="text" name="cf_syndi_token" value="<?php echo isset($config['cf_syndi_token']) ? get_sanitize_input($config['cf_syndi_token']) : ''; ?>" id="cf_syndi_token" class="frm_input" size="70">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_syndi_except">네이버 신디케이션 제외게시판</label></th>
             <td colspan="3">
                 <?php echo help('네이버 신디케이션 수집에서 제외할 게시판 아이디를 | 로 구분하여 입력하십시오. 예) notice|adult<br>참고로 그룹접근사용 게시판, 글읽기 권한 2 이상 게시판, 비밀글은 신디케이션 수집에서 제외됩니다.') ?>
-                <input type="text" name="cf_syndi_except" value="<?php echo $config['cf_syndi_except'] ?>" id="cf_syndi_except" class="frm_input" size="70">
+                <input type="text" name="cf_syndi_except" value="<?php echo isset($config['cf_syndi_except']) ? get_sanitize_input($config['cf_syndi_except']) : ''; ?>" id="cf_syndi_except" class="frm_input" size="70">
             </td>
         </tr>
         </tbody>
@@ -604,7 +605,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tbody>
         <tr>
             <th scope="row"><label for="cf_delay_sec">글쓰기 간격<strong class="sound_only">필수</strong></label></th>
-            <td><input type="text" name="cf_delay_sec" value="<?php echo $config['cf_delay_sec'] ?>" id="cf_delay_sec" required class="required numeric frm_input" size="3"> 초 지난후 가능</td>
+            <td><input type="text" name="cf_delay_sec" value="<?php echo (int) $config['cf_delay_sec'] ?>" id="cf_delay_sec" required class="required numeric frm_input" size="3"> 초 지난후 가능</td>
             <th scope="row"><label for="cf_link_target">새창 링크</label></th>
             <td>
                 <?php echo help('글내용중 자동 링크되는 타켓을 지정합니다.') ?>
@@ -618,46 +619,46 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         </tr>
         <tr>
             <th scope="row"><label for="cf_read_point">글읽기 포인트<strong class="sound_only">필수</strong></label></th>
-            <td><input type="text" name="cf_read_point" value="<?php echo $config['cf_read_point'] ?>" id="cf_read_point" required class="required frm_input" size="3"> 점</td>
+            <td><input type="text" name="cf_read_point" value="<?php echo (int) $config['cf_read_point'] ?>" id="cf_read_point" required class="required frm_input" size="3"> 점</td>
             <th scope="row"><label for="cf_write_point">글쓰기 포인트</label></th>
-            <td><input type="text" name="cf_write_point" value="<?php echo $config['cf_write_point'] ?>" id="cf_write_point" required class="required frm_input" size="3"> 점</td>
+            <td><input type="text" name="cf_write_point" value="<?php echo (int) $config['cf_write_point'] ?>" id="cf_write_point" required class="required frm_input" size="3"> 점</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_comment_point">댓글쓰기 포인트</label></th>
-            <td><input type="text" name="cf_comment_point" value="<?php echo $config['cf_comment_point'] ?>" id="cf_comment_point" required class="required frm_input" size="3"> 점</td>
+            <td><input type="text" name="cf_comment_point" value="<?php echo (int) $config['cf_comment_point'] ?>" id="cf_comment_point" required class="required frm_input" size="3"> 점</td>
             <th scope="row"><label for="cf_download_point">다운로드 포인트</label></th>
-            <td><input type="text" name="cf_download_point" value="<?php echo $config['cf_download_point'] ?>" id="cf_download_point" required class="required frm_input" size="3"> 점</td>
+            <td><input type="text" name="cf_download_point" value="<?php echo (int) $config['cf_download_point'] ?>" id="cf_download_point" required class="required frm_input" size="3"> 점</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_search_part">검색 단위</label></th>
-            <td colspan="3"><input type="text" name="cf_search_part" value="<?php echo $config['cf_search_part'] ?>" id="cf_search_part" class="frm_input" size="4"> 건 단위로 검색</td>
+            <td colspan="3"><input type="text" name="cf_search_part" value="<?php echo (int) $config['cf_search_part'] ?>" id="cf_search_part" class="frm_input" size="4"> 건 단위로 검색</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_image_extension">이미지 업로드 확장자</label></th>
             <td colspan="3">
                 <?php echo help('게시판 글작성시 이미지 파일 업로드 가능 확장자. | 로 구분') ?>
-                <input type="text" name="cf_image_extension" value="<?php echo $config['cf_image_extension'] ?>" id="cf_image_extension" class="frm_input" size="70">
+                <input type="text" name="cf_image_extension" value="<?php echo get_sanitize_input($config['cf_image_extension']); ?>" id="cf_image_extension" class="frm_input" size="70">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_flash_extension">플래쉬 업로드 확장자</label></th>
             <td colspan="3">
                 <?php echo help('게시판 글작성시 플래쉬 파일 업로드 가능 확장자. | 로 구분') ?>
-                <input type="text" name="cf_flash_extension" value="<?php echo $config['cf_flash_extension'] ?>" id="cf_flash_extension" class="frm_input" size="70">
+                <input type="text" name="cf_flash_extension" value="<?php echo get_sanitize_input($config['cf_flash_extension']); ?>" id="cf_flash_extension" class="frm_input" size="70">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_movie_extension">동영상 업로드 확장자</label></th>
             <td colspan="3">
                 <?php echo help('게시판 글작성시 동영상 파일 업로드 가능 확장자. | 로 구분') ?>
-                <input type="text" name="cf_movie_extension" value="<?php echo $config['cf_movie_extension'] ?>" id="cf_movie_extension" class="frm_input" size="70">
+                <input type="text" name="cf_movie_extension" value="<?php echo get_sanitize_input($config['cf_movie_extension']); ?>" id="cf_movie_extension" class="frm_input" size="70">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_filter">단어 필터링</label></th>
             <td colspan="3">
                 <?php echo help('입력된 단어가 포함된 내용은 게시할 수 없습니다. 단어와 단어 사이는 ,로 구분합니다.') ?>
-                <textarea name="cf_filter" id="cf_filter" rows="7"><?php echo $config['cf_filter'] ?></textarea>
+                <textarea name="cf_filter" id="cf_filter" rows="7"><?php echo get_sanitize_input($config['cf_filter']); ?></textarea>
              </td>
         </tr>
         </tbody>
@@ -732,11 +733,11 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row"><label for="cf_register_level">회원가입시 권한</label></th>
             <td><?php echo get_member_level_select('cf_register_level', 1, 9, $config['cf_register_level']) ?></td>
             <th scope="row"><label for="cf_register_point">회원가입시 포인트</label></th>
-            <td><input type="text" name="cf_register_point" value="<?php echo $config['cf_register_point'] ?>" id="cf_register_point" class="frm_input" size="5"> 점</td>
+            <td><input type="text" name="cf_register_point" value="<?php echo (int) $config['cf_register_point'] ?>" id="cf_register_point" class="frm_input" size="5"> 점</td>
         </tr>
         <tr>
             <th scope="row" id="th310"><label for="cf_leave_day">회원탈퇴후 삭제일</label></th>
-            <td colspan="3"><input type="text" name="cf_leave_day" value="<?php echo $config['cf_leave_day'] ?>" id="cf_leave_day" class="frm_input" size="2"> 일 후 자동 삭제</td>
+            <td colspan="3"><input type="text" name="cf_leave_day" value="<?php echo (int) $config['cf_leave_day'] ?>" id="cf_leave_day" class="frm_input" size="2"> 일 후 자동 삭제</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_use_member_icon">회원아이콘 사용</label></th>
@@ -753,25 +754,25 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         </tr>
         <tr>
             <th scope="row"><label for="cf_member_icon_size">회원아이콘 용량</label></th>
-            <td><input type="text" name="cf_member_icon_size" value="<?php echo $config['cf_member_icon_size'] ?>" id="cf_member_icon_size" class="frm_input" size="10"> 바이트 이하</td>
+            <td><input type="text" name="cf_member_icon_size" value="<?php echo (int) $config['cf_member_icon_size'] ?>" id="cf_member_icon_size" class="frm_input" size="10"> 바이트 이하</td>
             <th scope="row">회원아이콘 사이즈</th>
             <td>
                 <label for="cf_member_icon_width">가로</label>
-                <input type="text" name="cf_member_icon_width" value="<?php echo $config['cf_member_icon_width'] ?>" id="cf_member_icon_width" class="frm_input" size="2">
+                <input type="text" name="cf_member_icon_width" value="<?php echo (int) $config['cf_member_icon_width'] ?>" id="cf_member_icon_width" class="frm_input" size="2">
                 <label for="cf_member_icon_height">세로</label>
-                <input type="text" name="cf_member_icon_height" value="<?php echo $config['cf_member_icon_height'] ?>" id="cf_member_icon_height" class="frm_input" size="2">
+                <input type="text" name="cf_member_icon_height" value="<?php echo (int) $config['cf_member_icon_height'] ?>" id="cf_member_icon_height" class="frm_input" size="2">
                 픽셀 이하
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_member_img_size">회원이미지 용량</label></th>
-            <td><input type="text" name="cf_member_img_size" value="<?php echo $config['cf_member_img_size'] ?>" id="cf_member_img_size" class="frm_input" size="10"> 바이트 이하</td>
+            <td><input type="text" name="cf_member_img_size" value="<?php echo (int) $config['cf_member_img_size'] ?>" id="cf_member_img_size" class="frm_input" size="10"> 바이트 이하</td>
             <th scope="row">회원이미지 사이즈</th>
             <td>
                 <label for="cf_member_img_width">가로</label>
-                <input type="text" name="cf_member_img_width" value="<?php echo $config['cf_member_img_width'] ?>" id="cf_member_img_width" class="frm_input" size="2">
+                <input type="text" name="cf_member_img_width" value="<?php echo (int) $config['cf_member_img_width'] ?>" id="cf_member_img_width" class="frm_input" size="2">
                 <label for="cf_member_img_height">세로</label>
-                <input type="text" name="cf_member_img_height" value="<?php echo $config['cf_member_img_height'] ?>" id="cf_member_img_height" class="frm_input" size="2">
+                <input type="text" name="cf_member_img_height" value="<?php echo (int) $config['cf_member_img_height'] ?>" id="cf_member_img_height" class="frm_input" size="2">
                 픽셀 이하
             </td>
         </tr>
@@ -779,27 +780,27 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row"><label for="cf_use_recommend">추천인제도 사용</label></th>
             <td><input type="checkbox" name="cf_use_recommend" value="1" id="cf_use_recommend" <?php echo $config['cf_use_recommend']?'checked':''; ?>> 사용</td>
             <th scope="row"><label for="cf_recommend_point">추천인 포인트</label></th>
-            <td><input type="text" name="cf_recommend_point" value="<?php echo $config['cf_recommend_point'] ?>" id="cf_recommend_point" class="frm_input"> 점</td>
+            <td><input type="text" name="cf_recommend_point" value="<?php echo (int) $config['cf_recommend_point'] ?>" id="cf_recommend_point" class="frm_input"> 점</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_prohibit_id">아이디,닉네임 금지단어</label></th>
             <td>
                 <?php echo help('회원아이디, 닉네임으로 사용할 수 없는 단어를 정합니다. 쉼표 (,) 로 구분') ?>
-                <textarea name="cf_prohibit_id" id="cf_prohibit_id" rows="5"><?php echo $config['cf_prohibit_id'] ?></textarea>
+                <textarea name="cf_prohibit_id" id="cf_prohibit_id" rows="5"><?php echo get_sanitize_input($config['cf_prohibit_id']); ?></textarea>
             </td>
             <th scope="row"><label for="cf_prohibit_email">입력 금지 메일</label></th>
             <td>
                 <?php echo help('입력 받지 않을 도메인을 지정합니다. 엔터로 구분 ex) hotmail.com') ?>
-                <textarea name="cf_prohibit_email" id="cf_prohibit_email" rows="5"><?php echo $config['cf_prohibit_email'] ?></textarea>
+                <textarea name="cf_prohibit_email" id="cf_prohibit_email" rows="5"><?php echo get_sanitize_input($config['cf_prohibit_email']); ?></textarea>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_stipulation">회원가입약관</label></th>
-            <td colspan="3"><textarea name="cf_stipulation" id="cf_stipulation" rows="10"><?php echo $config['cf_stipulation'] ?></textarea></td>
+            <td colspan="3"><textarea name="cf_stipulation" id="cf_stipulation" rows="10"><?php echo html_purifier($config['cf_stipulation']); ?></textarea></td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_privacy">개인정보처리방침</label></th>
-            <td colspan="3"><textarea id="cf_privacy" name="cf_privacy" rows="10"><?php echo $config['cf_privacy'] ?></textarea></td>
+            <td colspan="3"><textarea id="cf_privacy" name="cf_privacy" rows="10"><?php echo html_purifier($config['cf_privacy']); ?></textarea></td>
         </tr>
         </tbody>
         </table>
@@ -861,7 +862,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row" class="cf_cert_service"><label for="cf_cert_kcb_cd">코리아크레딧뷰로<br>KCB 회원사ID</label></th>
             <td class="cf_cert_service">
                 <?php echo help('KCB 회원사ID를 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, KCB와 계약체결 후 회원사ID를 발급 받으실 수 있습니다.<br>이용하시려는 서비스에 대한 계약을 아이핀, 휴대폰 본인확인 각각 체결해주셔야 합니다.<br>아이핀 본인확인 테스트의 경우에는 KCB 회원사ID가 필요 없으나,<br>휴대폰 본인확인 테스트의 경우 KCB 에서 따로 발급 받으셔야 합니다.') ?>
-                <input type="text" name="cf_cert_kcb_cd" value="<?php echo $config['cf_cert_kcb_cd'] ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcb_cd" value="<?php echo get_sanitize_input($config['cf_cert_kcb_cd']); ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
                 <a href="http://sir.kr/main/service/b_cert.php" target="_blank" class="btn_frmline">KCB 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
@@ -870,7 +871,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td class="cf_cert_service">
                 <?php echo help('SM으로 시작하는 5자리 사이트 코드중 뒤의 3자리만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 사이트코드를 발급 받으실 수 있습니다.') ?>
                 <span class="sitecode">SM</span>
-                <input type="text" name="cf_cert_kcp_cd" value="<?php echo $config['cf_cert_kcp_cd'] ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">NHN KCP 휴대폰 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcp_cd" value="<?php echo get_sanitize_input($config['cf_cert_kcp_cd']); ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">NHN KCP 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>
@@ -878,21 +879,21 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td class="cf_cert_service">
                 <?php echo help('LG유플러스 상점아이디 중 si_를 제외한 나머지 아이디만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 상점아이디를 발급 받으실 수 있습니다.<br><strong>LG유플러스 휴대폰본인확인은 ActiveX 설치가 필요하므로 Internet Explorer 에서만 사용할 수 있습니다.</strong>') ?>
                 <span class="sitecode">si_</span>
-                <input type="text" name="cf_lg_mid" value="<?php echo $config['cf_lg_mid'] ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_lg_mid" value="<?php echo get_sanitize_input($config['cf_lg_mid']); ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>
             <th scope="row" class="cf_cert_service"><label for="cf_lg_mert_key">LG유플러스 MERT KEY</label></th>
             <td class="cf_cert_service">
                 <?php echo help('LG유플러스 상점MertKey는 상점관리자 -> 계약정보 -> 상점정보관리에서 확인하실 수 있습니다.') ?>
-                <input type="text" name="cf_lg_mert_key" value="<?php echo $config['cf_lg_mert_key'] ?>" id="cf_lg_mert_key" class="frm_input" size="40">
+                <input type="text" name="cf_lg_mert_key" value="<?php echo get_sanitize_input($config['cf_lg_mert_key']); ?>" id="cf_lg_mert_key" class="frm_input" size="40">
             </td>
         </tr>
         <tr>
             <th scope="row" class="cf_cert_service"><label for="cf_cert_limit">본인확인 이용제한</label></th>
             <td class="cf_cert_service">
                 <?php echo help('하루동안 아이핀과 휴대폰 본인확인 인증 이용회수를 제한할 수 있습니다.<br>회수제한은 실서비스에서 아이핀과 휴대폰 본인확인 인증에 개별 적용됩니다.<br>0 으로 설정하시면 회수제한이 적용되지 않습니다.'); ?>
-                <input type="text" name="cf_cert_limit" value="<?php echo $config['cf_cert_limit']; ?>" id="cf_cert_limit" class="frm_input" size="3"> 회
+                <input type="text" name="cf_cert_limit" value="<?php echo (int) $config['cf_cert_limit']; ?>" id="cf_cert_limit" class="frm_input" size="3"> 회
             </td>
         </tr>
         <tr>
@@ -1129,7 +1130,7 @@ include_once('_rewrite_config_form.php');
                     <label for="check_social_payco">페이코 로그인을 사용합니다</label>
                     <div>
                     <h3>페이코 CallbackURL</h3>
-                    <p><?php echo get_social_callbackurl('payco'); ?></p>
+                    <p><?php echo get_social_callbackurl('payco', false, true); ?></p>
                     </div>
                 </div>
             </td>
@@ -1137,73 +1138,73 @@ include_once('_rewrite_config_form.php');
         <tr>
             <th scope="row"><label for="cf_naver_clientid">네이버 Client ID</label></th>
             <td>
-                <input type="text" name="cf_naver_clientid" value="<?php echo $config['cf_naver_clientid'] ?>" id="cf_naver_clientid" class="frm_input" size="40"> <a href="https://developers.naver.com/apps/#/register" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_naver_clientid" value="<?php echo get_sanitize_input($config['cf_naver_clientid']); ?>" id="cf_naver_clientid" class="frm_input" size="40"> <a href="https://developers.naver.com/apps/#/register" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_naver_secret">네이버 Client Secret</label></th>
             <td>
-                <input type="text" name="cf_naver_secret" value="<?php echo $config['cf_naver_secret'] ?>" id="cf_naver_secret" class="frm_input" size="45">
+                <input type="text" name="cf_naver_secret" value="<?php echo get_sanitize_input($config['cf_naver_secret']); ?>" id="cf_naver_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_facebook_appid">페이스북 앱 ID</label></th>
             <td>
-                <input type="text" name="cf_facebook_appid" value="<?php echo $config['cf_facebook_appid'] ?>" id="cf_facebook_appid" class="frm_input" size="40"> <a href="https://developers.facebook.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_facebook_appid" value="<?php echo get_sanitize_input($config['cf_facebook_appid']); ?>" id="cf_facebook_appid" class="frm_input" size="40"> <a href="https://developers.facebook.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_facebook_secret">페이스북 앱 Secret</label></th>
             <td>
-                <input type="text" name="cf_facebook_secret" value="<?php echo $config['cf_facebook_secret'] ?>" id="cf_facebook_secret" class="frm_input" size="45">
+                <input type="text" name="cf_facebook_secret" value="<?php echo get_sanitize_input($config['cf_facebook_secret']); ?>" id="cf_facebook_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_twitter_key">트위터 컨슈머 Key</label></th>
             <td>
-                <input type="text" name="cf_twitter_key" value="<?php echo $config['cf_twitter_key'] ?>" id="cf_twitter_key" class="frm_input" size="40"> <a href="https://dev.twitter.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_twitter_key" value="<?php echo get_sanitize_input($config['cf_twitter_key']); ?>" id="cf_twitter_key" class="frm_input" size="40"> <a href="https://developer.twitter.com/en/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_twitter_secret">트위터 컨슈머 Secret</label></th>
             <td>
-                <input type="text" name="cf_twitter_secret" value="<?php echo $config['cf_twitter_secret'] ?>" id="cf_twitter_secret" class="frm_input" size="45">
+                <input type="text" name="cf_twitter_secret" value="<?php echo get_sanitize_input($config['cf_twitter_secret']); ?>" id="cf_twitter_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_google_clientid">구글 Client ID</label></th>
             <td>
-                <input type="text" name="cf_google_clientid" value="<?php echo $config['cf_google_clientid'] ?>" id="cf_google_clientid" class="frm_input" size="40"> <a href="https://console.developers.google.com" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_google_clientid" value="<?php echo get_sanitize_input($config['cf_google_clientid']); ?>" id="cf_google_clientid" class="frm_input" size="40"> <a href="https://console.developers.google.com" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_google_secret">구글 Client Secret</label></th>
             <td>
-                <input type="text" name="cf_google_secret" value="<?php echo $config['cf_google_secret'] ?>" id="cf_google_secret" class="frm_input" size="45">
+                <input type="text" name="cf_google_secret" value="<?php echo get_sanitize_input($config['cf_google_secret']); ?>" id="cf_google_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_googl_shorturl_apikey">구글 짧은주소 API Key</label></th>
             <td colspan="3">
-                <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo $config['cf_googl_shorturl_apikey'] ?>" id="cf_googl_shorturl_apikey" class="frm_input" size="40"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
+                <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo get_sanitize_input($config['cf_googl_shorturl_apikey']); ?>" id="cf_googl_shorturl_apikey" class="frm_input" size="40"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_kakao_rest_key">카카오 REST API 키</label></th>
             <td>
-                <input type="text" name="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key'] ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/product/kakaoLogin" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_kakao_rest_key" value="<?php echo get_sanitize_input($config['cf_kakao_rest_key']); ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/product/kakaoLogin" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_kakao_client_secret">카카오 Client Secret</label></th>
             <td>
-                <input type="text" name="cf_kakao_client_secret" value="<?php echo $config['cf_kakao_client_secret'] ?>" id="cf_kakao_client_secret" class="frm_input" size="45">
+                <input type="text" name="cf_kakao_client_secret" value="<?php echo get_sanitize_input($config['cf_kakao_client_secret']); ?>" id="cf_kakao_client_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_kakao_js_apikey">카카오 JavaScript 키</label></th>
             <td colspan="3">
-                <input type="text" name="cf_kakao_js_apikey" value="<?php echo $config['cf_kakao_js_apikey'] ?>" id="cf_kakao_js_apikey" class="frm_input" size="45">
+                <input type="text" name="cf_kakao_js_apikey" value="<?php echo get_sanitize_input($config['cf_kakao_js_apikey']); ?>" id="cf_kakao_js_apikey" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_payco_clientid">페이코 Client ID</label></th>
             <td>
-                <input type="text" name="cf_payco_clientid" value="<?php echo $config['cf_payco_clientid']; ?>" id="cf_payco_clientid" class="frm_input" size="40"> <a href="https://developers.payco.com/guide" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_payco_clientid" value="<?php echo get_sanitize_input($config['cf_payco_clientid']); ?>" id="cf_payco_clientid" class="frm_input" size="40"> <a href="https://developers.payco.com/guide" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_payco_secret">페이코 Secret</label></th>
             <td>
-                <input type="text" name="cf_payco_secret" value="<?php echo $config['cf_payco_secret']; ?>" id="cf_payco_secret" class="frm_input" size="45">
+                <input type="text" name="cf_payco_secret" value="<?php echo get_sanitize_input($config['cf_payco_secret']); ?>" id="cf_payco_secret" class="frm_input" size="45">
             </td>
         </tr>
         </tbody>
@@ -1275,20 +1276,20 @@ include_once('_rewrite_config_form.php');
             <th scope="row"><label for="cf_icode_id">아이코드 회원아이디<br>(구버전)</label></th>
             <td>
                 <?php echo help("아이코드에서 사용하시는 회원아이디를 입력합니다."); ?>
-                <input type="text" name="cf_icode_id" value="<?php echo $config['cf_icode_id']; ?>" id="cf_icode_id" class="frm_input" size="20">
+                <input type="text" name="cf_icode_id" value="<?php echo get_sanitize_input($config['cf_icode_id']); ?>" id="cf_icode_id" class="frm_input" size="20">
             </td>
         </tr>
         <tr class="icode_old_version">
             <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호<br>(구버전)</label></th>
             <td>
                 <?php echo help("아이코드에서 사용하시는 비밀번호를 입력합니다."); ?>
-                <input type="password" name="cf_icode_pw" value="<?php echo $config['cf_icode_pw']; ?>" id="cf_icode_pw" class="frm_input">
+                <input type="password" name="cf_icode_pw" value="<?php echo get_sanitize_input($config['cf_icode_pw']); ?>" id="cf_icode_pw" class="frm_input">
             </td>
         </tr>
         <tr class="icode_old_version <?php if(!(isset($userinfo['payment']) && $userinfo['payment'])){ echo 'cf_tr_hide'; } ?>">
             <th scope="row">요금제<br>(구버전)</th>
             <td>
-                <input type="hidden" name="cf_icode_server_ip" value="<?php echo $config['cf_icode_server_ip']; ?>">
+                <input type="hidden" name="cf_icode_server_ip" value="<?php echo get_sanitize_input($config['cf_icode_server_ip']); ?>">
                 <?php
                     if ($userinfo['payment'] == 'A') {
                        echo '충전제';
@@ -1308,7 +1309,7 @@ include_once('_rewrite_config_form.php');
             <th scope="row">충전 잔액<br>(구버전)</th>
             <td>
                 <?php echo number_format($userinfo['coin']); ?> 원.
-                <a href="http://www.icodekorea.com/smsbiz/credit_card_amt.php?icode_id=<?php echo $config['cf_icode_id']; ?>&amp;icode_passwd=<?php echo $config['cf_icode_pw']; ?>" target="_blank" class="btn_frmline">충전하기</a>
+                <a href="http://www.icodekorea.com/smsbiz/credit_card_amt.php?icode_id=<?php echo get_text($config['cf_icode_id']); ?>&amp;icode_passwd=<?php echo get_text($config['cf_icode_pw']); ?>" target="_blank" class="btn_frmline">충전하기</a>
             </td>
         </tr>
         <?php } ?>
@@ -1316,7 +1317,7 @@ include_once('_rewrite_config_form.php');
             <th scope="row"><label for="cf_icode_token_key">아이코드 토큰키<br>(JSON버전)</label></th>
             <td>
                 <?php echo help("아이코드 JSON 버전의 경우 아이코드 토큰키를 입력시 실행됩니다.<br>SMS 전송유형을 LMS로 설정시 90바이트 이내는 SMS, 90 ~ 2000 바이트는 LMS 그 이상은 절삭 되어 LMS로 발송됩니다."); ?>
-                <input type="text" name="cf_icode_token_key" value="<?php echo $config['cf_icode_token_key']; ?>" id="cf_icode_token_key" class="frm_input" size="40">
+                <input type="text" name="cf_icode_token_key" value="<?php echo isset($config['cf_icode_token_key']) ? get_sanitize_input($config['cf_icode_token_key']) : ''; ?>" id="cf_icode_token_key" class="frm_input" size="40">
                 <?php echo help("아이코드 사이트 -> 토큰키관리 메뉴에서 생성한 토큰키를 입력합니다."); ?>
                 <br>
                 서버아이피 : <?php echo $_SERVER['SERVER_ADDR']; ?>
@@ -1434,6 +1435,26 @@ $(function(){
 
 function fconfigform_submit(f)
 {
+    var current_user_ip = "<?php echo $_SERVER['REMOTE_ADDR']; ?>";
+    var cf_intercept_ip_val = f.cf_intercept_ip.value;
+
+    if( cf_intercept_ip_val && current_user_ip ){
+        var cf_intercept_ips = cf_intercept_ip_val.split("\n");
+
+        for(var i=0; i < cf_intercept_ips.length; i++){
+            if ( cf_intercept_ips[i].trim() ) {
+                cf_intercept_ips[i] = cf_intercept_ips[i].replace(".", "\.");
+                cf_intercept_ips[i] = cf_intercept_ips[i].replace("+", "[0-9\.]+");
+                
+                var re = new RegExp(cf_intercept_ips[i]);
+                if ( re.test(current_user_ip) ){
+                    alert("현재 접속 IP : "+ current_user_ip +" 가 차단될수 있기 때문에, 다른 IP를 입력해 주세요.");
+                    return false;
+                }
+            }
+        }
+    }
+
     f.action = "./config_form_update.php";
     return true;
 }
@@ -1509,5 +1530,4 @@ if($config['cf_cert_use']) {
     }
 }
 
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index 250fc9082..cd31cb1e0 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -4,43 +4,184 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
+$cf_title = isset($_POST['cf_title']) ? strip_tags(clean_xss_attributes($_POST['cf_title'])) : '';
+$cf_admin = isset($_POST['cf_admin']) ? clean_xss_tags($_POST['cf_admin'], 1, 1) : '';
+$posts = array();
+
 $mb = get_member($cf_admin);
-if (!$mb['mb_id'])
+
+if (! (isset($mb['mb_id']) && $mb['mb_id']))
     alert('최고관리자 회원아이디가 존재하지 않습니다.');
 
 check_admin_token();
 
+$cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : '';
+
+$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret');
+
+foreach( $check_keys as $key ){
+    if ( isset($_POST[$key]) && $_POST[$key] ){
+        $posts[$key] = $_POST[$key] = preg_replace('/[^a-z0-9_\-\.]/i', '', $_POST[$key]);
+    }
+}
+
+$posts['cf_icode_server_port'] = $_POST['cf_icode_server_port'] = isset($_POST['cf_icode_server_port']) ? preg_replace('/[^0-9]/', '', $_POST['cf_icode_server_port']) : '7295';
+
+if(isset($_POST['cf_intercept_ip']) && $_POST['cf_intercept_ip']){
+
+    $pattern = explode("\n", trim($_POST['cf_intercept_ip']));
+    for ($i=0; $i<count($pattern); $i++) {
+        $pattern[$i] = trim($pattern[$i]);
+        if (empty($pattern[$i]))
+            continue;
+
+        $pattern[$i] = str_replace(".", "\.", $pattern[$i]);
+        $pattern[$i] = str_replace("+", "[0-9\.]+", $pattern[$i]);
+        $pat = "/^{$pattern[$i]}$/";
+
+        if( preg_match($pat, $_SERVER['REMOTE_ADDR']) ){
+            alert("현재 접속 IP : ".$_SERVER['REMOTE_ADDR']." 가 차단될수 있기 때문에, 다른 IP를 입력해 주세요.");
+        }
+    }
+}
+
+$check_keys = array(
+'cf_use_email_certify' => 'int',
+'cf_use_homepage' => 'int',
+'cf_req_homepage' => 'int',
+'cf_use_tel' => 'int',
+'cf_req_tel' => 'int',
+'cf_use_hp' => 'int',
+'cf_req_hp' => 'int',
+'cf_use_addr' => 'int',
+'cf_req_addr' => 'int',
+'cf_use_signature' => 'int',
+'cf_req_signature' => 'int',
+'cf_use_profile' => 'int',
+'cf_req_profile' => 'int',
+'cf_register_level' => 'int',
+'cf_register_point' => 'int',
+'cf_icon_level' => 'int',
+'cf_use_recommend' => 'int',
+'cf_leave_day' => 'int',
+'cf_search_part' => 'int',
+'cf_email_use' => 'int',
+'cf_email_wr_super_admin' => 'int',
+'cf_email_wr_group_admin' => 'int',
+'cf_email_wr_board_admin' => 'int',
+'cf_email_wr_write' => 'int',
+'cf_email_wr_comment_all' => 'int',
+'cf_email_mb_super_admin' => 'int',
+'cf_email_mb_member' => 'int',
+'cf_email_po_super_admin' => 'int',
+'cf_prohibit_id' => 'text',
+'cf_prohibit_email' => 'text',
+'cf_new_del' => 'int',
+'cf_memo_del' => 'int',
+'cf_visit_del' => 'int',
+'cf_popular_del' => 'int',
+'cf_use_member_icon' => 'int',
+'cf_member_icon_size' => 'int',
+'cf_member_icon_width' => 'int',
+'cf_member_icon_height' => 'int',
+'cf_member_img_size' => 'int',
+'cf_member_img_width' => 'int',
+'cf_member_img_height' => 'int',
+'cf_login_minutes' => 'int',
+'cf_formmail_is_member' => 'int',
+'cf_page_rows' => 'int',
+'cf_mobile_page_rows' => 'int',
+'cf_social_login_use' => 'int',
+'cf_cert_req' => 'int',
+'cf_cert_use' => 'int',
+'cf_cert_ipin' => 'char',
+'cf_cert_hp' => 'char',
+'cf_admin_email' => 'char',
+'cf_admin_email_name' => 'char',
+'cf_add_script' => 'text',
+'cf_use_point' => 'int',
+'cf_point_term' => 'int',
+'cf_use_copy_log' => 'int',
+'cf_login_point' => 'int',
+'cf_cut_name' => 'int',
+'cf_nick_modify' => 'int',
+'cf_new_skin' => 'char',
+'cf_new_rows' => 'int',
+'cf_search_skin' => 'char',
+'cf_connect_skin' => 'char',
+'cf_faq_skin' => 'char',
+'cf_read_point' => 'int',
+'cf_write_point' => 'int',
+'cf_comment_point' => 'int',
+'cf_download_point' => 'int',
+'cf_write_pages' => 'int',
+'cf_mobile_pages' => 'int',
+'cf_link_target' => 'char',
+'cf_delay_sec' => 'int',
+'cf_filter' => 'text',
+'cf_possible_ip' => 'text',
+'cf_analytics' => 'text',
+'cf_add_meta' => 'text',
+'cf_member_skin' => 'char',
+'cf_image_extension' => 'char',
+'cf_flash_extension' => 'char',
+'cf_movie_extension' => 'char',
+'cf_visit' => 'char',
+'cf_stipulation' => 'text',
+'cf_privacy' => 'text',
+'cf_open_modify' => 'int',
+'cf_memo_send_point' => 'int',
+'cf_mobile_new_skin' => 'char',
+'cf_mobile_search_skin' => 'char',
+'cf_mobile_connect_skin' => 'char',
+'cf_mobile_faq_skin' => 'char',
+'cf_mobile_member_skin' => 'char',
+'cf_captcha_mp3' => 'char',
+'cf_cert_limit' => 'int',
+'cf_sms_use' => 'char',
+'cf_sms_type' => 'char',
+'cf_icode_id' => 'char',
+'cf_icode_pw' => 'char',
+'cf_icode_server_ip' => 'char',
+'cf_captcha' => 'char',
+'cf_syndi_token' => '',
+'cf_syndi_except' => ''
+);
+
+for($i=1;$i<=10;$i++){
+    $check_keys['cf_'.$i.'_subj'] = isset($_POST['cf_'.$i.'_subj']) ? $_POST['cf_'.$i.'_subj'] : '';
+    $check_keys['cf_'.$i] = isset($_POST['cf_'.$i]) ? $_POST['cf_'.$i] : '';
+}
+
+foreach( $check_keys as $k => $v ){
+    if( $v === 'int' ){
+        $posts[$key] = $_POST[$k] = isset($_POST[$k]) ? (int) $_POST[$k] : 0;
+    } else {
+        if(in_array($k, array('cf_analytics', 'cf_add_meta', 'cf_add_script', 'cf_stipulation', 'cf_privacy'))){
+            $posts[$key] = $_POST[$k] = isset($_POST[$k]) ? $_POST[$k] : '';
+        } else {
+            $posts[$key] = $_POST[$k] = isset($_POST[$k]) ? strip_tags(clean_xss_attributes($_POST[$k])) : '';
+        }
+    }
+}
+
 // 본인확인을 사용할 경우 아이핀, 휴대폰인증 중 하나는 선택되어야 함
 if($_POST['cf_cert_use'] && !$_POST['cf_cert_ipin'] && !$_POST['cf_cert_hp'])
     alert('본인확인을 위해 아이핀 또는 휴대폰 본인학인 서비스를 하나이상 선택해 주십시오');
 
 if(!$_POST['cf_cert_use']) {
-    $_POST['cf_cert_ipin'] = '';
-    $_POST['cf_cert_hp'] = '';
+    $posts[$key] = $_POST['cf_cert_ipin'] = '';
+    $posts[$key] = $_POST['cf_cert_hp'] = '';
 }
 
-$cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : '';
-
-$_POST['cf_title'] = strip_tags(clean_xss_attributes($_POST['cf_title']));
-
-$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret');
-
-foreach( $check_keys as $key ){
-    if ( isset($_POST[$key]) && $_POST[$key] ){
-        $_POST[$key] = preg_replace('/[^a-z0-9_\-\.]/i', '', $_POST[$key]);
-    }
-}
-
-$_POST['cf_icode_server_port'] = isset($_POST['cf_icode_server_port']) ? preg_replace('/[^0-9]/', '', $_POST['cf_icode_server_port']) : '7295';
-
 $sql = " update {$g5['config_table']}
-            set cf_title = '{$_POST['cf_title']}',
-                cf_admin = '{$_POST['cf_admin']}',
+            set cf_title = '{$cf_title}',
+                cf_admin = '{$cf_admin}',
                 cf_admin_email = '{$_POST['cf_admin_email']}',
                 cf_admin_email_name = '{$_POST['cf_admin_email_name']}',
                 cf_add_script = '{$_POST['cf_add_script']}',
@@ -199,5 +340,4 @@ run_event('admin_config_form_update');
 
 update_rewrite_rules();
 
-goto_url('./config_form.php', false);
-?>
\ No newline at end of file
+goto_url('./config_form.php', false);
\ No newline at end of file
diff --git a/adm/contentform.php b/adm/contentform.php
index 4a8eeb1c6..7aa1184f2 100644
--- a/adm/contentform.php
+++ b/adm/contentform.php
@@ -3,7 +3,9 @@ $sub_menu = '300600';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$co_id = isset($_REQUEST['co_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['co_id']) : '';
 
 // 상단, 하단 파일경로 필드 추가
 if(!sql_query(" select co_include_head from {$g5['content_table']} limit 1 ", false)) {
@@ -51,6 +53,13 @@ else
 {
     $html_title .= ' 입력';
     $co = array(
+        'co_id' => '',
+        'co_subject' => '',
+        'co_content' => '',
+        'co_mobile_content' => '',
+        'co_include_head' => '',
+        'co_include_tail' => '',
+        'co_tag_filter_use' => 1,
         'co_html' => 2,
         'co_skin' => 'basic',
         'co_mobile_skin' => 'basic'
@@ -153,6 +162,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="co_himg" id="co_himg">
             <?php
             $himg = G5_DATA_PATH.'/content/'.$co['co_id'].'_h';
+            $himg_str = '';
             if (file_exists($himg)) {
                 $size = @getimagesize($himg);
                 if($size[0] && $size[0] > 750)
@@ -177,6 +187,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="co_timg" id="co_timg">
             <?php
             $timg = G5_DATA_PATH.'/content/'.$co['co_id'].'_t';
+            $timg_str = '';
             if (file_exists($timg)) {
                 $size = @getimagesize($timg);
                 if($size[0] && $size[0] > 750)
@@ -284,5 +295,4 @@ function frmcontentform_check(f)
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/contentformupdate.php b/adm/contentformupdate.php
index af8c35007..0c7f75e57 100644
--- a/adm/contentformupdate.php
+++ b/adm/contentformupdate.php
@@ -6,28 +6,37 @@ if ($w == "u" || $w == "d")
     check_demo();
 
 if ($w == 'd')
-    auth_check($auth[$sub_menu], "d");
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
+$co_row = array('co_id'=>'', 'co_include_head'=>'', 'co_include_tail'=>'');
+
 if ($w == "" || $w == "u")
 {
-    if(preg_match("/[^a-z0-9_]/i", $co_id)) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
+    if(isset($_REQUEST['co_id']) && preg_match("/[^a-z0-9_]/i", $_REQUEST['co_id'])) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
 
     $sql = " select * from {$g5['content_table']} where co_id = '$co_id' ";
     $co_row = sql_fetch($sql);
 }
 
-$co_id = preg_replace('/[^a-z0-9_]/i', '', $co_id);
-$co_subject = strip_tags(clean_xss_attributes($co_subject));
-$co_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($co_include_head, 0, 255));
-$co_include_tail = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($co_include_tail, 0, 255));
+$co_id = isset($_REQUEST['co_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['co_id']) : '';
+$co_subject = isset($_POST['co_subject']) ? strip_tags(clean_xss_attributes($_POST['co_subject'])) : '';
+$co_include_head = isset($_POST['co_include_head']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['co_include_head'], 0, 255)) : '';
+$co_include_tail = isset($_POST['co_include_tail']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['co_include_tail'], 0, 255)) : '';
 $co_tag_filter_use = isset($_POST['co_tag_filter_use']) ? (int) $_POST['co_tag_filter_use'] : 1;
+$co_himg_del = (isset($_POST['co_himg_del']) && $_POST['co_himg_del']) ? 1 : 0;
+$co_timg_del = (isset($_POST['co_timg_del']) && $_POST['co_timg_del']) ? 1 : 0;
+$co_html = isset($_POST['co_html']) ? (int) $_POST['co_html'] : 0;
+$co_content = isset($_POST['co_content']) ? $_POST['co_content'] : '';
+$co_mobile_content = isset($_POST['co_mobile_content']) ? $_POST['co_mobile_content'] : '';
+$co_skin = isset($_POST['co_skin']) ? clean_xss_tags($_POST['co_skin'], 1, 1) : '';
+$co_mobile_skin = isset($_POST['co_mobile_skin']) ? clean_xss_tags($_POST['co_mobile_skin'], 1, 1) : '';
 
 // 관리자가 자동등록방지를 사용해야 할 경우
-if (($co_row['co_include_head'] !== $co_include_head || $co_row['co_include_tail'] !== $co_include_tail) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
+if ((( isset($co_row['co_include_head']) && $co_row['co_include_head'] !== $co_include_head ) || ( isset($co_row['co_include_tail']) && $co_row['co_include_tail'] !== $co_include_tail )) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
     include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 
     if (!chk_captcha()) {
@@ -92,7 +101,7 @@ $sql_common = " co_include_head     = '$co_include_head',
 if ($w == "")
 {
     $row = $co_row;
-    if ($row['co_id'])
+    if (isset($row['co_id']) && $row['co_id'])
         alert("이미 같은 ID로 등록된 내용이 있습니다.");
 
     $sql = " insert {$g5['content_table']}
@@ -145,5 +154,4 @@ if ($w == "" || $w == "u")
 else
 {
     goto_url("./contentlist.php");
-}
-?>
+}
\ No newline at end of file
diff --git a/adm/contentlist.php b/adm/contentlist.php
index a23437423..cf4c54660 100644
--- a/adm/contentlist.php
+++ b/adm/contentlist.php
@@ -2,7 +2,7 @@
 $sub_menu = '300600';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 if( !isset($g5['content_table']) ){
     die('<meta charset="utf-8">/data/dbconfig.php 파일에 <strong>$g5[\'content_table\'] = G5_TABLE_PREFIX.\'content\';</strong> 를 추가해 주세요.');
@@ -94,5 +94,4 @@ $result = sql_query($sql);
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/dbupgrade.php b/adm/dbupgrade.php
index 23ae7916b..d5d954d1f 100644
--- a/adm/dbupgrade.php
+++ b/adm/dbupgrade.php
@@ -2,7 +2,7 @@
 $sub_menu = '100410';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = 'DB 업그레이드';
 include_once('./admin.head.php');
@@ -189,5 +189,4 @@ $db_upgrade_msg = $is_check ? 'DB 업그레이드가 완료되었습니다.' : '
 </div>
 
 <?php
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/faqform.php b/adm/faqform.php
index f5791df49..33024c77d 100644
--- a/adm/faqform.php
+++ b/adm/faqform.php
@@ -3,16 +3,18 @@ $sub_menu = '300700';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
-$fm_id = (int) $fm_id;
-$fa_id = isset($fa_id) ? (int) $fa_id : 0;
+$fm_id = isset($_GET['fm_id']) ? (int) $_GET['fm_id'] : 0;
+$fa_id = isset($_GET['fa_id']) ? (int) $_GET['fa_id'] : 0;
 
 $sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
 $fm = sql_fetch($sql);
 
 $html_title = 'FAQ '.$fm['fm_subject'];
 
+$fa = array('fa_id'=>0, 'fm_id'=>0, 'fa_subject'=>'', 'fa_content'=>'', 'fa_order'=>0);
+
 if ($w == "u")
 {
     $html_title .= " 수정";
@@ -97,5 +99,4 @@ function frmfaqform_check(f)
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/faqformupdate.php b/adm/faqformupdate.php
index 35b8dcb30..a68984bcf 100644
--- a/adm/faqformupdate.php
+++ b/adm/faqformupdate.php
@@ -6,12 +6,18 @@ if ($w == "u" || $w == "d")
     check_demo();
 
 if ($w == 'd')
-    auth_check($auth[$sub_menu], "d");
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
+$fm_id = isset($_REQUEST['fm_id']) ? (int) $_REQUEST['fm_id'] : 0;
+$fa_id = isset($_REQUEST['fa_id']) ? (int) $_REQUEST['fa_id'] : 0;
+$fa_subject = isset($_POST['fa_subject']) ? $_POST['fa_subject'] : '';
+$fa_content = isset($_POST['fa_content']) ? $_POST['fa_content'] : '';
+$fa_order = isset($_POST['fa_order']) ? (int) $_POST['fa_order'] : 0;
+
 $sql_common = " fa_subject = '$fa_subject',
                 fa_content = '$fa_content',
                 fa_order = '$fa_order' ";
@@ -41,5 +47,4 @@ else if ($w == "d")
 if ($w == 'd')
     goto_url("./faqlist.php?fm_id=$fm_id");
 else
-    goto_url("./faqform.php?w=u&amp;fm_id=$fm_id&amp;fa_id=$fa_id");
-?>
+    goto_url("./faqform.php?w=u&amp;fm_id=$fm_id&amp;fa_id=$fa_id");
\ No newline at end of file
diff --git a/adm/faqlist.php b/adm/faqlist.php
index 6f4849bb0..eccd16772 100644
--- a/adm/faqlist.php
+++ b/adm/faqlist.php
@@ -2,11 +2,11 @@
 $sub_menu = '300700';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = 'FAQ 상세관리';
-if ($fm_subject){
-    $fm_subject = clean_xss_tags(strip_tags($fm_subject));
+if (isset($_REQUEST['fm_subject'])){
+    $fm_subject = clean_xss_tags($_REQUEST['fm_subject'], 1, 1, 255);
     $g5['title'] .= ' : '.$fm_subject;
 }
 
@@ -96,5 +96,4 @@ $result = sql_query($sql);
 
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/faqmasterform.php b/adm/faqmasterform.php
index 4ac3f6f80..5e3410615 100644
--- a/adm/faqmasterform.php
+++ b/adm/faqmasterform.php
@@ -3,11 +3,11 @@ $sub_menu = '300700';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 $html_title = 'FAQ';
 
-$fm_id = preg_replace('/[^0-9]/', '', $fm_id);
+$fm_id = isset($_GET['fm_id']) ? preg_replace('/[^0-9]/', '', $_GET['fm_id']) : 0;
 
 if ($w == "u")
 {
@@ -21,7 +21,7 @@ if ($w == "u")
 else
 {
     $html_title .= ' 입력';
-    $fm = array();
+    $fm = array('fm_order'=>'', 'fm_subject'=>'', 'fm_id'=>0, 'fm_head_html'=> '', 'fm_tail_html'=> '', 'fm_mobile_head_html' => '', 'fm_mobile_tail_html' => '');
 }
 
 $g5['title'] = $html_title.' 관리';
@@ -72,6 +72,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="fm_himg" id="fm_himg">
             <?php
             $himg = G5_DATA_PATH.'/faq/'.$fm['fm_id'].'_h';
+            $himg_str = '';
             if (file_exists($himg)) {
                 $size = @getimagesize($himg);
                 if($size[0] && $size[0] > 750)
@@ -96,6 +97,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="fm_timg" id="fm_timg">
             <?php
             $timg = G5_DATA_PATH.'/faq/'.$fm['fm_id'].'_t';
+            $timg_str = '';
             if (file_exists($timg)) {
                 $size = @getimagesize($timg);
                 if($size[0] && $size[0] > 750)
@@ -162,5 +164,4 @@ function frmfaqmasterform_check(f)
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/faqmasterformupdate.php b/adm/faqmasterformupdate.php
index 609e805b3..9c26300c7 100644
--- a/adm/faqmasterformupdate.php
+++ b/adm/faqmasterformupdate.php
@@ -5,21 +5,29 @@ include_once('./_common.php');
 if ($w == "u" || $w == "d")
     check_demo();
 
-if ($W == 'd')
-    auth_check($auth[$sub_menu], "d");
+if ($w == 'd')
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
 @mkdir(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 
+$fm_id = isset($_REQUEST['fm_id']) ? (int) $_REQUEST['fm_id'] : 0;
+$fm_himg_del = isset($_POST['fm_himg_del']) ? (int) $_POST['fm_himg_del'] : 0;
+$fm_timg_del = isset($_POST['fm_timg_del']) ? (int) $_POST['fm_timg_del'] : 0;
+$fm_subject = isset($_POST['fm_subject']) ? strip_tags(clean_xss_attributes($_POST['fm_subject'])) : '';
+$fm_head_html = isset($_POST['fm_head_html']) ? $_POST['fm_head_html'] : '';
+$fm_tail_html = isset($_POST['fm_tail_html']) ? $_POST['fm_tail_html'] : '';
+$fm_mobile_head_html = isset($_POST['fm_mobile_head_html']) ? $_POST['fm_mobile_head_html'] : '';
+$fm_mobile_tail_html = isset($_POST['fm_mobile_tail_html']) ? $_POST['fm_mobile_tail_html'] : '';
+$fm_order = isset($_POST['fm_order']) ? (int) $_POST['fm_order'] : 0;
+
 if ($fm_himg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_h");
 if ($fm_timg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_t");
 
-$fm_subject = strip_tags(clean_xss_attributes($fm_subject));
-
 $sql_common = " set fm_subject = '$fm_subject',
                     fm_head_html = '$fm_head_html',
                     fm_tail_html = '$fm_tail_html',
@@ -72,5 +80,4 @@ if ($w == "" || $w == "u")
     goto_url("./faqmasterform.php?w=u&amp;fm_id=$fm_id");
 }
 else
-    goto_url("./faqmasterlist.php");
-?>
+    goto_url("./faqmasterlist.php");
\ No newline at end of file
diff --git a/adm/faqmasterlist.php b/adm/faqmasterlist.php
index 50dfc11e0..d5abfbb9d 100644
--- a/adm/faqmasterlist.php
+++ b/adm/faqmasterlist.php
@@ -2,7 +2,7 @@
 $sub_menu = '300700';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 //dbconfig파일에 $g5['faq_table'] , $g5['faq_master_table'] 배열변수가 있는지 체크
 if( !isset($g5['faq_table']) || !isset($g5['faq_master_table']) ){
@@ -124,5 +124,4 @@ $result = sql_query($sql);
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/index.php b/adm/index.php
index 4a2020238..2befa9940 100644
--- a/adm/index.php
+++ b/adm/index.php
@@ -100,11 +100,6 @@ $colspan = 12;
             $mb_nick = get_sideview($row['mb_id'], get_text($row['mb_nick']), $row['mb_email'], $row['mb_homepage']);
 
             $mb_id = $row['mb_id'];
-            if ($row['mb_leave_date'])
-                $mb_id = $mb_id;
-            else if ($row['mb_intercept_date'])
-                $mb_id = $mb_id;
-
         ?>
         <tr>
             <td class="td_mbid"><?php echo $mb_id ?></td>
@@ -138,7 +133,7 @@ $sql_common = " from {$g5['board_new_table']} a, {$g5['board_table']} b, {$g5['g
 
 if ($gr_id)
     $sql_common .= " and b.gr_id = '$gr_id' ";
-if ($view) {
+if (isset($view) && $view) {
     if ($view == 'w')
         $sql_common .= " and a.wr_id = a.wr_parent ";
     else if ($view == 'c')
@@ -314,5 +309,4 @@ $colspan = 7;
 </section>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/mail_delete.php b/adm/mail_delete.php
index a190802eb..7d2999cfa 100644
--- a/adm/mail_delete.php
+++ b/adm/mail_delete.php
@@ -4,21 +4,20 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'd');
+auth_check_menu($auth, $sub_menu, 'd');
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$post_count_chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
 
-if(!$count)
+if(! $post_count_chk)
     alert('삭제할 메일목록을 1개이상 선택해 주세요.');
 
-for($i=0; $i<$count; $i++) {
-    $ma_id = $_POST['chk'][$i];
+for($i=0; $i<$post_count_chk; $i++) {
+    $ma_id = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
 
     $sql = " delete from {$g5['mail_table']} where ma_id = '$ma_id' ";
     sql_query($sql);
 }
 
-goto_url('./mail_list.php');
-?>
\ No newline at end of file
+goto_url('./mail_list.php');
\ No newline at end of file
diff --git a/adm/mail_form.php b/adm/mail_form.php
index 6ee6fb95b..a7671fb3b 100644
--- a/adm/mail_form.php
+++ b/adm/mail_form.php
@@ -3,15 +3,16 @@ $sub_menu = "200300";
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $html_title = '회원메일';
 
+$ma_id = isset($_GET['ma_id']) ? (int) $_GET['ma_id'] : 0;
+$ma = array('ma_id'=>0, 'ma_subject'=>'', 'ma_content'=>'');
+
 if ($w == 'u') {
     $html_title .= '수정';
     $readonly = ' readonly';
-    
-    $ma_id = (int) $ma_id;
 
     $sql = " select * from {$g5['mail_table']} where ma_id = '{$ma_id}' ";
     $ma = sql_fetch($sql);
@@ -82,5 +83,4 @@ document.fmailform.ma_subject.focus();
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/mail_list.php b/adm/mail_list.php
index 587a8ddb0..9e2368ff4 100644
--- a/adm/mail_list.php
+++ b/adm/mail_list.php
@@ -2,7 +2,7 @@
 $sub_menu = '200300';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['mail_table']} ";
 
@@ -101,5 +101,4 @@ $(function() {
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/mail_preview.php b/adm/mail_preview.php
index 16abd479d..a13020e5c 100644
--- a/adm/mail_preview.php
+++ b/adm/mail_preview.php
@@ -3,7 +3,9 @@ $sub_menu = "200300";
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$ma_id = isset($_REQUEST['ma_id']) ? (int) $_REQUEST['ma_id'] : 0;
 
 $se = sql_fetch("select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '{$ma_id}' ");
 
diff --git a/adm/mail_select_form.php b/adm/mail_select_form.php
index a8115297d..076e3a60f 100644
--- a/adm/mail_select_form.php
+++ b/adm/mail_select_form.php
@@ -5,7 +5,9 @@ include_once('./_common.php');
 if (!$config['cf_email_use'])
     alert('환경설정에서 \'메일발송 사용\'에 체크하셔야 메일을 발송할 수 있습니다.');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$ma_id = isset($_GET['ma_id']) ? (int) $_GET['ma_id'] : 0;
 
 $sql = " select * from {$g5['mail_table']} where ma_id = '$ma_id' ";
 $ma = sql_fetch($sql);
@@ -26,8 +28,8 @@ $last_option = explode('||', $ma['ma_last_option']);
 for ($i=0; $i<count($last_option); $i++) {
     $option = explode('=', $last_option[$i]);
     // 동적변수
-    $var = $option[0];
-    $$var = $option[1];
+    $var = isset($option[0]) ? $option[0] : '';
+    if( isset($option[1]) ) $$var = $option[1];
 }
 
 if (!isset($mb_id1)) $mb_id1 = 1;
@@ -35,6 +37,10 @@ if (!isset($mb_level_from)) $mb_level_from = 1;
 if (!isset($mb_level_to)) $mb_level_to = 10;
 if (!isset($mb_mailling)) $mb_mailling = 1;
 
+$mb_id1_from = isset($mb_id1_from) ? clean_xss_tags($mb_id1_from, 1, 1, 30) : '';
+$mb_id1_to = isset($mb_id1_to) ? clean_xss_tags($mb_id1_to, 1, 1, 30) : '';
+$mb_email = isset($mb_email) ? clean_xss_tags($mb_email, 1, 1, 100) : '';
+
 $g5['title'] = '회원메일발송';
 include_once('./admin.head.php');
 ?>
@@ -55,15 +61,15 @@ include_once('./admin.head.php');
         <td>
             <input type="radio" name="mb_id1" value="1" id="mb_id1_all" <?php echo $mb_id1?"checked":""; ?>> <label for="mb_id1_all">전체</label>
             <input type="radio" name="mb_id1" value="0" id="mb_id1_section" <?php echo !$mb_id1?"checked":""; ?>> <label for="mb_id1_section">구간</label>
-            <input type="text" name="mb_id1_from" value="<?php echo $mb_id1_from ?>" id="mb_id1_from" title="시작구간" class="frm_input"> 에서
-            <input type="text" name="mb_id1_to" value="<?php echo $mb_id1_to ?>" id="mb_id1_to" title="종료구간" class="frm_input"> 까지
+            <input type="text" name="mb_id1_from" value="<?php echo get_sanitize_input($mb_id1_from); ?>" id="mb_id1_from" title="시작구간" class="frm_input"> 에서
+            <input type="text" name="mb_id1_to" value="<?php echo get_sanitize_input($mb_id1_to); ?>" id="mb_id1_to" title="종료구간" class="frm_input"> 까지
         </td>
     </tr>
     <tr>
         <th scope="row"><label for="mb_email">E-mail</label></th>
         <td>
             <?php echo help("메일 주소에 단어 포함 (예 : @".preg_replace('#^(www[^\.]*\.){1}#', '', $_SERVER['HTTP_HOST']).")") ?>
-            <input type="text" name="mb_email" value="<?php echo $mb_email ?>" id="mb_email" class="frm_input" size="50">
+            <input type="text" name="mb_email" value="<?php echo get_sanitize_input($mb_email); ?>" id="mb_email" class="frm_input" size="50">
         </td>
     </tr>
     <tr>
@@ -118,5 +124,4 @@ include_once('./admin.head.php');
 </form>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/mail_select_list.php b/adm/mail_select_list.php
index b78b55375..e08032e79 100644
--- a/adm/mail_select_list.php
+++ b/adm/mail_select_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "200300";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $ma_last_option = "";
 
@@ -117,5 +117,4 @@ include_once('./admin.head.php');
 </form>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php
index 219e58573..4a7ba5be8 100644
--- a/adm/mail_select_update.php
+++ b/adm/mail_select_update.php
@@ -2,7 +2,7 @@
 $sub_menu = "200300";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $html_title = '회원메일 발송';
 
@@ -26,14 +26,12 @@ echo "</span>";
 
 <?php
 include_once('./admin.tail.php');
-?>
 
-<?php
 flush();
 ob_flush();
 
-$ma_id = trim($_POST['ma_id']);
-$select_member_list = trim($_POST['ma_list']);
+$ma_id = isset($_POST['ma_id']) ? (int) $_POST['ma_id'] : 0;
+$select_member_list = isset($_POST['ma_list']) ? trim($_POST['ma_list']) : '';
 
 //print_r2($_POST); EXIT;
 $member_list = explode("\n", conv_unescape_nl($select_member_list));
@@ -84,4 +82,4 @@ for ($i=0; $i<count($member_list); $i++)
     }
 }
 ?>
-<script> document.all.cont.innerHTML += "<br><br>총 <?php echo number_format($cnt) ?>건 발송<br><br><font color=crimson><b>[끝]</b></font>"; document.body.scrollTop += 1000; </script>
+<script> document.all.cont.innerHTML += "<br><br>총 <?php echo number_format($cnt) ?>건 발송<br><br><font color=crimson><b>[끝]</b></font>"; document.body.scrollTop += 1000; </script>
\ No newline at end of file
diff --git a/adm/mail_test.php b/adm/mail_test.php
index bc321f545..3731a3f2a 100644
--- a/adm/mail_test.php
+++ b/adm/mail_test.php
@@ -7,7 +7,7 @@ if (!$config['cf_email_use'])
 
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_demo();
 
@@ -17,6 +17,7 @@ $name = get_text($member['mb_name']);
 $nick = $member['mb_nick'];
 $mb_id = $member['mb_id'];
 $email = $member['mb_email'];
+$ma_id = isset($_REQUEST['ma_id']) ? (int) $_REQUEST['ma_id'] : 0;
 
 $sql = "select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '{$ma_id}' ";
 $ma = sql_fetch($sql);
@@ -35,5 +36,4 @@ $content = $content . '<p>더 이상 정보 수신을 원치 않으시면 [<a hr
 
 mailer($config['cf_title'], $member['mb_email'], $member['mb_email'], $subject, $content, 1);
 
-alert($member['mb_nick'].'('.$member['mb_email'].')님께 테스트 메일을 발송하였습니다. 확인하여 주십시오.');
-?>
+alert($member['mb_nick'].'('.$member['mb_email'].')님께 테스트 메일을 발송하였습니다. 확인하여 주십시오.');
\ No newline at end of file
diff --git a/adm/mail_update.php b/adm/mail_update.php
index 04d04ac92..844aa4435 100644
--- a/adm/mail_update.php
+++ b/adm/mail_update.php
@@ -5,18 +5,19 @@ include_once('./_common.php');
 if ($w == 'u' || $w == 'd')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
 $ma_id = isset($_POST['ma_id']) ? (int) $_POST['ma_id'] : 0;
 $ma_subject = isset($_POST['ma_subject']) ? strip_tags(clean_xss_attributes($_POST['ma_subject'])) : '';
+$ma_content = isset($_POST['ma_content']) ? $_POST['ma_content'] : '';
 
 if ($w == '')
 {
     $sql = " insert {$g5['mail_table']}
                 set ma_subject = '{$ma_subject}',
-                     ma_content = '{$_POST['ma_content']}',
+                     ma_content = '{$ma_content}',
                      ma_time = '".G5_TIME_YMDHIS."',
                      ma_ip = '{$_SERVER['REMOTE_ADDR']}' ";
     sql_query($sql);
@@ -25,7 +26,7 @@ else if ($w == 'u')
 {
     $sql = " update {$g5['mail_table']}
                 set ma_subject = '{$ma_subject}',
-                     ma_content = '{$_POST['ma_content']}',
+                     ma_content = '{$ma_content}',
                      ma_time = '".G5_TIME_YMDHIS."',
                      ma_ip = '{$_SERVER['REMOTE_ADDR']}'
                 where ma_id = '{$ma_id}' ";
@@ -37,5 +38,4 @@ else if ($w == 'd')
     sql_query($sql);
 }
 
-goto_url('./mail_list.php');
-?>
+goto_url('./mail_list.php');
\ No newline at end of file
diff --git a/adm/member_delete.php b/adm/member_delete.php
index e536f6c57..6f675f347 100644
--- a/adm/member_delete.php
+++ b/adm/member_delete.php
@@ -4,11 +4,11 @@ include_once("./_common.php");
 
 check_demo();
 
-auth_check($auth[$sub_menu], "d");
+auth_check_menu($auth, $sub_menu, "d");
 
-$mb = get_member($_POST['mb_id']);
+$mb = isset($_POST['mb_id']) ? get_member($_POST['mb_id']) : array();
 
-if (!$mb['mb_id'])
+if (! (isset($mb['mb_id']) && $mb['mb_id']))
     alert("회원자료가 존재하지 않습니다.");
 else if ($member['mb_id'] == $mb['mb_id'])
     alert("로그인 중인 관리자는 삭제 할 수 없습니다.");
@@ -25,5 +25,4 @@ member_delete($mb['mb_id']);
 if ($url)
     goto_url("{$url}?$qstr&amp;w=u&amp;mb_id=$mb_id");
 else
-    goto_url("./member_list.php?$qstr");
-?>
+    goto_url("./member_list.php?$qstr");
\ No newline at end of file
diff --git a/adm/member_form.php b/adm/member_form.php
index 2b95e6581..470fccced 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -2,7 +2,46 @@
 $sub_menu = "200100";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
+
+$mb = array(
+'mb_certify' => null,
+'mb_adult' => null,
+'mb_sms' => null,
+'mb_intercept_date' => null,
+'mb_id' => null,
+'mb_name' => null,
+'mb_nick' => null,
+'mb_point' => null,
+'mb_email' => null,
+'mb_homepage' => null,
+'mb_hp' => null,
+'mb_tel' => null,
+'mb_zip1' => null,
+'mb_zip2' => null,
+'mb_addr1' => null,
+'mb_addr2' => null,
+'mb_addr3' => null,
+'mb_addr_jibeon' => null,
+'mb_signature' => null,
+'mb_profile' => null,
+'mb_memo' => null,
+'mb_leave_date' => null,
+'mb_1' => null,
+'mb_2' => null,
+'mb_3' => null,
+'mb_4' => null,
+'mb_5' => null,
+'mb_6' => null,
+'mb_7' => null,
+'mb_8' => null,
+'mb_9' => null,
+'mb_10' => null,
+);
+
+$sound_only = '';
+$required_mb_id_class = '';
+$required_mb_password = '';
 
 if ($w == '')
 {
@@ -26,7 +65,6 @@ else if ($w == 'u')
         alert('자신보다 권한이 높거나 같은 회원은 수정할 수 없습니다.');
 
     $required_mb_id = 'readonly';
-    $required_mb_password = '';
     $html_title = '수정';
 
     $mb['mb_name'] = get_text($mb['mb_name']);
@@ -243,7 +281,8 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
             $icon_file = G5_DATA_PATH.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb['mb_id']).'.gif';
             if (file_exists($icon_file)) {
                 $icon_url = str_replace(G5_DATA_PATH, G5_DATA_URL, $icon_file);
-                echo '<img src="'.$icon_url.'" alt="">';
+                $icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?'.filemtime($icon_file) : '';
+                echo '<img src="'.$icon_url.$icon_filemtile.'" alt="">';
                 echo '<input type="checkbox" id="del_mb_icon" name="del_mb_icon" value="1">삭제';
             }
             ?>
@@ -258,8 +297,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
             $mb_dir = substr($mb['mb_id'],0,2);
             $icon_file = G5_DATA_PATH.'/member_image/'.$mb_dir.'/'.get_mb_icon_name($mb['mb_id']).'.gif';
             if (file_exists($icon_file)) {
-                $icon_url = str_replace(G5_DATA_PATH, G5_DATA_URL, $icon_file);
-                echo '<img src="'.$icon_url.'" alt="">';
+                echo get_member_profile_img($mb['mb_id']);
                 echo '<input type="checkbox" id="del_mb_img" name="del_mb_img" value="1">삭제';
             }
             ?>
@@ -481,5 +519,4 @@ function fmember_submit(f)
 <?php
 run_event('admin_member_form_after', $mb, $w);
 
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/member_form_update.php b/adm/member_form_update.php
index a0c87eb9d..163fbcb74 100644
--- a/adm/member_form_update.php
+++ b/adm/member_form_update.php
@@ -7,11 +7,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 if ($w == 'u')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-$mb_id = trim($_POST['mb_id']);
+$mb_id = isset($_POST['mb_id']) ? trim($_POST['mb_id']) : '';
+$mb_certify_case = isset($_POST['mb_certify_case']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['mb_certify_case']) : '';
+$mb_certify = isset($_POST['mb_certify']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['mb_certify']) : '';
+$mb_zip = isset($_POST['mb_zip']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['mb_zip']) : '';
 
 // 휴대폰번호 체크
 $mb_hp = hyphen_hp_number($_POST['mb_hp']);
@@ -22,72 +25,101 @@ if($mb_hp) {
 }
 
 // 인증정보처리
-if($_POST['mb_certify_case'] && $_POST['mb_certify']) {
-    $mb_certify = $_POST['mb_certify_case'];
-    $mb_adult = $_POST['mb_adult'];
+if($mb_certify_case && $mb_certify) {
+    $mb_certify = isset($_POST['mb_certify_case']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['mb_certify_case']) : '';
+    $mb_adult = isset($_POST['mb_adult']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['mb_adult']) : '';
 } else {
     $mb_certify = '';
     $mb_adult = 0;
 }
 
-$mb_zip1 = substr($_POST['mb_zip'], 0, 3);
-$mb_zip2 = substr($_POST['mb_zip'], 3);
+$mb_zip1 = substr($mb_zip, 0, 3);
+$mb_zip2 = substr($mb_zip, 3);
 
 $mb_email = isset($_POST['mb_email']) ? get_email_address(trim($_POST['mb_email'])) : '';
 $mb_nick = isset($_POST['mb_nick']) ? trim(strip_tags($_POST['mb_nick'])) : '';
 
 if ($msg = valid_mb_nick($mb_nick))     alert($msg, "", true, true);
 
-$sql_common = "  mb_name = '{$_POST['mb_name']}',
+$posts = array();
+$check_keys = array(
+'mb_name',
+'mb_homepage',
+'mb_tel',
+'mb_addr1',
+'mb_addr2',
+'mb_addr3',
+'mb_addr_jibeon',
+'mb_signature',
+'mb_leave_date',
+'mb_intercept_date',
+'mb_mailling',
+'mb_sms',
+'mb_open',
+'mb_profile',
+'mb_level'
+);
+
+for($i=1;$i<=10;$i++){
+    $check_keys[] = 'mb_'.$i; 
+}
+
+foreach( $check_keys as $key ){
+    $posts[$key] = isset($_POST[$key]) ? clean_xss_tags($_POST[$key], 1, 1) : '';
+}
+
+$mb_memo = isset($_POST['mb_memo']) ? $_POST['mb_memo'] : '';
+
+$sql_common = "  mb_name = '{$posts['mb_name']}',
                  mb_nick = '{$mb_nick}',
                  mb_email = '{$mb_email}',
-                 mb_homepage = '{$_POST['mb_homepage']}',
-                 mb_tel = '{$_POST['mb_tel']}',
+                 mb_homepage = '{$posts['mb_homepage']}',
+                 mb_tel = '{$posts['mb_tel']}',
                  mb_hp = '{$mb_hp}',
                  mb_certify = '{$mb_certify}',
                  mb_adult = '{$mb_adult}',
                  mb_zip1 = '$mb_zip1',
                  mb_zip2 = '$mb_zip2',
-                 mb_addr1 = '{$_POST['mb_addr1']}',
-                 mb_addr2 = '{$_POST['mb_addr2']}',
-                 mb_addr3 = '{$_POST['mb_addr3']}',
-                 mb_addr_jibeon = '{$_POST['mb_addr_jibeon']}',
-                 mb_signature = '{$_POST['mb_signature']}',
-                 mb_leave_date = '{$_POST['mb_leave_date']}',
-                 mb_intercept_date='{$_POST['mb_intercept_date']}',
-                 mb_memo = '{$_POST['mb_memo']}',
-                 mb_mailling = '{$_POST['mb_mailling']}',
-                 mb_sms = '{$_POST['mb_sms']}',
-                 mb_open = '{$_POST['mb_open']}',
-                 mb_profile = '{$_POST['mb_profile']}',
-                 mb_level = '{$_POST['mb_level']}',
-                 mb_1 = '{$_POST['mb_1']}',
-                 mb_2 = '{$_POST['mb_2']}',
-                 mb_3 = '{$_POST['mb_3']}',
-                 mb_4 = '{$_POST['mb_4']}',
-                 mb_5 = '{$_POST['mb_5']}',
-                 mb_6 = '{$_POST['mb_6']}',
-                 mb_7 = '{$_POST['mb_7']}',
-                 mb_8 = '{$_POST['mb_8']}',
-                 mb_9 = '{$_POST['mb_9']}',
-                 mb_10 = '{$_POST['mb_10']}' ";
+                 mb_addr1 = '{$posts['mb_addr1']}',
+                 mb_addr2 = '{$posts['mb_addr2']}',
+                 mb_addr3 = '{$posts['mb_addr3']}',
+                 mb_addr_jibeon = '{$posts['mb_addr_jibeon']}',
+                 mb_signature = '{$posts['mb_signature']}',
+                 mb_leave_date = '{$posts['mb_leave_date']}',
+                 mb_intercept_date='{$posts['mb_intercept_date']}',
+                 mb_memo = '{$mb_memo}',
+                 mb_mailling = '{$posts['mb_mailling']}',
+                 mb_sms = '{$posts['mb_sms']}',
+                 mb_open = '{$posts['mb_open']}',
+                 mb_profile = '{$posts['mb_profile']}',
+                 mb_level = '{$posts['mb_level']}',
+                 mb_1 = '{$posts['mb_1']}',
+                 mb_2 = '{$posts['mb_2']}',
+                 mb_3 = '{$posts['mb_3']}',
+                 mb_4 = '{$posts['mb_4']}',
+                 mb_5 = '{$posts['mb_5']}',
+                 mb_6 = '{$posts['mb_6']}',
+                 mb_7 = '{$posts['mb_7']}',
+                 mb_8 = '{$posts['mb_8']}',
+                 mb_9 = '{$posts['mb_9']}',
+                 mb_10 = '{$posts['mb_10']}' ";
 
 if ($w == '')
 {
     $mb = get_member($mb_id);
-    if ($mb['mb_id'])
+    if (isset($mb['mb_id']) && $mb['mb_id'])
         alert('이미 존재하는 회원아이디입니다.\\nＩＤ : '.$mb['mb_id'].'\\n이름 : '.$mb['mb_name'].'\\n닉네임 : '.$mb['mb_nick'].'\\n메일 : '.$mb['mb_email']);
 
     // 닉네임중복체크
     $sql = " select mb_id, mb_name, mb_nick, mb_email from {$g5['member_table']} where mb_nick = '{$mb_nick}' ";
     $row = sql_fetch($sql);
-    if ($row['mb_id'])
+    if (isset($row['mb_id']) && $row['mb_id'])
         alert('이미 존재하는 닉네임입니다.\\nＩＤ : '.$row['mb_id'].'\\n이름 : '.$row['mb_name'].'\\n닉네임 : '.$row['mb_nick'].'\\n메일 : '.$row['mb_email']);
 
     // 이메일중복체크
     $sql = " select mb_id, mb_name, mb_nick, mb_email from {$g5['member_table']} where mb_email = '{$mb_email}' ";
     $row = sql_fetch($sql);
-    if ($row['mb_id'])
+    if (isset($row['mb_id']) && $row['mb_id'])
         alert('이미 존재하는 이메일입니다.\\nＩＤ : '.$row['mb_id'].'\\n이름 : '.$row['mb_name'].'\\n닉네임 : '.$row['mb_nick'].'\\n메일 : '.$row['mb_email']);
 
     sql_query(" insert into {$g5['member_table']} set mb_id = '{$mb_id}', mb_password = '".get_encrypt_string($mb_password)."', mb_datetime = '".G5_TIME_YMDHIS."', mb_ip = '{$_SERVER['REMOTE_ADDR']}', mb_email_certify = '".G5_TIME_YMDHIS."', {$sql_common} ");
@@ -95,7 +127,7 @@ if ($w == '')
 else if ($w == 'u')
 {
     $mb = get_member($mb_id);
-    if (!$mb['mb_id'])
+    if (! (isset($mb['mb_id']) && $mb['mb_id']))
         alert('존재하지 않는 회원자료입니다.');
 
     if ($is_admin != 'super' && $mb['mb_level'] >= $member['mb_level'])
@@ -105,19 +137,19 @@ else if ($w == 'u')
         alert('최고관리자의 비밀번호를 수정할수 없습니다.');
     }
 
-    if ($_POST['mb_id'] == $member['mb_id'] && $_POST['mb_level'] != $mb['mb_level'])
+    if ($mb_id === $member['mb_id'] && $_POST['mb_level'] != $mb['mb_level'])
         alert($mb['mb_id'].' : 로그인 중인 관리자 레벨은 수정 할 수 없습니다.');
 
     // 닉네임중복체크
     $sql = " select mb_id, mb_name, mb_nick, mb_email from {$g5['member_table']} where mb_nick = '{$mb_nick}' and mb_id <> '$mb_id' ";
     $row = sql_fetch($sql);
-    if ($row['mb_id'])
+    if (isset($row['mb_id']) && $row['mb_id'])
         alert('이미 존재하는 닉네임입니다.\\nＩＤ : '.$row['mb_id'].'\\n이름 : '.$row['mb_name'].'\\n닉네임 : '.$row['mb_nick'].'\\n메일 : '.$row['mb_email']);
 
     // 이메일중복체크
     $sql = " select mb_id, mb_name, mb_nick, mb_email from {$g5['member_table']} where mb_email = '{$mb_email}' and mb_id <> '$mb_id' ";
     $row = sql_fetch($sql);
-    if ($row['mb_id'])
+    if (isset($row['mb_id']) && $row['mb_id'])
         alert('이미 존재하는 이메일입니다.\\nＩＤ : '.$row['mb_id'].'\\n이름 : '.$row['mb_name'].'\\n닉네임 : '.$row['mb_nick'].'\\n메일 : '.$row['mb_email']);
 
     if ($mb_password)
@@ -125,7 +157,7 @@ else if ($w == 'u')
     else
         $sql_password = "";
 
-    if ($passive_certify)
+    if (isset($passive_certify) && $passive_certify)
         $sql_certify = " , mb_email_certify = '".G5_TIME_YMDHIS."' ";
     else
         $sql_certify = "";
@@ -146,7 +178,7 @@ if( $w == '' || $w == 'u' ){
     $mb_icon_img = get_mb_icon_name($mb_id).'.gif';
 
     // 회원 아이콘 삭제
-    if ($del_mb_icon)
+    if (isset($del_mb_icon) && $del_mb_icon)
         @unlink(G5_DATA_PATH.'/member/'.$mb_dir.'/'.$mb_icon_img);
 
     $image_regex = "/(\.(gif|jpe?g|png))$/i";
@@ -196,7 +228,7 @@ if( $w == '' || $w == 'u' ){
     $mb_img_dir .= substr($mb_id,0,2);
 
     // 회원 이미지 삭제
-    if ($del_mb_img)
+    if (isset($del_mb_img) && $del_mb_img)
         @unlink($mb_img_dir.'/'.$mb_icon_img);
 
     // 아이콘 업로드
@@ -238,5 +270,4 @@ if( $w == '' || $w == 'u' ){
 
 run_event('admin_member_form_update', $w, $mb_id);
 
-goto_url('./member_form.php?'.$qstr.'&amp;w=u&amp;mb_id='.$mb_id, false);
-?>
\ No newline at end of file
+goto_url('./member_form.php?'.$qstr.'&amp;w=u&amp;mb_id='.$mb_id, false);
\ No newline at end of file
diff --git a/adm/member_list.php b/adm/member_list.php
index e8bcf4611..248b62be8 100644
--- a/adm/member_list.php
+++ b/adm/member_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "200100";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['member_table']} ";
 
@@ -78,17 +78,17 @@ $colspan = 16;
 
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id"); ?>>회원아이디</option>
-    <option value="mb_nick"<?php echo get_selected($_GET['sfl'], "mb_nick"); ?>>닉네임</option>
-    <option value="mb_name"<?php echo get_selected($_GET['sfl'], "mb_name"); ?>>이름</option>
-    <option value="mb_level"<?php echo get_selected($_GET['sfl'], "mb_level"); ?>>권한</option>
-    <option value="mb_email"<?php echo get_selected($_GET['sfl'], "mb_email"); ?>>E-MAIL</option>
-    <option value="mb_tel"<?php echo get_selected($_GET['sfl'], "mb_tel"); ?>>전화번호</option>
-    <option value="mb_hp"<?php echo get_selected($_GET['sfl'], "mb_hp"); ?>>휴대폰번호</option>
-    <option value="mb_point"<?php echo get_selected($_GET['sfl'], "mb_point"); ?>>포인트</option>
-    <option value="mb_datetime"<?php echo get_selected($_GET['sfl'], "mb_datetime"); ?>>가입일시</option>
-    <option value="mb_ip"<?php echo get_selected($_GET['sfl'], "mb_ip"); ?>>IP</option>
-    <option value="mb_recommend"<?php echo get_selected($_GET['sfl'], "mb_recommend"); ?>>추천인</option>
+    <option value="mb_id"<?php echo get_selected($sfl, "mb_id"); ?>>회원아이디</option>
+    <option value="mb_nick"<?php echo get_selected($sfl, "mb_nick"); ?>>닉네임</option>
+    <option value="mb_name"<?php echo get_selected($sfl, "mb_name"); ?>>이름</option>
+    <option value="mb_level"<?php echo get_selected($sfl, "mb_level"); ?>>권한</option>
+    <option value="mb_email"<?php echo get_selected($sfl, "mb_email"); ?>>E-MAIL</option>
+    <option value="mb_tel"<?php echo get_selected($sfl, "mb_tel"); ?>>전화번호</option>
+    <option value="mb_hp"<?php echo get_selected($sfl, "mb_hp"); ?>>휴대폰번호</option>
+    <option value="mb_point"<?php echo get_selected($sfl, "mb_point"); ?>>포인트</option>
+    <option value="mb_datetime"<?php echo get_selected($sfl, "mb_datetime"); ?>>가입일시</option>
+    <option value="mb_ip"<?php echo get_selected($sfl, "mb_ip"); ?>>IP</option>
+    <option value="mb_recommend"<?php echo get_selected($sfl, "mb_recommend"); ?>>추천인</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -330,5 +330,4 @@ function fmemberlist_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/member_list_delete.php b/adm/member_list_delete.php
index f416a6011..eeab528f7 100644
--- a/adm/member_list_delete.php
+++ b/adm/member_list_delete.php
@@ -4,7 +4,7 @@ include_once("./_common.php");
 
 check_demo();
 
-auth_check($auth[$sub_menu], "d");
+auth_check_menu($auth, $sub_menu, "d");
 
 check_admin_token();
 
@@ -33,5 +33,4 @@ for ($i=0; $i<count($chk); $i++)
 if ($msg)
     echo "<script type='text/javascript'> alert('$msg'); </script>";
 
-goto_url("./member_list.php?$qstr");
-?>
+goto_url("./member_list.php?$qstr");
\ No newline at end of file
diff --git a/adm/member_list_update.php b/adm/member_list_update.php
index 7e250d4af..82a2db6c3 100644
--- a/adm/member_list_update.php
+++ b/adm/member_list_update.php
@@ -4,46 +4,54 @@ include_once('./_common.php');
 
 check_demo();
 
-if (!count($_POST['chk'])) {
+if (! (isset($_POST['chk']) && is_array($_POST['chk']))) {
     alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
 }
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
 $mb_datas = array();
+$msg = '';
 
 if ($_POST['act_button'] == "선택수정") {
 
     for ($i=0; $i<count($_POST['chk']); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
+        $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
+        
+        $post_mb_certify = (isset($_POST['mb_certify'][$k]) && $_POST['mb_certify'][$k]) ? clean_xss_tags($_POST['mb_certify'][$k], 1, 1, 20) : '';
+        $post_mb_level = isset($_POST['mb_level'][$k]) ? (int) $_POST['mb_level'][$k] : 0;
+        $post_mb_intercept_date = (isset($_POST['mb_intercept_date'][$k]) && $_POST['mb_intercept_date'][$k]) ? clean_xss_tags($_POST['mb_intercept_date'][$k], 1, 1, 8) : '';
+        $post_mb_mailling = isset($_POST['mb_mailling'][$k]) ? (int) $_POST['mb_mailling'][$k] : 0;
+        $post_mb_sms = isset($_POST['mb_sms'][$k]) ? (int) $_POST['mb_sms'][$k] : 0;
+        $post_mb_open = isset($_POST['mb_open'][$k]) ? (int) $_POST['mb_open'][$k] : 0;
 
         $mb_datas[] = $mb = get_member($_POST['mb_id'][$k]);
 
-        if (!$mb['mb_id']) {
+        if (! (isset($mb['mb_id']) && $mb['mb_id'])) {
             $msg .= $mb['mb_id'].' : 회원자료가 존재하지 않습니다.\\n';
         } else if ($is_admin != 'super' && $mb['mb_level'] >= $member['mb_level']) {
             $msg .= $mb['mb_id'].' : 자신보다 권한이 높거나 같은 회원은 수정할 수 없습니다.\\n';
         } else if ($member['mb_id'] == $mb['mb_id']) {
             $msg .= $mb['mb_id'].' : 로그인 중인 관리자는 수정 할 수 없습니다.\\n';
         } else {
-            if($_POST['mb_certify'][$k])
-                $mb_adult = (int) $_POST['mb_adult'][$k];
+            if($post_mb_certify)
+                $mb_adult = isset($_POST['mb_adult'][$k]) ? (int) $_POST['mb_adult'][$k] : 0;
             else
                 $mb_adult = 0;
 
             $sql = " update {$g5['member_table']}
-                        set mb_level = '".sql_real_escape_string($_POST['mb_level'][$k])."',
-                            mb_intercept_date = '".sql_real_escape_string($_POST['mb_intercept_date'][$k])."',
-                            mb_mailling = '".sql_real_escape_string($_POST['mb_mailling'][$k])."',
-                            mb_sms = '".sql_real_escape_string($_POST['mb_sms'][$k])."',
-                            mb_open = '".sql_real_escape_string($_POST['mb_open'][$k])."',
-                            mb_certify = '".sql_real_escape_string($_POST['mb_certify'][$k])."',
+                        set mb_level = '".$post_mb_level."',
+                            mb_intercept_date = '".sql_real_escape_string($post_mb_intercept_date)."',
+                            mb_mailling = '".$post_mb_mailling."',
+                            mb_sms = '".$post_mb_sms."',
+                            mb_open = '".$post_mb_open."',
+                            mb_certify = '".sql_real_escape_string($post_mb_certify)."',
                             mb_adult = '{$mb_adult}'
-                        where mb_id = '".sql_real_escape_string($_POST['mb_id'][$k])."' ";
+                        where mb_id = '".sql_real_escape_string($mb['mb_id'])."' ";
             sql_query($sql);
         }
     }
@@ -53,7 +61,7 @@ if ($_POST['act_button'] == "선택수정") {
     for ($i=0; $i<count($_POST['chk']); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
+        $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
 
         $mb_datas[] = $mb = get_member($_POST['mb_id'][$k]);
 
@@ -78,5 +86,4 @@ if ($msg)
 
 run_event('admin_member_list_update', $_POST['act_button'], $mb_datas);
 
-goto_url('./member_list.php?'.$qstr);
-?>
+goto_url('./member_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/menu_form.php b/adm/menu_form.php
index bb421af1c..4c8c43473 100644
--- a/adm/menu_form.php
+++ b/adm/menu_form.php
@@ -8,7 +8,8 @@ if ($is_admin != 'super')
 $g5['title'] = '메뉴 추가';
 include_once(G5_PATH.'/head.sub.php');
 
-$code = isset($code) ? preg_replace('/[^0-9a-zA-Z]/', '', strip_tags($code)) : '';
+$new = isset($_GET['new']) ? clean_xss_tags($_GET['new'], 1, 1) : '';
+$code = isset($_GET['code']) ? preg_replace('/[^0-9a-zA-Z]/', '', $_GET['code']) : '';
 
 // 코드
 if($new == 'new' || !$code) {
@@ -174,10 +175,10 @@ function add_menu_list(name, link, code)
     else
         $menu_last = $menulist.find("tr.menu_list:last");
 
-	if($menu_last.size() > 0) {
+	if($menu_last.length > 0) {
         $menu_last.after(list);
     } else {
-        if($menulist.find("#empty_menu_list").size() > 0)
+        if($menulist.find("#empty_menu_list").length > 0)
             $menulist.find("#empty_menu_list").remove();
 
         $menulist.find("table tbody").append(list);
@@ -193,5 +194,4 @@ function add_menu_list(name, link, code)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/adm/menu_form_search.php b/adm/menu_form_search.php
index 497ee3ee1..bb26e26f4 100644
--- a/adm/menu_form_search.php
+++ b/adm/menu_form_search.php
@@ -4,6 +4,8 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     die('최고관리자만 접근 가능합니다.');
 
+$type = isset($_REQUEST['type']) ? preg_replace('/[^0-9a-z_]/i', '', $_REQUEST['type']) : '';
+
 switch($type) {
     case 'group':
         $sql = " select gr_id as id, gr_subject as subject
@@ -24,9 +26,7 @@ switch($type) {
         $sql = '';
         break;
 }
-?>
 
-<?php
 if($sql) {
     $result = sql_query($sql);
 
@@ -123,4 +123,4 @@ if($sql) {
     <button type="button" id="add_manual" class="btn_submit btn">추가</button>
     <button type="button" class="btn_02 btn" onclick="window.close();">창닫기</button>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } // end if;
\ No newline at end of file
diff --git a/adm/menu_list.php b/adm/menu_list.php
index 4ff7db524..e15c50724 100644
--- a/adm/menu_list.php
+++ b/adm/menu_list.php
@@ -31,6 +31,7 @@ $g5['title'] = "메뉴설정";
 include_once('./admin.head.php');
 
 $colspan = 7;
+$sub_menu_info = '';
 ?>
 
 <div class="local_desc01 local_desc">
@@ -143,14 +144,14 @@ $(function() {
             return false;
 
         var $tr = $(this).closest("tr");
-        if($tr.find("td.sub_menu_class").size() > 0) {
+        if($tr.find("td.sub_menu_class").length > 0) {
             $tr.remove();
         } else {
             var code = $(this).closest("tr").find("input[name='code[]']").val().substr(0, 2);
             $("tr.menu_group_"+code).remove();
         }
 
-        if($("#menulist tr.menu_list").size() < 1) {
+        if($("#menulist tr.menu_list").length < 1) {
             var list = "<tr id=\"empty_menu_list\"><td colspan=\"<?php echo $colspan; ?>\" class=\"empty_table\">자료가 없습니다.</td></tr>\n";
             $("#menulist table tbody").append(list);
         } else {
@@ -215,5 +216,4 @@ function fmenulist_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/menu_list_update.php b/adm/menu_list_update.php
index 528a5a42b..f62ab4714 100644
--- a/adm/menu_list_update.php
+++ b/adm/menu_list_update.php
@@ -21,7 +21,11 @@ for ($i=0; $i<$count; $i++)
 {
     $_POST = array_map_deep('trim', $_POST);
     
-    $_POST['me_link'][$i] = is_array($_POST['me_link']) ? clean_xss_tags(clean_xss_attributes($_POST['me_link'][$i], 1)) : '';
+    if(preg_match('/^javascript/i', preg_replace('/[ ]{1,}|[\t]/', '', $_POST['me_link'][$i]))){
+        $_POST['me_link'][$i] = G5_URL;
+    }
+
+    $_POST['me_link'][$i] = is_array($_POST['me_link']) ? clean_xss_tags(clean_xss_attributes(preg_replace('/[ ]{2,}|[\t]/', '', $_POST['me_link'][$i]), 1)) : '';
 
     $code    = is_array($_POST['code']) ? strip_tags($_POST['code'][$i]) : '';
     $me_name = is_array($_POST['me_name']) ? strip_tags($_POST['me_name'][$i]) : '';
@@ -70,5 +74,4 @@ for ($i=0; $i<$count; $i++)
 
 run_event('admin_menu_list_update');
 
-goto_url('./menu_list.php');
-?>
+goto_url('./menu_list.php');
\ No newline at end of file
diff --git a/adm/newwinform.php b/adm/newwinform.php
index 371aea64a..7dc842c5d 100644
--- a/adm/newwinform.php
+++ b/adm/newwinform.php
@@ -3,9 +3,15 @@ $sub_menu = '100310';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
-$nw_id = preg_replace('/[^0-9]/', '', $nw_id);
+$nw_id = isset($_REQUEST['nw_id']) ? preg_replace('/[^0-9]/', '', $_REQUEST['nw_id']) : 0;
+$nw = array(
+'nw_begin_time'=>'',
+'nw_end_time'=>'',
+'nw_subject'=>'',
+'nw_content'=>'',
+);
 
 $html_title = "팝업레이어";
 if ($w == "u")
@@ -13,7 +19,7 @@ if ($w == "u")
     $html_title .= " 수정";
     $sql = " select * from {$g5['new_win_table']} where nw_id = '$nw_id' ";
     $nw = sql_fetch($sql);
-    if (!$nw['nw_id']) alert("등록된 자료가 없습니다.");
+    if (! (isset($nw['nw_id']) && $nw['nw_id'])) alert("등록된 자료가 없습니다.");
 }
 else
 {
@@ -146,5 +152,4 @@ function frmnewwin_check(f)
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/newwinformupdate.php b/adm/newwinformupdate.php
index f03701166..7fb507512 100644
--- a/adm/newwinformupdate.php
+++ b/adm/newwinformupdate.php
@@ -2,29 +2,55 @@
 $sub_menu = '100310';
 include_once('./_common.php');
 
+$nw_id = isset($_REQUEST['nw_id']) ? preg_replace('/[^0-9]/', '', $_REQUEST['nw_id']) : 0;
+
 if ($w == "u" || $w == "d")
     check_demo();
 
 if ($w == 'd')
-    auth_check($auth[$sub_menu], "d");
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
 $nw_subject = isset($_POST['nw_subject']) ? strip_tags(clean_xss_attributes($_POST['nw_subject'])) : '';
+$posts = array();
 
-$sql_common = " nw_device = '{$_POST['nw_device']}',
-                nw_begin_time = '{$_POST['nw_begin_time']}',
-                nw_end_time = '{$_POST['nw_end_time']}',
-                nw_disable_hours = '{$_POST['nw_disable_hours']}',
-                nw_left = '{$_POST['nw_left']}',
-                nw_top = '{$_POST['nw_top']}',
-                nw_height = '{$_POST['nw_height']}',
-                nw_width = '{$_POST['nw_width']}',
+$check_keys = array(
+'nw_device'=>'str',
+'nw_begin_time'=>'str',
+'nw_end_time'=>'str',
+'nw_disable_hours'=>'int',
+'nw_left'=>'int',
+'nw_top'=>'int',
+'nw_height'=>'int',
+'nw_width'=>'int',
+'nw_content'=>'text',
+'nw_content_html'=>'text',
+);
+
+foreach($check_keys as $key=>$val){
+    if($val === 'int'){
+        $posts[$key] = isset($_POST[$key]) ? (int) $_POST[$key] : 0;
+    } else if ($val === 'str') {
+        $posts[$key] = isset($_POST[$key]) ? clean_xss_tags($_POST[$key], 1, 1) : 0;
+    } else {
+        $posts[$key] = isset($_POST[$key]) ? trim($_POST[$key]) : 0;
+    }
+}
+
+$sql_common = " nw_device = '{$posts['nw_device']}',
+                nw_begin_time = '{$posts['nw_begin_time']}',
+                nw_end_time = '{$posts['nw_end_time']}',
+                nw_disable_hours = '{$posts['nw_disable_hours']}',
+                nw_left = '{$posts['nw_left']}',
+                nw_top = '{$posts['nw_top']}',
+                nw_height = '{$posts['nw_height']}',
+                nw_width = '{$posts['nw_width']}',
                 nw_subject = '{$nw_subject}',
-                nw_content = '{$_POST['nw_content']}',
-                nw_content_html = '{$_POST['nw_content_html']}' ";
+                nw_content = '{$posts['nw_content']}',
+                nw_content_html = '{$posts['nw_content_html']}' ";
 
 if($w == "")
 {
@@ -51,5 +77,4 @@ if ($w == "d")
 else
 {
     goto_url("./newwinform.php?w=u&amp;nw_id=$nw_id");
-}
-?>
+}
\ No newline at end of file
diff --git a/adm/newwinlist.php b/adm/newwinlist.php
index 093892050..ba44e063e 100644
--- a/adm/newwinlist.php
+++ b/adm/newwinlist.php
@@ -2,7 +2,7 @@
 $sub_menu = '100310';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 if( !isset($g5['new_win_table']) ){
     die('<meta charset="utf-8">/data/dbconfig.php 파일에 <strong>$g5[\'new_win_table\'] = G5_TABLE_PREFIX.\'new_win\';</strong> 를 추가해 주세요.');
@@ -114,5 +114,4 @@ $result = sql_query($sql);
 
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/phpinfo.php b/adm/phpinfo.php
index a7f01a149..6bb61c4be 100644
--- a/adm/phpinfo.php
+++ b/adm/phpinfo.php
@@ -4,7 +4,6 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
-phpinfo();
-?>
\ No newline at end of file
+phpinfo();
\ No newline at end of file
diff --git a/adm/point_list.php b/adm/point_list.php
index 7e25aec50..a8c348ad4 100644
--- a/adm/point_list.php
+++ b/adm/point_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "200200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['point_table']} ";
 
@@ -84,8 +84,8 @@ else
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id"); ?>>회원아이디</option>
-    <option value="po_content"<?php echo get_selected($_GET['sfl'], "po_content"); ?>>내용</option>
+    <option value="mb_id"<?php echo get_selected($sfl, "mb_id"); ?>>회원아이디</option>
+    <option value="po_content"<?php echo get_selected($sfl, "po_content"); ?>>내용</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -190,7 +190,7 @@ else
     <input type="hidden" name="sst" value="<?php echo $sst ?>">
     <input type="hidden" name="sod" value="<?php echo $sod ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
-    <input type="hidden" name="token" value="<?php echo $token ?>">
+    <input type="hidden" name="token" value="<?php echo isset($token) ? $token : ''; ?>">
 
     <div class="tbl_frm01 tbl_wrap">
         <table>
@@ -248,5 +248,4 @@ function fpointlist_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/point_list_delete.php b/adm/point_list_delete.php
index fb064b3bf..6926ad8cd 100644
--- a/adm/point_list_delete.php
+++ b/adm/point_list_delete.php
@@ -4,11 +4,11 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'd');
+auth_check_menu($auth, $sub_menu, 'd');
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$count = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
 if(!$count)
     alert($_POST['act_button'].' 하실 항목을 하나 이상 체크하세요.');
 
@@ -57,5 +57,4 @@ for ($i=0; $i<$count; $i++)
     sql_query($sql);
 }
 
-goto_url('./point_list.php?'.$qstr);
-?>
\ No newline at end of file
+goto_url('./point_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/point_update.php b/adm/point_update.php
index ac1a70411..b560538dd 100644
--- a/adm/point_update.php
+++ b/adm/point_update.php
@@ -2,14 +2,14 @@
 $sub_menu = "200200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-$mb_id = strip_tags(clean_xss_attributes($_POST['mb_id']));
-$po_point = strip_tags(clean_xss_attributes($_POST['po_point']));
-$po_content = strip_tags(clean_xss_attributes($_POST['po_content']));
-$expire = preg_replace('/[^0-9]/', '', $_POST['po_expire_term']);
+$mb_id = isset($_POST['mb_id']) ? strip_tags(clean_xss_attributes($_POST['mb_id'])) : '';
+$po_point = isset($_POST['po_point']) ? strip_tags(clean_xss_attributes($_POST['po_point'])) : 0;
+$po_content = isset($_POST['po_content']) ? strip_tags(clean_xss_attributes($_POST['po_content'])) : '';
+$expire = isset($_POST['po_expire_term']) ? preg_replace('/[^0-9]/', '', $_POST['po_expire_term']) : '';
 
 $mb = get_member($mb_id);
 
@@ -21,5 +21,4 @@ if (($po_point < 0) && ($po_point * (-1) > $mb['mb_point']))
 
 insert_point($mb_id, $po_point, $po_content, '@passive', $mb_id, $member['mb_id'].'-'.uniqid(''), $expire);
 
-goto_url('./point_list.php?'.$qstr);
-?>
+goto_url('./point_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/poll_delete.php b/adm/poll_delete.php
index 3cae4f3cf..5827ca065 100644
--- a/adm/poll_delete.php
+++ b/adm/poll_delete.php
@@ -4,17 +4,17 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'd');
+auth_check_menu($auth, $sub_menu, 'd');
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$count = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
 
 if(!$count)
     alert('삭제할 투표목록을 1개이상 선택해 주세요.');
 
 for($i=0; $i<$count; $i++) {
-    $po_id = $_POST['chk'][$i];
+    $po_id = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
 
     $sql = " delete from {$g5['poll_table']} where po_id = '$po_id' ";
     sql_query($sql);
@@ -23,5 +23,4 @@ for($i=0; $i<$count; $i++) {
     sql_query($sql);
 }
 
-goto_url('./poll_list.php?'.$qstr);
-?>
\ No newline at end of file
+goto_url('./poll_list.php?'.$qstr);
\ No newline at end of file
diff --git a/adm/poll_form.php b/adm/poll_form.php
index 3de75ddbe..f04ac7e2c 100644
--- a/adm/poll_form.php
+++ b/adm/poll_form.php
@@ -2,9 +2,15 @@
 $sub_menu = "200900";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $po_id = isset($po_id) ? (int) $po_id : 0;
+$po = array(
+'po_subject'=>'',
+'po_etc'=>'',
+'po_level'=>'',
+'po_point'=>'',
+);
 
 $html_title = '투표';
 if ($w == '')
@@ -48,7 +54,8 @@ include_once('./admin.head.php');
             $sound_only = '<strong class="sound_only">필수</strong>';
         }
 
-        $po_poll = get_text($po['po_poll'.$i]);
+        $po_poll = isset($po['po_poll'.$i]) ? get_text($po['po_poll'.$i]) : '';
+        $po_cnt = isset($po['po_cnt'.$i]) ? get_text($po['po_cnt'.$i]) : 0;
     ?>
 
     <tr>
@@ -56,7 +63,7 @@ include_once('./admin.head.php');
         <td>
             <input type="text" name="po_poll<?php echo $i ?>" value="<?php echo $po_poll ?>" id="po_poll<?php echo $i ?>" <?php echo $required ?> class="frm_input <?php echo $required ?>" maxlength="125">
             <label for="po_cnt<?php echo $i ?>">항목 <?php echo $i ?> 투표수</label>
-            <input type="text" name="po_cnt<?php echo $i ?>" value="<?php echo $po['po_cnt'.$i] ?>" id="po_cnt<?php echo $i ?>" class="frm_input" size="3">
+            <input type="text" name="po_cnt<?php echo $i ?>" value="<?php echo $po_cnt; ?>" id="po_cnt<?php echo $i ?>" class="frm_input" size="3">
        </td>
     </tr>
 
@@ -111,5 +118,4 @@ include_once('./admin.head.php');
 </form>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/poll_form_update.php b/adm/poll_form_update.php
index f5972aa8a..2c4e7c6c2 100644
--- a/adm/poll_form_update.php
+++ b/adm/poll_form_update.php
@@ -6,7 +6,7 @@ $w = $_POST['w'];
 if ($w == 'u' || $w == 'd')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
@@ -99,5 +99,4 @@ sql_query(" update {$g5['config_table']} set cf_max_po_id = '{$row['max_po_id']}
 if ($w == 'd')
     goto_url('./poll_list.php?'.$qstr);
 else
-    goto_url('./poll_form.php?w=u&po_id='.$po_id.'&amp;'.$qstr);
-?>
+    goto_url('./poll_form.php?w=u&po_id='.$po_id.'&amp;'.$qstr);
\ No newline at end of file
diff --git a/adm/poll_list.php b/adm/poll_list.php
index 9b2123d8e..8b719c314 100644
--- a/adm/poll_list.php
+++ b/adm/poll_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "200900";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['poll_table']} ";
 
@@ -59,7 +59,7 @@ $colspan = 7;
 <div class="sch_last">
     <label for="sfl" class="sound_only">검색대상</label>
     <select name="sfl" id="sfl">
-        <option value="po_subject"<?php echo get_selected($_GET['sfl'], "po_subject"); ?>>제목</option>
+        <option value="po_subject"<?php echo get_selected($sfl, "po_subject"); ?>>제목</option>
     </select>
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
     <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -154,5 +154,4 @@ $(function() {
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/popular_list.php b/adm/popular_list.php
index 80f200be2..d55c975d7 100644
--- a/adm/popular_list.php
+++ b/adm/popular_list.php
@@ -2,7 +2,7 @@
 $sub_menu = "300300";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 // 체크된 자료 삭제
 if (isset($_POST['chk']) && is_array($_POST['chk'])) {
@@ -79,8 +79,8 @@ var list_delete_php = 'popular_list.php';
 <div class="sch_last">
     <label for="sfl" class="sound_only">검색대상</label>
     <select name="sfl" id="sfl">
-        <option value="pp_word"<?php echo get_selected($_GET['sfl'], "pp_word"); ?>>검색어</option>
-        <option value="pp_date"<?php echo get_selected($_GET['sfl'], "pp_date"); ?>>등록일</option>
+        <option value="pp_word"<?php echo get_selected($sfl, "pp_word"); ?>>검색어</option>
+        <option value="pp_date"<?php echo get_selected($sfl, "pp_date"); ?>>등록일</option>
     </select>
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
     <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -94,7 +94,7 @@ var list_delete_php = 'popular_list.php';
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
 <input type="hidden" name="stx" value="<?php echo $stx ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="<?php echo isset($token) ? $token : ''; ?>">
 
 <div class="tbl_head01 tbl_wrap">
     <table>
@@ -167,5 +167,4 @@ $(function() {
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/popular_rank.php b/adm/popular_rank.php
index b39127a59..53552d627 100644
--- a/adm/popular_rank.php
+++ b/adm/popular_rank.php
@@ -2,7 +2,10 @@
 $sub_menu = "300400";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? $_REQUEST['fr_date'] : '';
+$to_date = isset($_REQUEST['to_date']) ? $_REQUEST['to_date'] : '';
 
 if (empty($fr_date) || ! preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $fr_date) ) $fr_date = G5_TIME_YMD;
 if (empty($to_date) || ! preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $to_date) ) $to_date = G5_TIME_YMD;
@@ -64,7 +67,7 @@ $(function(){
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
 <input type="hidden" name="stx" value="<?php echo $stx ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="<?php echo isset($token) ? $token : ''; ?>">
 
 <div class="tbl_head01 tbl_wrap">
     <table>
@@ -105,8 +108,5 @@ $(function(){
 
 <?php
 echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page=");
-?>
 
-<?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/qa_config.php b/adm/qa_config.php
index c06a0a059..13664223b 100644
--- a/adm/qa_config.php
+++ b/adm/qa_config.php
@@ -3,7 +3,7 @@ $sub_menu = "300500";
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = '1:1문의 설정';
 include_once ('./admin.head.php');
@@ -396,5 +396,4 @@ function fqaconfigform_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/qa_config_update.php b/adm/qa_config_update.php
index 829c78adb..1f4f7d82c 100644
--- a/adm/qa_config_update.php
+++ b/adm/qa_config_update.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
@@ -61,9 +61,17 @@ if( function_exists('filter_input_include_path') ){
     $qa_include_tail = filter_input_include_path($qa_include_tail);
 }
 
+// 분류에 & 나 = 는 사용이 불가하므로 2바이트로 바꾼다.
+$src_char = array('&', '=');
+$dst_char = array('＆', '〓');
+$qa_category = str_replace($src_char, $dst_char, $_POST['qa_category']);
+
+//https://github.com/gnuboard/gnuboard5/commit/f5f4925d4eb28ba1af728e1065fc2bdd9ce1da58 에 따른 조치
+$qa_category = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $qa_category);
+
 $sql = " update {$g5['qa_config_table']}
             set qa_title                = '{$_POST['qa_title']}',
-                qa_category             = '{$_POST['qa_category']}',
+                qa_category             = '{$qa_category}',
                 qa_skin                 = '{$_POST['qa_skin']}',
                 qa_mobile_skin          = '{$_POST['qa_mobile_skin']}',
                 qa_use_email            = '{$_POST['qa_use_email']}',
@@ -107,5 +115,4 @@ if($error_msg){
     alert($error_msg, './qa_config.php');
 } else {
     goto_url('./qa_config.php');
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/adm/safe_check.php b/adm/safe_check.php
index 71f28f5c5..0143ddf55 100644
--- a/adm/safe_check.php
+++ b/adm/safe_check.php
@@ -13,5 +13,4 @@ function social_log_file_delete($second=0){
             unlink($social_log_file);
         }
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/adm/sendmail_test.php b/adm/sendmail_test.php
index c0a88e600..bb7801d11 100644
--- a/adm/sendmail_test.php
+++ b/adm/sendmail_test.php
@@ -2,7 +2,7 @@
 $sub_menu = '100300';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 if (!$config['cf_email_use'])
     alert('환경설정에서 \'메일발송 사용\'에 체크하셔야 메일을 발송할 수 있습니다.');
@@ -72,5 +72,4 @@ if (isset($_POST['email'])) {
 </section>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/service.php b/adm/service.php
index c677beaff..f38583766 100644
--- a/adm/service.php
+++ b/adm/service.php
@@ -2,7 +2,7 @@
 $sub_menu = '100400';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = '부가서비스';
 include_once('./admin.head.php');
@@ -45,5 +45,4 @@ include_once('./admin.head.php');
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/session_file_delete.php b/adm/session_file_delete.php
index 0b88f8dc2..bfbbb08f3 100644
--- a/adm/session_file_delete.php
+++ b/adm/session_file_delete.php
@@ -57,5 +57,4 @@ include_once("./admin.head.php");
 ?>
 
 <?php
-include_once("./admin.tail.php");
-?>
+include_once("./admin.tail.php");
\ No newline at end of file
diff --git a/adm/sms_admin/_common.php b/adm/sms_admin/_common.php
index 3c53259a8..e295daf97 100644
--- a/adm/sms_admin/_common.php
+++ b/adm/sms_admin/_common.php
@@ -19,5 +19,4 @@ if( isset($token) ){
     $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.G5_SMS5_ADMIN_URL.'/css/sms5.css">', 0);
-?>
\ No newline at end of file
+add_stylesheet('<link rel="stylesheet" href="'.G5_SMS5_ADMIN_URL.'/css/sms5.css">', 0);
\ No newline at end of file
diff --git a/adm/sms_admin/ajax.hp_chk.php b/adm/sms_admin/ajax.hp_chk.php
index b1c303565..4634817b3 100644
--- a/adm/sms_admin/ajax.hp_chk.php
+++ b/adm/sms_admin/ajax.hp_chk.php
@@ -10,12 +10,14 @@ if( !function_exists('json_encode') ) {
     }
 }
 
-ajax_auth_check($auth[$sub_menu], "r");
+ajax_auth_check_menu($auth, $sub_menu, "r");
 
 $err = '';
 $arr_ajax_msg = array();
 $exist_hplist = array();
 
+$bk_hp = isset($_REQUEST['bk_hp']) ? clean_xss_tags($_REQUEST['bk_hp'], 1, 1) : '';
+
 if( !$bk_hp )
     $err = '휴대폰번호를 입력해 주십시오.';
 
@@ -46,6 +48,4 @@ if(!$row['cnt'] && $w == 'u') {
 $arr_ajax_msg['error'] = $err;
 $arr_ajax_msg['exist'] = $exist_hplist;
 
-die( json_encode($arr_ajax_msg) );
-
-?>
\ No newline at end of file
+die( json_encode($arr_ajax_msg) );
\ No newline at end of file
diff --git a/adm/sms_admin/ajax.sms_write_form.php b/adm/sms_admin/ajax.sms_write_form.php
index 82a02b22a..8514179e4 100644
--- a/adm/sms_admin/ajax.sms_write_form.php
+++ b/adm/sms_admin/ajax.sms_write_form.php
@@ -10,7 +10,9 @@ if( !function_exists('json_encode') ) {
     }
 }
 
-ajax_auth_check($auth[$sub_menu], "r");
+ajax_auth_check_menu($auth, $sub_menu, "r");
+
+$fg_no = isset($_REQUEST['fg_no']) ? preg_replace('/[^0-9]/i', '', $_REQUEST['fg_no']) : '';
 
 $page_size = 6;
 
@@ -82,5 +84,4 @@ $arr_ajax_msg = array(
 'total_page'=>$total_page
 );
 
-die( json_encode($arr_ajax_msg) );
-?>
\ No newline at end of file
+die( json_encode($arr_ajax_msg) );
\ No newline at end of file
diff --git a/adm/sms_admin/ajax.sms_write_group.php b/adm/sms_admin/ajax.sms_write_group.php
index 702357183..5b10312e3 100644
--- a/adm/sms_admin/ajax.sms_write_group.php
+++ b/adm/sms_admin/ajax.sms_write_group.php
@@ -4,7 +4,7 @@ include_once("./_common.php");
 
 $colspan = 3;
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $no_group = sql_fetch("select * from {$g5['sms5_book_group_table']} where bg_no=1");
 
diff --git a/adm/sms_admin/ajax.sms_write_level.php b/adm/sms_admin/ajax.sms_write_level.php
index d17fcd54b..b36cf1d18 100644
--- a/adm/sms_admin/ajax.sms_write_level.php
+++ b/adm/sms_admin/ajax.sms_write_level.php
@@ -10,7 +10,7 @@ if( !function_exists('json_encode') ) {
     }
 }
 
-ajax_auth_check($auth[$sub_menu], "r");
+ajax_auth_check_menu($auth, $sub_menu, "r");
 
 $lev = array();
 
@@ -26,6 +26,7 @@ while ($row = sql_fetch_array($qry))
     $lev[$row['mb_level']] = $row['cnt'];
 }
 $str_json = array();
+$line = 0;
 $tmp_str = '';
 $tmp_str .= '
 <div class="tbl_head01 tbl_wrap">
@@ -53,5 +54,4 @@ $tmp_str .= '
 </div>';
 
 $str_json['html'] = $tmp_str;
-echo json_encode($str_json);
-?>
\ No newline at end of file
+echo json_encode($str_json);
\ No newline at end of file
diff --git a/adm/sms_admin/ajax.sms_write_person.php b/adm/sms_admin/ajax.sms_write_person.php
index c37b70058..26a90c3b7 100644
--- a/adm/sms_admin/ajax.sms_write_person.php
+++ b/adm/sms_admin/ajax.sms_write_person.php
@@ -5,7 +5,11 @@ include_once("./_common.php");
 $page_size = 10;
 $colspan = 5;
 
-auth_check($auth[$sub_menu], "r");
+$bg_no = isset($_REQUEST['bg_no']) ? (int) $_REQUEST['bg_no'] : 0;
+$ap = isset($_REQUEST['ap']) ? (int) $_REQUEST['ap'] : 0;
+$no_hp = isset($_REQUEST['no_hp']) ? clean_xss_tags($_REQUEST['no_hp'], 1, 1) : '';
+
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "휴대폰번호 관리";
 
diff --git a/adm/sms_admin/config.php b/adm/sms_admin/config.php
index a8e89543e..dc2d28467 100644
--- a/adm/sms_admin/config.php
+++ b/adm/sms_admin/config.php
@@ -2,7 +2,7 @@
 $sub_menu = "900100";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "SMS 기본설정";
 
@@ -25,7 +25,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw'])
 if (!$config['cf_icode_id'])
     $config['cf_icode_id'] = 'sir_';
 
-if (!$sms5['cf_skin'])
+if (! (isset($sms5['cf_skin']) && $sms5['cf_skin']))
     $sms5['cf_skin'] = 'basic';
 
 include_once(G5_ADMIN_PATH.'/admin.head.php');
@@ -117,7 +117,7 @@ if ($config['cf_sms_use'] == 'icode') { // 아이코드 사용
         <th scope="row"><label for="cf_phone">회신번호<strong class="sound_only"> 필수</strong></label></th>
         <td>
             <?php echo help("회신받을 휴대폰 번호를 입력하세요. 회신번호는 발신번호로 사전등록된 번호와 동일해야 합니다.<br>예) 010-123-4567"); ?>
-            <input type="text" name="cf_phone" value="<?php echo $sms5['cf_phone']; ?>" id="cf_phone" required class="frm_input required" size="13">
+            <input type="text" name="cf_phone" value="<?php echo isset($sms5['cf_phone']) ? get_sanitize_input($sms5['cf_phone']) : ''; ?>" id="cf_phone" required class="frm_input required" size="13">
         </td>
     </tr>
     </tbody>
@@ -144,5 +144,4 @@ if ($config['cf_sms_use'] == 'icode') { // 아이코드 사용
 <?php } ?>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/config_update.php b/adm/sms_admin/config_update.php
index 236d56e74..da708f998 100644
--- a/adm/sms_admin/config_update.php
+++ b/adm/sms_admin/config_update.php
@@ -2,7 +2,7 @@
 $sub_menu = "900100";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 check_demo();
 
@@ -10,6 +10,15 @@ check_admin_token();
 
 $g5['title'] = "SMS 기본설정";
 
+$cf_phone = isset($_REQUEST['cf_phone']) ? clean_xss_tags($_REQUEST['cf_phone'], 1, 1) : '';
+$cf_sms_use = isset($_REQUEST['cf_sms_use']) ? clean_xss_tags($_REQUEST['cf_sms_use'], 1, 1) : '';
+$cf_sms_type = isset($_REQUEST['cf_sms_type']) ? clean_xss_tags($_REQUEST['cf_sms_type'], 1, 1) : '';
+$cf_icode_id = isset($_REQUEST['cf_icode_id']) ? clean_xss_tags($_REQUEST['cf_icode_id'], 1, 1) : '';
+$cf_icode_pw = isset($_REQUEST['cf_icode_pw']) ? clean_xss_tags($_REQUEST['cf_icode_pw'], 1, 1) : '';
+$cf_icode_server_ip = isset($_REQUEST['cf_icode_server_ip']) ? clean_xss_tags($_REQUEST['cf_icode_server_ip'], 1, 1) : '';
+$cf_icode_server_port = isset($_REQUEST['cf_icode_server_port']) ? clean_xss_tags($_REQUEST['cf_icode_server_port'], 1, 1) : '';
+$cf_icode_token_key = isset($_REQUEST['cf_icode_token_key']) ? clean_xss_tags($_REQUEST['cf_icode_token_key'], 1, 1) : '';
+
 // 회신번호 체크
 if(!check_vaild_callback($cf_phone))
     alert('회신번호가 올바르지 않습니다.');
@@ -42,5 +51,4 @@ $sql = " update {$g5['config_table']}
                 cf_icode_token_key      = '$cf_icode_token_key'";
 sql_query($sql);
 
-goto_url("./config.php");
-?>
\ No newline at end of file
+goto_url("./config.php");
\ No newline at end of file
diff --git a/adm/sms_admin/css/sms5.css b/adm/sms_admin/css/sms5.css
index 03187e7ea..31a4096f9 100644
--- a/adm/sms_admin/css/sms5.css
+++ b/adm/sms_admin/css/sms5.css
@@ -126,7 +126,7 @@
 
 /* 휴대폰번호 파일 */
 #sms5_fileup_frm {margin:0 0 10px;padding:0 0;border-bottom:1px solid #e9e9e9}
-#sms5_fileup_frm div {padding:5px 0;;border-bottom:1px solid #f4f4f4}
+#sms5_fileup_frm div {padding:5px 0;border-bottom:1px solid #f4f4f4}
 #sms5_fileup_frm div.sch_last {margin:0;border:0}
 #sms5_fileup_frm strong {display:inline-block;width:80px}
 #sms5_fileup_frm strong.sch_long {width:160px}
diff --git a/adm/sms_admin/emoticon_move.php b/adm/sms_admin/emoticon_move.php
index 4e04cf496..7c1db6eb3 100644
--- a/adm/sms_admin/emoticon_move.php
+++ b/adm/sms_admin/emoticon_move.php
@@ -6,7 +6,7 @@ if ($sw != 'move'){
     alert('sw 값이 제대로 넘어오지 않았습니다.');
 }
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = '이모티콘그룹 이동';
 include_once(G5_PATH.'/head.sub.php');
@@ -111,5 +111,4 @@ function fboardmoveall_submit(f)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/adm/sms_admin/emoticon_move_update.php b/adm/sms_admin/emoticon_move_update.php
index 8fe03b539..08fe2848e 100644
--- a/adm/sms_admin/emoticon_move_update.php
+++ b/adm/sms_admin/emoticon_move_update.php
@@ -1,12 +1,15 @@
 <?php
+$sub_menu = "900600";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
-if(!count($_POST['chk_fg_no']))
+$post_chk_fg_no = (isset($_POST['chk_fg_no']) && is_array($_POST['chk_fg_no'])) ? $_POST['chk_fg_no'] : array();
+
+if(!count($post_chk_fg_no))
     alert('이모티콘을 이동할 그룹을 한개 이상 선택해 주십시오.', $url);
 
-$fo_no_list = preg_replace('/[^a-zA-Z0-9\, ]/', '', $fo_no_list);
+$fo_no_list = isset($_POST['fo_no_list']) ? preg_replace('/[^a-zA-Z0-9\, ]/', '', $_POST['fo_no_list']) : '';
 
 $sql = "select * from {$g5['sms5_form_table']} where fo_no in ($fo_no_list) order by fo_no desc ";
 $result = sql_query($sql);
@@ -14,9 +17,9 @@ $save = array();
 for ($kk=0;$row = sql_fetch_array($result);$kk++)
 {
     $fo_no = $row['fo_no'];
-    for ($i=0; $i<count($_POST['chk_fg_no']); $i++)
+    for ($i=0; $i<count($post_chk_fg_no); $i++)
     {
-        $fg_no = $_POST['chk_fg_no'][$i];
+        $fg_no = $post_chk_fg_no[$i];
         if( !$fg_no ) continue;
         $group = sql_fetch("select * from {$g5['sms5_form_group_table']} where fg_no = '$fg_no'");
         $sql = " insert into {$g5['sms5_form_table']}
@@ -44,19 +47,16 @@ if ($sw == 'move')
 
 $msg = '해당 이모티콘을 선택한 그룹으로 이동 하였습니다.';
 $opener_href = './form_list.php?page='.$page;
-
-echo <<<HEREDOC
+?>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script>
-alert("$msg");
-opener.document.location.href = "$opener_href";
+alert("<?php echo $msg; ?>");
+opener.document.location.href = "<?php echo $opener_href; ?>";
 window.close();
 </script>
 <noscript>
 <p>
-    "$msg"
+    <?php echo $msg; ?>
 </p>
-<a href="$opener_href">돌아가기</a>
-</noscript>
-HEREDOC;
-?>
\ No newline at end of file
+<a href="<?php echo $opener_href; ?>">돌아가기</a>
+</noscript>
\ No newline at end of file
diff --git a/adm/sms_admin/form_group.php b/adm/sms_admin/form_group.php
index d91d061ac..3acb5788f 100644
--- a/adm/sms_admin/form_group.php
+++ b/adm/sms_admin/form_group.php
@@ -4,7 +4,7 @@ include_once("./_common.php");
 
 $colspan = 5;
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "이모티콘 그룹";
 
@@ -67,8 +67,8 @@ function grouplist_submit(f)
 
 </script>
 
-<form name="group<?php echo $res['fg_no']?>" method="post" action="./form_group_update.php" class="local_sch03 local_sch">
-<input type="hidden" name="fg_no" value="<?php echo $res['fg_no']?>">
+<form name="group<?php echo isset($res['fg_no']) ? $res['fg_no'] : ''; ?>" method="post" action="./form_group_update.php" class="local_sch03 local_sch">
+<input type="hidden" name="fg_no" value="<?php echo isset($res['fg_no']) ? $res['fg_no'] : ''; ?>">
 <div>
     <label for="fg_name">그룹명<strong class="sound_only"> 필수</strong></label>
     <input type="text" id="fg_name" name="fg_name" required class="required frm_input">
@@ -83,7 +83,7 @@ function grouplist_submit(f)
     <p>그룹명순으로 정렬됩니다.</p>
 </div>
 
-<form name="group<?php echo $group[$i]['fg_no']?>" method="post" action="./form_group_update.php" onsubmit="return grouplist_submit(this);">
+<form name="group<?php echo isset($group[$i]['fg_no']) ? $group[$i]['fg_no'] : ''; ?>" method="post" action="./form_group_update.php" onsubmit="return grouplist_submit(this);">
 <input type="hidden" name="w" value="u">
 
 <div class="tbl_head01 tbl_wrap">
@@ -136,7 +136,7 @@ function grouplist_submit(f)
         </td>
         <td class="td_left">
             <label for="fg_name_<?php echo $i; ?>" class="sound_only">그룹명</label>
-            <input type="text" name="fg_name[<?php echo $i; ?>]" value="<?php echo $group[$i]['fg_name']?>" id="fg_name_<?php echo $i; ?>" class="frm_input">
+            <input type="text" name="fg_name[<?php echo $i; ?>]" value="<?php echo get_sanitize_input($group[$i]['fg_name']); ?>" id="fg_name_<?php echo $i; ?>" class="frm_input">
             <input type="checkbox" name="fg_member[<?php echo $i; ?>]" value="1" id="fg_member_<?php echo $i; ?>" <?php if ($group[$i]['fg_member']) echo 'checked';?>>
             <label for="fg_member_<?php echo $i; ?>">회원</label>
         </td>
@@ -173,5 +173,4 @@ function grouplist_submit(f)
 </form>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/form_group_move.php b/adm/sms_admin/form_group_move.php
index 27faa14d1..5b430a830 100644
--- a/adm/sms_admin/form_group_move.php
+++ b/adm/sms_admin/form_group_move.php
@@ -3,7 +3,10 @@
 $sub_menu = "900500";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$fg_no = isset($_REQUEST['fg_no']) ? (int) $_REQUEST['fg_no'] : 0;
+$move_no = isset($_REQUEST['move_no']) ? (int) $_REQUEST['move_no'] : 0;
 
 if ($fg_no) 
 {
@@ -26,5 +29,4 @@ $group = sql_fetch("select * from {$g5['sms5_form_group_table']} where fg_no = '
 
 sql_query("update {$g5['sms5_form_table']} set fg_no = '$move_no', fg_member = '{$group['fg_member']}' where fg_no = '$fg_no'");
 
-goto_url('./form_group.php');
-?>
\ No newline at end of file
+goto_url('./form_group.php');
\ No newline at end of file
diff --git a/adm/sms_admin/form_group_update.php b/adm/sms_admin/form_group_update.php
index d5257dcea..824d6f2e4 100644
--- a/adm/sms_admin/form_group_update.php
+++ b/adm/sms_admin/form_group_update.php
@@ -2,16 +2,18 @@
 $sub_menu = "900500";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$post_cnk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? $_POST['chk'] : array();
 
 if ($w == 'u') // 업데이트
 {
-    for ($i=0; $i<count($_POST['chk']); $i++)
+    for ($i=0; $i<count($post_cnk); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-        $fg_no = (int) $_POST['fg_no'][$k];
-        $fg_name = isset($_POST['fg_name'][$k]) ? addslashes(strip_tags($_POST['fg_name'][$k])) : '';
+        $k = $post_cnk[$i];
+        $fg_no = isset($_POST['fg_no'][$k]) ? (int) $_POST['fg_no'][$k] : 0;
+        $fg_name = isset($_POST['fg_name'][$k]) ? addslashes(strip_tags(clean_xss_attributes($_POST['fg_name'][$k]))) : '';
         $fg_member = isset($_POST['fg_member'][$k]) ? addslashes(strip_tags($_POST['fg_member'][$k])) : '';
 
         if (!is_numeric($fg_no))
@@ -34,11 +36,11 @@ if ($w == 'u') // 업데이트
 }
 else if ($w == 'de') // 그룹삭제
 {
-    for ($i=0; $i<count($_POST['chk']); $i++)
+    for ($i=0; $i<count($post_cnk); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-        $fg_no = (int) $_POST['fg_no'][$k];
+        $k = $post_cnk[$i];
+        $fg_no = isset($_POST['fg_no'][$k]) ? (int) $_POST['fg_no'][$k] : 0;
 
         if (!is_numeric($fg_no))
             alert('그룹 고유번호가 없습니다.');
@@ -53,11 +55,11 @@ else if ($w == 'de') // 그룹삭제
 }
 else if ($w == 'em') 
 {
-    for ($i=0; $i<count($_POST['chk']); $i++)
+    for ($i=0; $i<count($post_cnk); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-        $fg_no = (int) $_POST['fg_no'][$k];
+        $k = $post_cnk[$i];
+        $fg_no = isset($_POST['fg_no'][$k]) ? (int) $_POST['fg_no'][$k] : 0;
 
         if ($fg_no == 'no') $fg_no = 0;
 
@@ -80,11 +82,11 @@ else if ($w == 'no')
 }
 else // 등록
 {
+    $fg_name = isset($_POST['fg_name']) ? addslashes(strip_tags(clean_xss_attributes($_POST['fg_name']))) : '';
+
     if (!strlen(trim($fg_name)))
         alert('그룹명을 입력해주세요');
 
-    $fg_name = addslashes(strip_tags($fg_name));
-
     $res = sql_fetch("select fg_name from {$g5['sms5_form_group_table']} where fg_name = '$fg_name'");
     if ($res)
         alert('같은 그룹명이 존재합니다.');
@@ -92,5 +94,4 @@ else // 등록
     sql_query("insert into {$g5['sms5_form_group_table']} set fg_name = '$fg_name'");
 }
 
-goto_url('./form_group.php');
-?>
\ No newline at end of file
+goto_url('./form_group.php');
\ No newline at end of file
diff --git a/adm/sms_admin/form_list.php b/adm/sms_admin/form_list.php
index dca08fb51..9fb66bb4a 100644
--- a/adm/sms_admin/form_list.php
+++ b/adm/sms_admin/form_list.php
@@ -5,7 +5,7 @@ include_once("./_common.php");
 $page_size = 12;
 $colspan = 2;
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $token = get_token();
 
@@ -13,7 +13,7 @@ $g5['title'] = "이모티콘 관리";
 
 if ($page < 1) $page = 1;
 
-$fg_no = isset($fg_no) ? (int) $fg_no : '';
+$fg_no = isset($_REQUEST['fg_no']) ? (int) $_REQUEST['fg_no'] : 0;
 
 if (is_numeric($fg_no))
     $sql_group = " and fg_no='$fg_no' ";
@@ -34,7 +34,7 @@ if ($st == 'all') {
 }
 
 $total_res = sql_fetch("select count(*) as cnt from {$g5['sms5_form_table']} where 1 $sql_group $sql_search");
-$total_count = $total_res['cnt'];
+$total_count = isset($total_res['cnt']) ? $total_res['cnt'] : 0;
 
 $total_page = (int)($total_count/$page_size) + ($total_count%$page_size==0 ? 0 : 1);
 $page_start = $page_size * ( $page - 1 );
@@ -46,7 +46,7 @@ $qry = sql_query("select * from {$g5['sms5_form_group_table']} order by fg_name"
 while ($res = sql_fetch_array($qry)) array_push($group, $res);
 
 $res = sql_fetch("select count(*) as cnt from {$g5['sms5_form_table']} where fg_no=0");
-$no_count = $res['cnt'];
+$no_count = isset($res['cnt']) ? $res['cnt'] : 0;
 
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 ?>
@@ -146,6 +146,7 @@ function multi_update(sel)
 <form name="emoticonlist" id="emoticonlist" method="post" action="./form_multi_update.php" onsubmit="return emoticonlist_submit(this);" >
 <input type="hidden" name="page" value="<?php echo $page; ?>">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
+<input type="hidden" name="fg_no" value="<?php echo $fg_no; ?>">
 <input type="hidden" name="sw" value="">
 <input type="hidden" name="atype" value="del">
 <ul id="sms5_preset" class="sms5_box">
@@ -234,8 +235,7 @@ function select_copy(sw, f) {
 }
 </script>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?fg_no=$fg_no&amp;st=$st&amp;sv=$sv&amp;page="); ?>
-
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?fg_no=$fg_no&amp;st=$st&amp;sv=$sv&amp;page=");
+
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/form_multi_update.php b/adm/sms_admin/form_multi_update.php
index f321a1577..ae8b50129 100644
--- a/adm/sms_admin/form_multi_update.php
+++ b/adm/sms_admin/form_multi_update.php
@@ -2,19 +2,23 @@
 $sub_menu = "900600";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
+$post_fo_no = (isset($_POST['fo_no']) && is_array($_POST['fo_no'])) ? $_POST['fo_no'] : array();
+$atype = isset($_POST['atype']) ? clean_xss_tags($_POST['atype'], 1, 1) : '';
+$fg_no = isset($_POST['fg_no']) ? (int) $_POST['fg_no'] : 0;
+
 if($atype == "del"){
-    $count = count($_POST['fo_no']);
+    $count = count($post_fo_no);
     if(!$count)
         alert('선택삭제 하실 항목을 하나이상 선택해 주세요.');
 
     for ($i=0; $i<$count; $i++)
     {
         // 실제 번호를 넘김
-        $fo_no = (int) $_POST['fo_no'][$i];
+        $fo_no = (int) $post_fo_no[$i];
         if (!trim($fo_no)) continue;
 
         $res = sql_fetch("select * from {$g5['sms5_form_table']} where fo_no='$fo_no'");
@@ -24,4 +28,4 @@ if($atype == "del"){
         sql_query("update {$g5['sms5_form_group_table']} set fg_count = fg_count - 1 where fg_no='{$res['fg_no']}'");
     }
 }
-goto_url('./form_list.php');
\ No newline at end of file
+goto_url('./form_list.php?fg_no='.$fg_no);
\ No newline at end of file
diff --git a/adm/sms_admin/form_update.php b/adm/sms_admin/form_update.php
index 1eb78101a..c086cb059 100644
--- a/adm/sms_admin/form_update.php
+++ b/adm/sms_admin/form_update.php
@@ -2,10 +2,12 @@
 $sub_menu = "900600";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
-$fo_name = isset($fo_name) ? strip_tags(clean_xss_attributes($fo_name)) : '';
-$fo_content = isset($fo_content) ? strip_tags(clean_xss_attributes($fo_content)) : '';
+$fo_name = isset($_REQUEST['fo_name']) ? strip_tags(clean_xss_attributes($_REQUEST['fo_name'])) : '';
+$fo_content = isset($_REQUEST['fo_content']) ? strip_tags(clean_xss_attributes($_REQUEST['fo_content'])) : '';
+$fo_receipt = isset($_REQUEST['fo_receipt']) ? clean_xss_tags($_REQUEST['fo_receipt'], 1, 1) : '';
+$get_fg_no = '';
 
 $g5['title'] = "이모티콘 업데이트";
 
@@ -77,5 +79,4 @@ else // 등록
 }
 
 $go_url = './form_list.php?page='.$page.'&amp;fg_no='.$get_fg_no;
-goto_url($go_url);
-?>
\ No newline at end of file
+goto_url($go_url);
\ No newline at end of file
diff --git a/adm/sms_admin/form_write.php b/adm/sms_admin/form_write.php
index b8e4913f7..a28671f38 100644
--- a/adm/sms_admin/form_write.php
+++ b/adm/sms_admin/form_write.php
@@ -2,11 +2,19 @@
 $sub_menu = "900600";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 $g5['title'] = "이모티콘 ";
 
-$fg_no = isset($fg_no) ? (int) $fg_no : '';
+$fo_no = isset($_REQUEST['fo_no']) ? (int) $_REQUEST['fo_no'] : 0;
+$fg_no = isset($_REQUEST['fg_no']) ? (int) $_REQUEST['fg_no'] : '';
+
+$write = array(
+'fg_no'=>null,
+'fo_no'=>null,
+'fo_name'=>'',
+'fo_content'=>''
+);
 
 if ($w == 'u' && is_numeric($fo_no)) {
     $write = sql_fetch("select * from {$g5['sms5_form_table']} where fo_no='$fo_no'");
@@ -14,6 +22,7 @@ if ($w == 'u' && is_numeric($fo_no)) {
 }
 else  {
     $write['fg_no'] = $fg_no;
+    $write['fo_no'] = $fo_no;
     $g5['title'] .= '추가';
 }
 
@@ -23,7 +32,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
 <form name="book_form" method="post" action="form_update.php">
 <input type="hidden" name="w" value="<?php echo $w?>">
 <input type="hidden" name="page" value="<?php echo $page?>">
-<input type="hidden" name="fo_no" value="<?php echo $write['fo_no']?>">
+<input type="hidden" name="fo_no" value="<?php echo $write['fo_no']; ?>">
 <input type="hidden" name="get_fg_no" value="<?php echo $fg_no?>">
 
     <div class="tbl_frm01 tbl_wrap">
@@ -231,5 +240,4 @@ $(function(){
 </script>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/history_list.php b/adm/sms_admin/history_list.php
index d3edc13e9..467cc33db 100644
--- a/adm/sms_admin/history_list.php
+++ b/adm/sms_admin/history_list.php
@@ -5,7 +5,7 @@ include_once("./_common.php");
 $page_size = 20;
 $colspan = 11;
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "문자전송 내역";
 
@@ -23,7 +23,7 @@ $total_page = (int)($total_count/$page_size) + ($total_count%$page_size==0 ? 0 :
 $page_start = $page_size * ( $page - 1 );
 
 $vnum = $total_count - (($page-1) * $page_size);
-
+$line = 0;
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 ?>
 
@@ -68,7 +68,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
     while($res = sql_fetch_array($qry)) {
         $bg = 'bg'.($line++%2);
         $tmp_wr_memo = @unserialize($res['wr_memo']);
-        $dupli_count = $tmp_wr_memo['total'] ? $tmp_wr_memo['total'] : 0;
+        $dupli_count = (isset($tmp_wr_memo['total']) && $tmp_wr_memo['total']) ? (int) $tmp_wr_memo['total'] : 0;
     ?>
     <tr class="<?php echo $bg; ?>">
         <td class="td_numsmall"><?php echo $vnum--?></td>
@@ -94,5 +94,4 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?st=$st&amp;sv=$sv&amp;page="); ?>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/history_num.php b/adm/sms_admin/history_num.php
index 043fdd3f0..6fe344a35 100644
--- a/adm/sms_admin/history_num.php
+++ b/adm/sms_admin/history_num.php
@@ -5,12 +5,14 @@ include_once('./_common.php');
 $page_size = 20;
 $colspan = 10;
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "문자전송 내역 (번호별)";
 
 if ($page < 1) $page = 1;
 
+$line = 0;
+
 if( isset($st) && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){
     $st = '';
 }
@@ -107,5 +109,4 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?st=$st&amp;sv=$sv&amp;page="); ?>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/history_send.php b/adm/sms_admin/history_send.php
index 9b4f29600..12d51f0be 100644
--- a/adm/sms_admin/history_send.php
+++ b/adm/sms_admin/history_send.php
@@ -2,7 +2,9 @@
 $sub_menu = "900400";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$wr_no = isset($_REQUEST['wr_no']) ? (int) $_REQUEST['wr_no'] : 0;
 
 $g5['title'] = "문자전송중";
 
@@ -229,5 +231,4 @@ if($config['cf_sms_type'] == 'LMS') {
 location.href = 'history_view.php?wr_no=<?php echo $wr_no?>&wr_renum=<?php echo $new_wr_renum?>';
 </script>
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/history_view.php b/adm/sms_admin/history_view.php
index 4ea64a885..1cf76df57 100644
--- a/adm/sms_admin/history_view.php
+++ b/adm/sms_admin/history_view.php
@@ -6,8 +6,12 @@ $spage_size = 20;
 $colspan = 10;
 $re_text = '';
 
-$st = isset($st) ? strip_tags($st) : '';
-$ssv = isset($ssv) ? strip_tags($ssv) : '';
+$st = isset($_REQUEST['st']) ? clean_xss_tags($_REQUEST['st'], 1, 1) : '';
+$ssv = isset($_REQUEST['ssv']) ? clean_xss_tags($_REQUEST['ssv'], 1, 1) : '';
+$wr_no = isset($_REQUEST['wr_no']) ? (int) $_REQUEST['wr_no'] : 0;
+$wr_renum = isset($_REQUEST['wr_renum']) ? (int) $_REQUEST['wr_renum'] : 0;
+$spage = isset($_REQUEST['spage']) ? (int) $_REQUEST['spage'] : 0;
+$line = 0;
 
 if( $st && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){
     $st = '';
@@ -17,7 +21,7 @@ if( $sst && !in_array($sst, array('mb_id', 'bk_no', 'hs_name', 'hs_hp', 'hs_date
     $sst = '';
 }
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "문자전송 상세내역";
 
@@ -261,5 +265,4 @@ function all_send()
 <?php echo sms5_sub_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $spage, $total_spage, $_SERVER['SCRIPT_NAME']."?wr_no=$wr_no&amp;wr_renum=$wr_renum&amp;page=$page&amp;st=$st&amp;sv=$sv&amp;sst=$sst&amp;ssv=$ssv", "", "spage"); ?>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/install.php b/adm/sms_admin/install.php
index 025ecda8e..c5405c3d2 100644
--- a/adm/sms_admin/install.php
+++ b/adm/sms_admin/install.php
@@ -2,11 +2,11 @@
 $sub_menu = "900000";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = "SMS5 솔루션 설치";
 
-$setup = $_POST['setup'];
+$setup = (isset($_POST['setup']) && $_POST['setup']) ? 1 : 0;
 
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 ?>
@@ -83,5 +83,4 @@ flush(); usleep(50000);
 <script>document.getElementById('sms5_btn_next').focus();</script>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/member_update.php b/adm/sms_admin/member_update.php
index cf90a404e..0008c794f 100644
--- a/adm/sms_admin/member_update.php
+++ b/adm/sms_admin/member_update.php
@@ -2,7 +2,7 @@
 $sub_menu = "900200";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "회원정보 업데이트";
 
@@ -19,7 +19,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
     </div>
     <div class="local_desc01 local_desc">
         <p>
-            마지막 업데이트 일시 : <span id="datetime"><?php echo $sms5['cf_datetime']?></span> <br>
+            마지막 업데이트 일시 : <span id="datetime"><?php echo isset($sms5['cf_datetime']) ? get_sanitize_input($sms5['cf_datetime']) : ''; ?></span> <br>
         </p>
     </div>
 
@@ -64,5 +64,4 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
 </script>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/member_update_run.php b/adm/sms_admin/member_update_run.php
index 94efc229c..aeea60f48 100644
--- a/adm/sms_admin/member_update_run.php
+++ b/adm/sms_admin/member_update_run.php
@@ -3,6 +3,8 @@ $sub_menu = "900200";
 include_once("./_common.php");
 @include_once(G5_PLUGIN_PATH."/sms5/JSON.php");
 
+$mtype = isset($_REQUEST['mtype']) ? clean_xss_tags($_REQUEST['mtype'], 1, 1) : '';
+
 if(empty($config['cf_sms_use'])){
     if( $mtype == "json" ){
         die("{\"error\":\"환경 설정의 SMS 사용에서 아이코드를 사용설정해 주셔야 실행할수 있습니다.\"}");
@@ -19,9 +21,9 @@ if( !function_exists('json_encode') ) {
 }
 
 if( $mtype == "json" ){
-    ajax_auth_check($auth[$sub_menu], "w");
+    ajax_auth_check_menu($auth, $sub_menu, "w");
 } else {
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 }
 
 $count      = 0;
@@ -126,5 +128,4 @@ if( $mtype == "json" ){
     die( json_encode($json_msg) );
 } else {
     die( $msg );
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/adm/sms_admin/num_book.php b/adm/sms_admin/num_book.php
index d6a658567..4e89db11f 100644
--- a/adm/sms_admin/num_book.php
+++ b/adm/sms_admin/num_book.php
@@ -5,7 +5,7 @@ include_once("./_common.php");
 $page_size = 20;
 $colspan = 9;
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $token = get_token();
 
@@ -13,8 +13,8 @@ $g5['title'] = "휴대폰번호 관리";
 
 if ($page < 1) $page = 1;
 
-$bg_no = isset($bg_no) ? preg_replace('/[^0-9]/i', '', $bg_no) : '';
-$st = isset($st) ? preg_replace('/[^a-z0-9]/i', '', $st) : '';
+$bg_no = isset($_REQUEST['bg_no']) ? preg_replace('/[^0-9]/i', '', $_REQUEST['bg_no']) : '';
+$st = isset($_REQUEST['st']) ? preg_replace('/[^a-z0-9]/i', '', $_REQUEST['st']) : '';
 
 $sql_korean = $sql_group = $sql_search = $sql_no_hp = '';
 
@@ -33,6 +33,9 @@ if ($st == 'all') {
     $sql_search = '';
 }
 
+$ap = isset($_GET['ap']) ? (int) $_GET['ap'] : 0;
+$no_hp = isset($_GET['no_hp']) ? preg_replace('/[^0-9a-z_]/i', '', $_GET['no_hp']) : 0;
+
 if ($ap > 0)
     $sql_korean = korean_index('bk_name', $ap-1);
 else {
@@ -104,7 +107,7 @@ function no_hp_click(val)
 </script>
 
 <div class="local_ov01 local_ov">
-    <span class="btn_ov01"><span class="ov_txt">업데이트 </span><span class="ov_num"><?php echo $sms5['cf_datetime']?></span></span>
+    <span class="btn_ov01"><span class="ov_txt">업데이트 </span><span class="ov_num"><?php echo isset($sms5['cf_datetime']) ? $sms5['cf_datetime'] : ''; ?></span></span>
     <span class="btn_ov01"><span class="ov_txt"> 건수  </span><span class="ov_num"><?php echo number_format($total_count)?>명</span></span>
     <span class="btn_ov01"><span class="ov_txt"> 회원  </span><span class="ov_num"> <?php echo number_format($member_count)?>명</span></span>
     <span class="btn_ov01"><span class="ov_txt"> 비회원  </span><span class="ov_num"> <?php echo number_format($no_member_count)?>명</span></span>
@@ -262,5 +265,4 @@ function select_copy(sw, f) {
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?bg_no=$bg_no&amp;st=$st&amp;sv=$sv&amp;ap=$ap&amp;page="); ?>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_file.php b/adm/sms_admin/num_book_file.php
index ed4f6f35b..abaa1912a 100644
--- a/adm/sms_admin/num_book_file.php
+++ b/adm/sms_admin/num_book_file.php
@@ -2,7 +2,7 @@
 $sub_menu = "900900";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "휴대폰번호 파일";
 
@@ -154,5 +154,4 @@ function download()
 }
 </script>
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_file_download.php b/adm/sms_admin/num_book_file_download.php
index 65c1bdaa1..55d8e6f0d 100644
--- a/adm/sms_admin/num_book_file_download.php
+++ b/adm/sms_admin/num_book_file_download.php
@@ -2,7 +2,10 @@
 $sub_menu = "900900";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "r");
+$bg_no = isset($_REQUEST['bg_no']) ? clean_xss_tags($_REQUEST['bg_no'], 1, 1) : '';
+$no_hp = isset($_REQUEST['no_hp']) ? clean_xss_tags($_REQUEST['no_hp'], 1, 1) : '';
+
+auth_check_menu($auth, $sub_menu, "r");
 
 if ($bg_no != 'all' && $bg_no < 1)
     alert_just('다운로드 할 휴대폰번호 그룹을 선택해주세요.');
@@ -18,50 +21,49 @@ if (!$total['cnt']) alert_just('데이터가 없습니다.');
 
 $qry = sql_query("select * from {$g5['sms5_book_table']} where 1 $sql_bg $sql_hp order by bk_name");
 
-/*================================================================================
-php_writeexcel http://www.bettina-attack.de/jonny/view.php/projects/php_writeexcel/
-=================================================================================*/
+if(! function_exists('column_char')) {
+    function column_char($i) {
+        return chr( 65 + $i );
+    }
+}
 
-include_once(G5_LIB_PATH.'/Excel/php_writeexcel/class.writeexcel_workbook.inc.php');
-include_once(G5_LIB_PATH.'/Excel/php_writeexcel/class.writeexcel_worksheet.inc.php');
+include_once(G5_LIB_PATH.'/PHPExcel.php');
+$excel = new PHPExcel();
 
-$fname = tempnam(G5_DATA_PATH, "tmp.xls");
-$workbook = new writeexcel_workbook($fname);
-$worksheet = $workbook->addworksheet();
-
-$num2_format =& $workbook->addformat(array(num_format => '\0#'));
-
-// Put Excel data
-$data = array('이름', '전화번호');
-$data = array_map('iconv_euckr', $data);
+$headers = array('이름', '전화번호');
+$widths  = array(18, 25);
+$header_bgcolor = 'FFABCDEF';
+$last_char = column_char(count($headers) - 1);
+$rows = array();
 
 $col = 0;
-foreach($data as $cell) {
-    $worksheet->write(0, $col++, $cell);
-}
 
 for($i=1; $res=sql_fetch_array($qry); $i++)
 {
-    $res = array_map('iconv_euckr', $res);
+    //$res = array_map('iconv_euckr', $res);
 
     $hp = get_hp($res['bk_hp'], $hyphen);
 
     if ($no_hp && $res['bk_hp'] != '' && !$hp) continue;
 
-    $worksheet->write($i, 0, $res['bk_name']);
-    $worksheet->write($i, 1, $hp, $num2_format);
+    $rows[] = array($res['bk_name'], ' '.$hp);
 }
 
-$workbook->close();
+$data = array_merge(array($headers), $rows);
+
+$excel->setActiveSheetIndex(0)->getStyle( "A1:${last_char}1" )->getFill()->setFillType(PHPExcel_Style_Fill::FILL_SOLID)->getStartColor()->setARGB($header_bgcolor);
+$excel->setActiveSheetIndex(0)->getStyle( "A:$last_char" )->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER)->setWrapText(true);
+foreach($widths as $i => $w) $excel->setActiveSheetIndex(0)->getColumnDimension( column_char($i) )->setWidth($w);
+$excel->getActiveSheet()->fromArray($data,NULL,'A1');
 
 $filename = "휴대폰번호목록-".date("ymd", time()).".xls";
 if( is_ie() ) $filename = utf2euc($filename);
 
-header("Content-Type: application/x-msexcel; name=".$filename);
-header("Content-Disposition: inline; filename=".$filename);
-$fh=fopen($fname, "rb");
-fpassthru($fh);
-unlink($fname);
+header("Content-Type: application/octet-stream");
+header("Content-Disposition: attachment; filename=".$filename);
+header("Cache-Control: max-age=0");
 
-exit;
-?>
\ No newline at end of file
+$writer = PHPExcel_IOFactory::createWriter($excel, 'Excel5');
+$writer->save('php://output');
+
+exit;
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_file_upload.php b/adm/sms_admin/num_book_file_upload.php
index c1fa4cdda..0c07d9ea9 100644
--- a/adm/sms_admin/num_book_file_upload.php
+++ b/adm/sms_admin/num_book_file_upload.php
@@ -2,14 +2,17 @@
 $sub_menu = "900900";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$upload_bg_no = isset($_REQUEST['upload_bg_no']) ? clean_xss_tags($_REQUEST['upload_bg_no'], 1, 1) : '';
+$confirm = isset($_REQUEST['confirm']) ? clean_xss_tags($_REQUEST['confirm'], 1, 1) : '';
 
 if (!$upload_bg_no)
     alert_after('그룹을 선택해주세요.');
 
 $bg_no = $upload_bg_no;
 
-if (!$_FILES['csv']['size']) 
+if (! (isset($_FILES['csv']['size']) && $_FILES['csv']['size'])) 
     alert_after('파일을 선택해주세요.');
 
 $file = $_FILES['csv']['tmp_name'];
@@ -18,6 +21,12 @@ $filename = $_FILES['csv']['name'];
 $pos = strrpos($filename, '.');
 $ext = strtolower(substr($filename, $pos, strlen($filename)));
 
+if(! function_exists('column_char')) {
+    function column_char($i) {
+        return chr( 65 + $i );
+    }
+}
+
 switch ($ext) {
     case '.csv' :
         $data = file($file);
@@ -36,16 +45,17 @@ switch ($ext) {
         }
         break;
     case '.xls' :
-        include_once(G5_LIB_PATH.'/Excel/reader.php');
-        $data = new Spreadsheet_Excel_Reader();
+    case '.xlsx' :
+        include_once(G5_LIB_PATH.'/PHPExcel/IOFactory.php');
+        $objPHPExcel = PHPExcel_IOFactory::load($file);
+        $sheet = $objPHPExcel->getSheet(0);
+
+        $num_rows = $sheet->getHighestRow();
+        $highestColumn = $sheet->getHighestColumn();
 
-        // Set output Encoding.
-        $data->setOutputEncoding('UTF-8');
-        $data->read($file);
-        $num_rows = $data->sheets[0]['numRows'];
         break;
     default :
-        alert_after('xls파일과 csv파일만 허용합니다.');
+        alert_after('xls파일 xlsx파일과 csv파일만 허용합니다.');
 }
 
 $counter = 0;
@@ -54,6 +64,8 @@ $failure = 0;
 $inner_overlap = 0;
 $overlap = 0;
 $arr_hp = array();
+$dupl_hp = array();
+$regi_hp = array();
 $encode = array('ASCII','UTF-8','EUC-KR');
 
 for ($i = 1; $i <= $num_rows; $i++) {
@@ -71,18 +83,25 @@ for ($i = 1; $i <= $num_rows; $i++) {
             $hp   = addslashes($csv[$i][1]);
             break;
         case '.xls' :
-            $name = addslashes($data->sheets[0]['cells'][$i][$j++]);
-            $str_encode = @mb_detect_encoding($name, $encode);
-            if( $str_encode == "EUC-KR" ){
-                $name = iconv_utf8( $name );
+        case '.xlsx' :
+            $rowData = $sheet->rangeToArray('A' . $i . ':' . $highestColumn . $i,
+                                                NULL,
+                                                TRUE,
+                                                FALSE);
+            $name = isset($rowData[0][0]) ? addslashes($rowData[0][0]) : '';
+            if( $name ){
+                $str_encode = @mb_detect_encoding($name, $encode);
+                if( $str_encode == "EUC-KR" ){
+                    $name = iconv_utf8( $name );
+                }
             }
-            $hp   = addslashes(get_hp($data->sheets[0]['cells'][$i][$j++]));
+            $hp   = isset($rowData[0][1]) ? addslashes(get_hp($rowData[0][1])) : '';
             break;
     }
+
     if (!(strlen($name)&&$hp))
     {
         $failure++;
-
     } else {
         if (in_array($hp, $arr_hp))
         {
@@ -92,15 +111,17 @@ for ($i = 1; $i <= $num_rows; $i++) {
             array_push($arr_hp, $hp);
 
             $res = sql_fetch("select * from {$g5['sms5_book_table']} where bk_hp='$hp'");
-            if ($res) 
+
+            if (isset($res['bk_hp']) && $res['bk_hp']) 
             {
+                array_push($dupl_hp, $hp);
                 $overlap++;
-            } 
-            else if (!$confirm && $hp) 
-            {
+            } else if (!$confirm && $hp) {
                 sql_query("insert into {$g5['sms5_book_table']} set bg_no='$bg_no', bk_name='".addslashes($name)."', bk_hp='$hp', bk_receipt=1, bk_datetime='".G5_TIME_YMDHIS."'");
                 sql_query("update {$g5['sms5_book_group_table']} set bg_count = bg_count + 1, bg_nomember = bg_nomember + 1, bg_receipt = bg_receipt + 1 where bg_no='$bg_no'");
                 $success++;
+            } else {
+                array_push($regi_hp, $hp);
             }
         }
     }
@@ -127,7 +148,7 @@ html += \"<li>중복번호 ".number_format($overlap)." 건<div id=\\\"overlap\\\
 if ($result)
 {
     if ($confirm) {
-        echo "html += \"<li class=\\\"sms5_txt_success\\\">등록가능 ".number_format($result)." 건\";";
+        echo "html += \"<li class=\\\"sms5_txt_success\\\">등록가능 ".number_format($result)." 건<div id=\\\"regi_hps\\\" class=\\\"local_desc01 local_desc\\\"></div>\";";
         echo "html += \"<br><button type=\\\"button\\\" id=\\\"btn_fileup\\\" class=\\\"btn_submit\\\" onclick=\\\"upload(1)\\\">등록하기</button>\";";
     }
     else
@@ -143,16 +164,27 @@ parent.document.getElementById('uploading').style.display = 'none';
 parent.document.getElementById('register').style.display = 'none';
 
 info.style.display = 'block';
-info.innerHTML = html;
+info.innerHTML = html;";
 
-parent.document.getElementById('overlap').innerHTML = '<p><b>중복번호 목록</b><br>';";
+if( $dupl_hp ) {
+    echo "parent.document.getElementById('overlap').innerHTML = '<p><b>중복번호 목록</b><br>';";
 
-for ($i=0; $i<count($arr_hp); $i++){
-echo "parent.document.getElementById('overlap').innerHTML += '".$arr_hp[$i]."<br>';\n";
+    for ($i=0; $i<count($dupl_hp); $i++){
+        echo "parent.document.getElementById('overlap').innerHTML += '".$dupl_hp[$i]."<br>';\n";
+    }
+    echo "parent.document.getElementById('overlap').innerHTML += '</p>';\n";
 }
-echo "parent.document.getElementById('overlap').innerHTML += '</p>';\n";
-echo "</script>";
 
+if( $regi_hp ) {
+    echo "parent.document.getElementById('regi_hps').innerHTML = '<p><b>등록가능 목록</b><br>';";
+
+    for ($i=0; $i<count($regi_hp); $i++){
+        echo "parent.document.getElementById('regi_hps').innerHTML += '".$regi_hp[$i]."<br>';\n";
+    }
+    echo "parent.document.getElementById('regi_hps').innerHTML += '</p>';\n";
+}
+
+echo "</script>";
 
 function alert_after($str) {
     echo "<script>
@@ -162,5 +194,4 @@ function alert_after($str) {
     parent.document.getElementById('upload_info').style.display = 'none';
     </script>";
     alert_just($str);
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_move.php b/adm/sms_admin/num_book_move.php
index f69248d89..e59013fb1 100644
--- a/adm/sms_admin/num_book_move.php
+++ b/adm/sms_admin/num_book_move.php
@@ -11,12 +11,12 @@ if ($sw == 'move'){
     alert('sw 값이 제대로 넘어오지 않았습니다.');
 }
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = '번호그룹 ' . $act;
 include_once(G5_PATH.'/head.sub.php');
 
-$bk_no_list = implode(',', $_POST['bk_no']);
+$bk_no_list = isset($_POST['bk_no']) ? implode(',', $_POST['bk_no']) : '';
 
 $sql = " select * from {$g5['sms5_book_group_table']} order by bg_no ";
 $result = sql_query($sql);
@@ -124,5 +124,4 @@ function fboardmoveall_submit(f)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_multi_update.php b/adm/sms_admin/num_book_multi_update.php
index 5919a7f61..e1f579e76 100644
--- a/adm/sms_admin/num_book_multi_update.php
+++ b/adm/sms_admin/num_book_multi_update.php
@@ -2,13 +2,15 @@
 $sub_menu = "900800";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 $g5['title'] = "전화번호부";
 
-for ($i=0; $i<count($_POST['bk_no']); $i++) 
+$post_bk_no = (isset($_POST['bk_no']) && is_array($_POST['bk_no'])) ? $_POST['bk_no'] : array();
+
+for ($i=0; $i<count($post_bk_no); $i++) 
 {
-    $bk_no = $_POST['bk_no'][$i];
+    $bk_no = $post_bk_no[$i];
     if (!trim($bk_no)) continue;
 
     $res = sql_fetch("select * from {$g5['sms5_book_table']} where bk_no='$bk_no'");
@@ -59,5 +61,4 @@ for ($i=0; $i<count($_POST['bk_no']); $i++)
 if( $str_query ){
     $str_query = '?'.$str_query;
 }
-goto_url('./num_book.php'.$str_query);
-?>
\ No newline at end of file
+goto_url('./num_book.php'.$str_query);
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_update.php b/adm/sms_admin/num_book_update.php
index 079c5eae1..6358e2017 100644
--- a/adm/sms_admin/num_book_update.php
+++ b/adm/sms_admin/num_book_update.php
@@ -2,7 +2,7 @@
 $sub_menu = "900800";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 $g5['title'] = "휴대폰번호 업데이트";
 
@@ -10,10 +10,11 @@ $g5['sms5_demo'] = 0;
 
 $is_hp_exist = false;
 
-$bk_hp = get_hp($bk_hp);
+$bk_hp = isset($_REQUEST['bk_hp']) ? get_hp($_REQUEST['bk_hp']) : '';
 
-$bk_memo = strip_tags($bk_memo);
-$bk_name = strip_tags($bk_name);
+$bk_memo = isset($_REQUEST['bk_memo']) ? strip_tags($_REQUEST['bk_memo']) : '';
+$bk_name = isset($_REQUEST['bk_name']) ? strip_tags($_REQUEST['bk_name']) : '';
+$bg_no = isset($_REQUEST['bg_no']) ? (int) $_REQUEST['bg_no'] : 0;
 
 if ($w=='u') // 업데이트
 {
@@ -54,7 +55,7 @@ if ($w=='u') // 업데이트
         // 휴대폰번호 중복체크
         $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$res['mb_id']}' and mb_hp = '{$bk_hp}' ";
         $mb_hp_exist = sql_fetch($sql);
-        if ($mb_hp_exist['mb_id']) { //중복된 회원 휴대폰번호가 있다면
+        if (isset($mb_hp_exist['mb_id']) && $mb_hp_exist['mb_id']) { //중복된 회원 휴대폰번호가 있다면
             $is_hp_exist = true;
         } else {
              sql_query("update {$g5['member_table']} set mb_name='".addslashes($bk_name)."', mb_hp='$bk_hp', mb_sms='$bk_receipt' where mb_id='{$res['mb_id']}'", false);
@@ -136,5 +137,4 @@ else // 등록
 }
 
 $go_url = './num_book.php?page='.$page.'&amp;bg_no='.$get_bg_no.'&amp;ap='.$ap;
-goto_url($go_url);
-?>
\ No newline at end of file
+goto_url($go_url);
\ No newline at end of file
diff --git a/adm/sms_admin/num_book_write.php b/adm/sms_admin/num_book_write.php
index 665673472..7890ee90f 100644
--- a/adm/sms_admin/num_book_write.php
+++ b/adm/sms_admin/num_book_write.php
@@ -3,8 +3,11 @@ $sub_menu = "900800";
 include_once("./_common.php");
 
 $colspan = 4;
+$bk_no = isset($_REQUEST['bk_no']) ? (int) $_REQUEST['bk_no'] : 0;
+$bg_no = isset($_REQUEST['bg_no']) ? (int) $_REQUEST['bg_no'] : 0;
+$ap = isset($_REQUEST['ap']) ? clean_xss_tags($_REQUEST['ap'], 1, 1) : '';
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "휴대폰번호 ";
 
@@ -184,12 +187,12 @@ function book_submit(){
                 var $check_msg = $("#hp_check_el");
 
                 if( !list_text ){ // 중복 휴대폰 번호가 없다면 submit
-                    if($check_msg.size()> 0)
+                    if($check_msg.length > 0)
                         $check_msg.remove();
 
                     is_submit = true;
                 } else {
-                    if($check_msg.size() < 1)
+                    if($check_msg.length < 1)
                         $("input#bk_hp").after("<div id=\"hp_check_el\"><h3>이 번호를 쓰는 회원 정보</h3><ul></ul></div>");
 
                     $("#hp_check_el").find("ul").html( list_text );
@@ -210,5 +213,4 @@ function book_submit(){
 }
 </script>
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/num_group.php b/adm/sms_admin/num_group.php
index 2da088f9c..880774b2e 100644
--- a/adm/sms_admin/num_group.php
+++ b/adm/sms_admin/num_group.php
@@ -2,7 +2,7 @@
 $sub_menu = "900700";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = "휴대폰번호 그룹";
 
@@ -77,8 +77,8 @@ function num_group_submit(f)
     <span class="btn_ov01"><span class="ov_txt">건수</span><span class="ov_num"> <?php echo $total_count; ?>건 </span></span>
 </div>
 
-<form name="group<?php echo $res['bg_no']?>" method="get" action="./num_group_update.php" class="local_sch02 local_sch">
-<input type="hidden" name="bg_no" value="<?php echo $res['bg_no']?>">
+<form name="group<?php echo isset($res['bg_no']) ? $res['bg_no'] : ''; ?>" method="get" action="./num_group_update.php" class="local_sch02 local_sch">
+<input type="hidden" name="bg_no" value="<?php echo isset($res['bg_no']) ? $res['bg_no'] : ''; ?>">
 
 <div>
     <label for="bg_name" class="sound_only">그룹추가<strong class="sound_only"> 필수</strong></label>
@@ -185,5 +185,4 @@ function num_group_submit(f)
 
 </form>
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/num_group_move.php b/adm/sms_admin/num_group_move.php
index 733585c16..689fdcd37 100644
--- a/adm/sms_admin/num_group_move.php
+++ b/adm/sms_admin/num_group_move.php
@@ -3,12 +3,18 @@
 $sub_menu = "900700";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+$bk_no = isset($_REQUEST['bk_no']) ? (int) $_REQUEST['bk_no'] : 0;
+$bg_no = isset($_REQUEST['bg_no']) ? (int) $_REQUEST['bg_no'] : 0;
+$move_no = isset($_REQUEST['move_no']) ? (int) $_REQUEST['move_no'] : 0;
+
+auth_check_menu($auth, $sub_menu, "w");
 
 $res = sql_fetch("select * from {$g5['sms5_book_group_table']} where bg_no='$bg_no'");
-sql_query("update {$g5['sms5_book_group_table']} set bg_count = bg_count + {$res['bg_count']}, bg_member = bg_member + {$res['bg_member']}, bg_nomember = bg_nomember + {$res['bg_nomember']}, bg_receipt = bg_receipt + {$res['bg_receipt']}, bg_reject = bg_reject + {$res['bg_reject']} where bg_no='$move_no'");
-sql_query("update {$g5['sms5_book_group_table']} set bg_count = 0, bg_member = 0, bg_nomember = 0, bg_receipt = 0, bg_reject = 0 where bg_no='$bg_no'");
-sql_query("update {$g5['sms5_book_table']} set bg_no='$move_no' where bg_no='$bg_no'");
 
-goto_url('./num_group.php');
-?>
\ No newline at end of file
+if( $res ) {
+    sql_query("update {$g5['sms5_book_group_table']} set bg_count = bg_count + {$res['bg_count']}, bg_member = bg_member + {$res['bg_member']}, bg_nomember = bg_nomember + {$res['bg_nomember']}, bg_receipt = bg_receipt + {$res['bg_receipt']}, bg_reject = bg_reject + {$res['bg_reject']} where bg_no='$move_no'");
+    sql_query("update {$g5['sms5_book_group_table']} set bg_count = 0, bg_member = 0, bg_nomember = 0, bg_receipt = 0, bg_reject = 0 where bg_no='$bg_no'");
+    sql_query("update {$g5['sms5_book_table']} set bg_no='$move_no' where bg_no='$bg_no'");
+}
+
+goto_url('./num_group.php');
\ No newline at end of file
diff --git a/adm/sms_admin/num_group_update.php b/adm/sms_admin/num_group_update.php
index dffeab6ee..abd3407b0 100644
--- a/adm/sms_admin/num_group_update.php
+++ b/adm/sms_admin/num_group_update.php
@@ -2,16 +2,18 @@
 $sub_menu = "900700";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+$post_chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? $_POST['chk'] : array();
+
+auth_check_menu($auth, $sub_menu, "w");
 
 if ($w == 'u') // 업데이트
 {
-    for ($i=0; $i<count($_POST['chk']); $i++)
+    for ($i=0; $i<count($post_chk); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-        $bg_no = (int) $_POST['bg_no'][$k];
-        $bg_name = strip_tags(clean_xss_attributes($_POST['bg_name'][$k]));
+        $k = $post_chk[$i];
+        $bg_no = isset($_POST['bg_no'][$k]) ? (int) $_POST['bg_no'][$k] : 0;
+        $bg_name = isset($_POST['bg_name'][$k]) ? strip_tags(clean_xss_attributes($_POST['bg_name'][$k])) : '';
 
         if (!is_numeric($bg_no))
             alert('그룹 고유번호가 없습니다.');
@@ -32,11 +34,11 @@ if ($w == 'u') // 업데이트
 }
 else if ($w == 'de') // 그룹삭제
 {
-    for ($i=0; $i<count($_POST['chk']); $i++)
+    for ($i=0; $i<count($post_chk); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-        $bg_no = (int) $_POST['bg_no'][$k];
+        $k = $post_chk[$i];
+        $bg_no = isset($_POST['bg_no'][$k]) ? (int) $_POST['bg_no'][$k] : 0;
 
         if (!is_numeric($bg_no))
             alert('그룹 고유번호가 없습니다.');
@@ -51,11 +53,11 @@ else if ($w == 'de') // 그룹삭제
 }
 else if ($w == 'em') // 비우기
 {
-    for ($i=0; $i<count($_POST['chk']); $i++)
+    for ($i=0; $i<count($post_chk); $i++)
     {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-        $bg_no = (int) $_POST['bg_no'][$k];
+        $k = $post_chk[$i];
+        $bg_no = isset($_POST['bg_no'][$k]) ? (int) $_POST['bg_no'][$k] : 0;
 
         sql_query("update {$g5['sms5_book_group_table']} set bg_count = 0, bg_member = 0, bg_nomember = 0, bg_receipt = 0, bg_reject = 0 where bg_no='$bg_no'");
         sql_query("delete from {$g5['sms5_book_table']} where bg_no='$bg_no'");
@@ -63,7 +65,7 @@ else if ($w == 'em') // 비우기
 }
 else // 등록
 {
-    $bg_name = strip_tags(clean_xss_attributes($bg_name));
+    $bg_name = isset($_POST['bg_name']) ? strip_tags(clean_xss_attributes($_POST['bg_name'])) : '';
 
     if (!strlen(trim($bg_name)))
         alert('그룹명을 입력해주세요');
@@ -75,5 +77,4 @@ else // 등록
     sql_query("insert into {$g5['sms5_book_group_table']} set bg_name='$bg_name'");
 }
 
-goto_url('./num_group.php');
-?>
\ No newline at end of file
+goto_url('./num_group.php');
\ No newline at end of file
diff --git a/adm/sms_admin/number_move_update.php b/adm/sms_admin/number_move_update.php
index 76ad32fcb..f1925645f 100644
--- a/adm/sms_admin/number_move_update.php
+++ b/adm/sms_admin/number_move_update.php
@@ -1,12 +1,14 @@
 <?php
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
-if(!count($_POST['chk_bg_no']))
+$post_chk_bg_no = isset($_POST['chk_bg_no']) ? $_POST['chk_bg_no'] : array();
+
+if(!count($post_chk_bg_no))
     alert('번호를 '.$act.'할 그룹을 한개 이상 선택해 주십시오.', $url);
 
-$bk_no_list = preg_replace('/[^a-zA-Z0-9\, ]/', '', $bk_no_list);
+$bk_no_list = isset($_POST['bk_no_list']) ? preg_replace('/[^a-zA-Z0-9\, ]/', '', $_POST['bk_no_list']) : '';
 
 $sql = "select * from {$g5['sms5_book_table']} where bk_no in ($bk_no_list) order by bk_no desc ";
 $result = sql_query($sql);
@@ -16,9 +18,9 @@ $save_group = array();
 for ($kk=0;$row = sql_fetch_array($result);$kk++)
 {
     $bk_no = $row['bk_no'];
-    for ($i=0; $i<count($_POST['chk_bg_no']); $i++)
+    for ($i=0; $i<count($post_chk_bg_no); $i++)
     {
-        $bg_no = $_POST['chk_bg_no'][$i];
+        $bg_no = $post_chk_bg_no[$i];
         if( !$bg_no ) continue;
 
         $sql = " insert into {$g5['sms5_book_table']}
@@ -82,5 +84,4 @@ window.close();
 </p>
 <a href="$opener_href">돌아가기</a>
 </noscript>
-HEREDOC;
-?>
\ No newline at end of file
+HEREDOC;
\ No newline at end of file
diff --git a/adm/sms_admin/sms_write.php b/adm/sms_admin/sms_write.php
index 77754a97c..c09090e2a 100644
--- a/adm/sms_admin/sms_write.php
+++ b/adm/sms_admin/sms_write.php
@@ -2,7 +2,11 @@
 $sub_menu = "900300";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
+
+$wr_no = isset($_REQUEST['wr_no']) ? (int) $_REQUEST['wr_no'] : 0;
+$bk_no = isset($_REQUEST['bk_no']) ? (int) $_REQUEST['bk_no'] : 0;
+$fo_no = isset($_REQUEST['fo_no']) ? (int) $_REQUEST['fo_no'] : 0;
 
 $g5['title'] = "문자 보내기";
 
@@ -10,7 +14,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
 ?>
 
 <div class="local_ov01 local_ov">
-    회원정보 최근 업데이트 : <?php echo $sms5['cf_datetime']?>
+    회원정보 최근 업데이트 : <?php echo isset($sms5['cf_datetime']) ? $sms5['cf_datetime'] : ''; ?>
 </div>
 
 <?php
@@ -114,7 +118,7 @@ if ($config['cf_sms_use'] == 'icode') { // 아이코드 사용
 
         <div id="write_reply">
             <label for="wr_reply">회신<strong class="sound_only"> 필수</strong></label>
-            <input type="text" name="wr_reply" value="<?php echo $sms5['cf_phone']?>" id="wr_reply" required class="frm_input required" size="17" maxlength="20" readonly="readonly">
+            <input type="text" name="wr_reply" value="<?php echo isset($sms5['cf_phone']) ? get_sanitize_input($sms5['cf_phone']) : ''; ?>" id="wr_reply" required class="frm_input required" size="17" maxlength="20" readonly="readonly">
         </div>
 
         <div id="write_recv" class="write_inner">
@@ -831,5 +835,4 @@ var sms_obj={
 <?php } ?>
 
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/sms_admin/sms_write_form.php b/adm/sms_admin/sms_write_form.php
index 103535b5e..f9421d9f4 100644
--- a/adm/sms_admin/sms_write_form.php
+++ b/adm/sms_admin/sms_write_form.php
@@ -6,9 +6,9 @@ $qry = sql_query("select * from {$g5['sms5_form_group_table']} order by fg_name"
 while ($res = sql_fetch_array($qry)) array_push($group, $res);
 
 $res = sql_fetch("select count(*) as cnt from `{$g5['sms5_form_table']}` where fg_no=0");
-$no_count = $res['cnt'];
+$no_count = isset($res['cnt']) ? $res['cnt'] : 0;
 
-$fg_no = isset($fg_no) ? (int) $fg_no : '';
+$fg_no = isset($_REQUEST['fg_no']) ? (int) $_REQUEST['fg_no'] : 0;
 ?>
 
 <form name="emo_frm">
diff --git a/adm/sms_admin/sms_write_overlap_check.php b/adm/sms_admin/sms_write_overlap_check.php
index 100ed6ba3..8dc7f7722 100644
--- a/adm/sms_admin/sms_write_overlap_check.php
+++ b/adm/sms_admin/sms_write_overlap_check.php
@@ -2,12 +2,14 @@
 $sub_menu = "900300";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 $list = $hps = array();
 
 $overlap = 0;
 
+$send_list = isset($_REQUEST['send_list']) ? clean_xss_tags($_REQUEST['send_list'], 1, 1) : '';
+
 if( !$send_list ){
     die("넘어온 데이터 값이 없습니다.");
 }
@@ -65,5 +67,4 @@ while ($row = array_shift($send_list))
 if ($overlap)
     die("중복되는 휴대폰번호가 $overlap 건 있습니다. ");
 else
-    die("중복되는 휴대폰번호가 없습니다. ");
-?>
\ No newline at end of file
+    die("중복되는 휴대폰번호가 없습니다. ");
\ No newline at end of file
diff --git a/adm/sms_admin/sms_write_send.php b/adm/sms_admin/sms_write_send.php
index e88bdae46..9cd072f08 100644
--- a/adm/sms_admin/sms_write_send.php
+++ b/adm/sms_admin/sms_write_send.php
@@ -2,7 +2,7 @@
 $sub_menu = "900300";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
@@ -24,8 +24,15 @@ if ( ! (($config['cf_icode_id'] && $config['cf_icode_pw']) || $config['cf_icode_
     alert('아이코드 설정값이 존재하지 않습니다.');
 }
 
-$wr_reply   = preg_replace('#[^0-9\-]#', '', trim($wr_reply));
-$wr_message = clean_xss_tags(trim($wr_message));
+$wr_reply   = isset($_REQUEST['wr_reply']) ? preg_replace('#[^0-9\-]#', '', trim($_REQUEST['wr_reply'])) : '';
+$wr_message = isset($_REQUEST['wr_message']) ? clean_xss_tags(trim($_REQUEST['wr_message'])) : '';
+$send_list = isset($_REQUEST['send_list']) ? clean_xss_tags(trim($_REQUEST['send_list']), 1, 1) : '';
+
+$wr_by = isset($_REQUEST['wr_by']) ? clean_xss_tags(trim($_REQUEST['wr_by']), 1, 1) : '';
+$wr_bm = isset($_REQUEST['wr_bm']) ? clean_xss_tags(trim($_REQUEST['wr_bm']), 1, 1) : '';
+$wr_bd = isset($_REQUEST['wr_bd']) ? clean_xss_tags(trim($_REQUEST['wr_bd']), 1, 1) : '';
+$wr_bh = isset($_REQUEST['wr_bh']) ? clean_xss_tags(trim($_REQUEST['wr_bh']), 1, 1) : '';
+$wr_bi = isset($_REQUEST['wr_bi']) ? clean_xss_tags(trim($_REQUEST['wr_bi']), 1, 1) : '';
 
 if (!$wr_reply)
     win_close_alert('회신 번호를 숫자, - 로 입력해주세요.');
@@ -359,5 +366,4 @@ function win_close_alert($msg) {
 location.href = 'history_view.php?wr_no=<?php echo $wr_no?>';
 </script>
 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
\ No newline at end of file
diff --git a/adm/theme.php b/adm/theme.php
index 32eb294eb..ceeea78c5 100644
--- a/adm/theme.php
+++ b/adm/theme.php
@@ -75,5 +75,4 @@ include_once('./admin.head.php');
 <?php } ?>
 
 <?php
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/theme_config_load.php b/adm/theme_config_load.php
index a19a2a293..24c807bed 100644
--- a/adm/theme_config_load.php
+++ b/adm/theme_config_load.php
@@ -6,7 +6,7 @@ include_once(G5_LIB_PATH.'/json.lib.php');
 $data = array();
 $data['error'] = '';
 
-$data['error'] = auth_check($auth[$sub_menu], 'w', true);
+$data['error'] = auth_check_menu($auth, $sub_menu, 'w', true);
 if($data['error'])
     die(json_encode($data));
 
@@ -74,5 +74,4 @@ if($type == 'board') {
         $data['error'] = '적용할 기본환경 회원스킨 설정이 없습니다.';
 }
 
-die(json_encode($data));
-?>
\ No newline at end of file
+die(json_encode($data));
\ No newline at end of file
diff --git a/adm/theme_preview.php b/adm/theme_preview.php
index 559db4e63..e281009fa 100644
--- a/adm/theme_preview.php
+++ b/adm/theme_preview.php
@@ -11,7 +11,7 @@ if(!$theme || !in_array($theme, $theme_dir))
 $info = get_theme_info($theme);
 
 $arr_mode = array('index', 'list', 'view');
-$mode = substr(strip_tags($_GET['mode']), 0, 20);
+$mode = isset($_GET['mode']) ? substr(strip_tags($_GET['mode']), 0, 20) : '';
 if(!in_array($mode, $arr_mode))
     $mode = 'index';
 
@@ -114,5 +114,4 @@ require_once(G5_PATH.'/head.sub.php');
 </section>
 
 <?php
-require_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+require_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/adm/theme_update.php b/adm/theme_update.php
index 4749fb893..8804a9f9d 100644
--- a/adm/theme_update.php
+++ b/adm/theme_update.php
@@ -7,10 +7,13 @@ if ($is_admin != 'super')
 
 admin_referer_check();
 
-$theme = trim($_POST['theme']);
+$theme = isset($_POST['theme']) ? trim($_POST['theme']) : '';
+$post_type = isset($_POST['type']) ? clean_xss_tags($_POST['type'], 1, 1) : '';
+$post_set_default_skin = isset($_POST['set_default_skin']) ? clean_xss_tags($_POST['set_default_skin'], 1, 1) : '';
+
 $theme_dir = get_theme_dir();
 
-if($_POST['type'] == 'reset') {
+if($post_type == 'reset') {
     $sql = " update {$g5['config_table']} set cf_theme = '' ";
     sql_query($sql);
     die('');
@@ -24,7 +27,7 @@ $sql = " update {$g5['config_table']} set cf_theme = '$theme' ";
 sql_query($sql);
 
 // 테마 설정 스킨 적용
-if($_POST['set_default_skin'] == 1) {
+if($post_set_default_skin == 1) {
     $keys = 'set_default_skin, cf_member_skin, cf_mobile_member_skin, cf_new_skin, cf_mobile_new_skin, cf_search_skin, cf_mobile_search_skin, cf_connect_skin, cf_mobile_connect_skin, cf_faq_skin, cf_mobile_faq_skin, qa_skin, qa_mobile_skin';
 
     $tconfig = get_theme_config_value($theme, $keys);
@@ -68,7 +71,6 @@ if($_POST['set_default_skin'] == 1) {
     }
 }
 
-run_event('adm_theme_update', $theme, $_POST['set_default_skin']);
+run_event('adm_theme_update', $theme, $post_set_default_skin);
 
-die('');
-?>
\ No newline at end of file
+die('');
\ No newline at end of file
diff --git a/adm/thumbnail_file_delete.php b/adm/thumbnail_file_delete.php
index 47f40c918..edbb7a610 100644
--- a/adm/thumbnail_file_delete.php
+++ b/adm/thumbnail_file_delete.php
@@ -68,5 +68,4 @@ echo '<div class="local_desc01 local_desc"><p><strong>썸네일 '.$cnt.'건의 
 ?>
 
 <?php
-include_once('./admin.tail.php');
-?>
\ No newline at end of file
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/view.php b/adm/view.php
index 777bd326e..937318e16 100644
--- a/adm/view.php
+++ b/adm/view.php
@@ -2,6 +2,7 @@
 include_once('./_common.php');
 
 $call = isset($_REQUEST['call']) ?  strtolower(preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['call'])) : '';
+$token = isset($_REQUEST['token']) ? clean_xss_tags($_REQUEST['token'], 1, 1) : '';
 
 if( ! $call ){
     return;
@@ -10,7 +11,7 @@ if( ! $call ){
 if( ! $is_admin ){
 	$sql = " select count(*) as cnt from {$g5['auth_table']} where mb_id = '{$member['mb_id']}' ";
 	$row = sql_fetch($sql);
-	if ( ! $row['cnt']) {
+	if (! (isset($row['cnt']) && $row['cnt'])) {
 		return;
 	}
 }
@@ -24,5 +25,4 @@ include_once ('./admin.head.php');
 
 run_event('admin_get_page_'.$call, $arr_query, $token);
 
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_browser.php b/adm/visit_browser.php
index 15cc0c297..6b2737e5c 100644
--- a/adm/visit_browser.php
+++ b/adm/visit_browser.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '브라우저별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 5;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select * from {$g5['visit_table']}
             where vi_date between '{$fr_date}' and '{$to_date}' ";
 $result = sql_query($sql);
@@ -19,7 +24,11 @@ while ($row=sql_fetch_array($result)) {
     if(!$s)
         $s = get_brow($row['vi_agent']);
 
-    $arr[$s]++;
+    if( isset($arr[$s]) ){
+        $arr[$s]++;
+    } else {
+        $arr[$s] = 1;
+    }
 
     if ($arr[$s] > $max) $max = $arr[$s];
 
@@ -93,5 +102,4 @@ while ($row=sql_fetch_array($result)) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_date.php b/adm/visit_date.php
index 967f4e8e9..3b552cda5 100644
--- a/adm/visit_date.php
+++ b/adm/visit_date.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '일별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 4;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select vs_date, vs_count as cnt
             from {$g5['visit_sum_table']}
             where vs_date between '{$fr_date}' and '{$to_date}'
@@ -82,5 +87,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_delete.php b/adm/visit_delete.php
index 99fe62e49..16390c3ee 100644
--- a/adm/visit_delete.php
+++ b/adm/visit_delete.php
@@ -2,7 +2,7 @@
 $sub_menu = "200820";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = '접속자로그삭제';
 include_once('./admin.head.php');
@@ -91,5 +91,4 @@ function form_submit(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_delete_update.php b/adm/visit_delete_update.php
index 716eec63f..d19006981 100644
--- a/adm/visit_delete_update.php
+++ b/adm/visit_delete_update.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'd');
+auth_check_menu($auth, $sub_menu, 'd');
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
@@ -56,5 +56,4 @@ $sql = " select count(*) as cnt from {$g5['visit_table']} ";
 $row = sql_fetch($sql);
 $total_count2 = $row['cnt'];
 
-alert('총 '.number_format($total_count).'건 중 '.number_format($total_count - $total_count2).'건 삭제 완료', './visit_delete.php');
-?>
\ No newline at end of file
+alert('총 '.number_format($total_count).'건 중 '.number_format($total_count - $total_count2).'건 삭제 완료', './visit_delete.php');
\ No newline at end of file
diff --git a/adm/visit_device.php b/adm/visit_device.php
index df2362bcd..2fed093dc 100644
--- a/adm/visit_device.php
+++ b/adm/visit_device.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '기기별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 5;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select * from {$g5['visit_table']}
           where vi_date between '$fr_date' and '$to_date' ";
 $result = sql_query($sql);
@@ -19,7 +24,11 @@ while ($row=sql_fetch_array($result)) {
     if(!$s)
         $s = '기타';
 
-    $arr[$s]++;
+    if( isset($arr[$s]) ){
+        $arr[$s]++;
+    } else {
+        $arr[$s] = 1;
+    }
 
     if ($arr[$s] > $max) $max = $arr[$s];
 
@@ -97,5 +106,4 @@ while ($row=sql_fetch_array($result)) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_domain.php b/adm/visit_domain.php
index 348a87c63..81e9b6801 100644
--- a/adm/visit_domain.php
+++ b/adm/visit_domain.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '도메인별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,15 +14,22 @@ $colspan = 5;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select * from {$g5['visit_table']}
             where vi_date between '{$fr_date}' and '{$to_date}' ";
 $result = sql_query($sql);
 while ($row=sql_fetch_array($result)) {
     $str = $row['vi_referer'];
     preg_match("/^http[s]*:\/\/([\.\-\_0-9a-zA-Z]*)\//", $str, $match);
-    $s = $match[1];
+    $s = isset($match[1]) ? $match[1] : 0;
     $s = preg_replace("/^(www\.|search\.|dirsearch\.|dir\.search\.|dir\.|kr\.search\.|myhome\.)(.*)/", "\\2", $s);
-    $arr[$s]++;
+
+    if( isset($arr[$s]) ){
+        $arr[$s]++;
+    } else {
+        $arr[$s] = 1;
+    }
 
     if ($arr[$s] > $max) $max = $arr[$s];
 
@@ -100,5 +110,4 @@ while ($row=sql_fetch_array($result)) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_hour.php b/adm/visit_hour.php
index ba4f13479..e13392221 100644
--- a/adm/visit_hour.php
+++ b/adm/visit_hour.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '시간별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 4;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select SUBSTRING(vi_time,1,2) as vi_hour, count(vi_id) as cnt
             from {$g5['visit_table']}
             where vi_date between '{$fr_date}' and '{$to_date}'
@@ -50,7 +55,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     if ($i) {
         for ($i=0; $i<24; $i++) {
             $hour = sprintf("%02d", $i);
-            $count = (int)$arr[$hour];
+            $count = isset($arr[$hour]) ? (int) $arr[$hour] : 0;
 
             $rate = ($count / $sum_count * 100);
             $s_rate = number_format($rate, 1);
@@ -78,5 +83,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_list.php b/adm/visit_list.php
index 46744e99f..54a313edf 100644
--- a/adm/visit_list.php
+++ b/adm/visit_list.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '접속자집계';
 include_once('./visit.sub.php');
@@ -114,5 +117,4 @@ $qstr .= "&amp;page=";
 $pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr");
 echo $pagelist;
 
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_month.php b/adm/visit_month.php
index 5524f74c0..390419f1c 100644
--- a/adm/visit_month.php
+++ b/adm/visit_month.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '월별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 4;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select SUBSTRING(vs_date,1,7) as vs_month, SUM(vs_count) as cnt
             from {$g5['visit_sum_table']}
             where vs_date between '{$fr_date}' and '{$to_date}'
@@ -86,5 +91,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_os.php b/adm/visit_os.php
index 183604ab5..17fb7ed13 100644
--- a/adm/visit_os.php
+++ b/adm/visit_os.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = 'OS별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 5;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select * from {$g5['visit_table']}
           where vi_date between '$fr_date' and '$to_date' ";
 $result = sql_query($sql);
@@ -19,7 +24,11 @@ while ($row=sql_fetch_array($result)) {
     if(!$s)
         $s = get_os($row['vi_agent']);
 
-    $arr[$s]++;
+    if( isset($arr[$s]) ){
+        $arr[$s]++;
+    } else {
+        $arr[$s] = 1;
+    }
 
     if ($arr[$s] > $max) $max = $arr[$s];
 
@@ -97,5 +106,4 @@ while ($row=sql_fetch_array($result)) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_search.php b/adm/visit_search.php
index 524f2026f..21b803d4e 100644
--- a/adm/visit_search.php
+++ b/adm/visit_search.php
@@ -3,7 +3,7 @@ $sub_menu = '200810';
 include_once('./_common.php');
 include_once(G5_PATH.'/lib/visit.lib.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = '접속자검색';
 include_once('./admin.head.php');
@@ -122,6 +122,7 @@ if(isset($sfl) && $sfl && !in_array($sfl, array('vi_ip','vi_date','vi_time','vi_
 </div>
 
 <?php
+$domain = isset($domain) ? $domain : '';
 $pagelist = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME'].'?'.$qstr.'&amp;domain='.$domain.'&amp;page=');
 if ($pagelist) {
     echo $pagelist;
@@ -150,5 +151,4 @@ function fvisit_submit(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_week.php b/adm/visit_week.php
index 5ebccac2d..036e20844 100644
--- a/adm/visit_week.php
+++ b/adm/visit_week.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '요일별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 4;
 $weekday = array ('월', '화', '수', '목', '금', '토', '일');
 
 $sum_count = 0;
+$arr = array();
+
 $sql = " select WEEKDAY(vs_date) as weekday_date, SUM(vs_count) as cnt
             from {$g5['visit_sum_table']}
             where vs_date between '{$fr_date}' and '{$to_date}'
@@ -47,7 +52,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $k = 0;
     if ($i) {
         for ($i=0; $i<7; $i++) {
-            $count = (int)$arr[$i];
+            $count = isset($arr[$i]) ? (int) $arr[$i] : 0;
 
             $rate = ($count / $sum_count * 100);
             $s_rate = number_format($rate, 1);
@@ -77,5 +82,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/visit_year.php b/adm/visit_year.php
index 1d42e1512..226fe962c 100644
--- a/adm/visit_year.php
+++ b/adm/visit_year.php
@@ -2,7 +2,10 @@
 $sub_menu = "200800";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$fr_date = isset($_REQUEST['fr_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['fr_date']) : G5_TIME_YMD;
+$to_date = isset($_REQUEST['to_date']) ? preg_replace('/[^0-9 :\-]/i', '', $_REQUEST['to_date']) : G5_TIME_YMD;
 
 $g5['title'] = '연도별 접속자집계';
 include_once('./visit.sub.php');
@@ -11,6 +14,8 @@ $colspan = 4;
 
 $max = 0;
 $sum_count = 0;
+$arr = array();
+
 $sql = " select SUBSTRING(vs_date,1,4) as vs_year, SUM(vs_count) as cnt
             from {$g5['visit_sum_table']}
             where vs_date between '{$fr_date}' and '{$to_date}'
@@ -82,5 +87,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 </div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');
\ No newline at end of file
diff --git a/adm/write_count.php b/adm/write_count.php
index c37271627..fe6f12732 100644
--- a/adm/write_count.php
+++ b/adm/write_count.php
@@ -4,11 +4,14 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $g5['title'] = '글,댓글 현황';
 include_once ('./admin.head.php');
 
+$graph = isset($_GET['graph']) ? clean_xss_tags($_GET['graph'], 1, 1) : '';
+$period = isset($_GET['period']) ? clean_xss_tags($_GET['period'], 1, 1) : '';
+
 // http://www.jqplot.com/
 add_stylesheet('<link rel="stylesheet" href="'.G5_PLUGIN_URL.'/jqplot/jquery.jqplot.css">', 1);
 add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jquery.jqplot.js"></script>', 1);
@@ -75,6 +78,8 @@ $sql_bo_table = '';
 if ($bo_table)
     $sql_bo_table = "and bo_table = '$bo_table'";
 
+$line1 = $line2 = array();
+
 switch ($day) {
     case '시간' :
         $sql = " select substr(bn_datetime,6,8) as hours, sum(if(wr_id=wr_parent,1,0)) as wcount, sum(if(wr_id=wr_parent,0,1)) as ccount from {$g5['board_new_table']} where substr(bn_datetime,1,10) between '$from' and '$to' {$sql_bo_table} group by hours order by bn_datetime ";
@@ -175,8 +180,8 @@ if (empty($line1) || empty($line2)) {
 <div id="chart1" style="height:500px; width:100%;"></div>
 <script>
 $(document).ready(function(){
-    var line1 = [<?php echo implode($line1, ','); ?>];
-    var line2 = [<?php echo implode($line2, ','); ?>];
+    var line1 = [<?php echo implode(',', $line1); ?>];
+    var line2 = [<?php echo implode(',', $line2); ?>];
     var plot1 = $.jqplot ('chart1', [line1, line2], {
             seriesDefaults: {
                 <?php if ($graph == 'bar') { ?>
@@ -205,5 +210,4 @@ $(document).ready(function(){
 ?>
 </div>
 <?php
-include_once ('./admin.tail.php');
-?>
\ No newline at end of file
+include_once ('./admin.tail.php');
\ No newline at end of file
diff --git a/bbs/_common.php b/bbs/_common.php
index b556cc9d3..4e830150b 100644
--- a/bbs/_common.php
+++ b/bbs/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../common.php');
-?>
\ No newline at end of file
+include_once('../common.php');
\ No newline at end of file
diff --git a/bbs/_head.php b/bbs/_head.php
index c9bf5a4fb..800dc49c0 100644
--- a/bbs/_head.php
+++ b/bbs/_head.php
@@ -1,4 +1,3 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
-include_once(G5_PATH.'/_head.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/_head.php');
\ No newline at end of file
diff --git a/bbs/_head.sub.php b/bbs/_head.sub.php
index dc569a49e..1194083c5 100644
--- a/bbs/_head.sub.php
+++ b/bbs/_head.sub.php
@@ -1,4 +1,3 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
-include_once(G5_PATH.'/head.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/head.sub.php');
\ No newline at end of file
diff --git a/bbs/_tail.php b/bbs/_tail.php
index ab638fe9c..d7cff79b4 100644
--- a/bbs/_tail.php
+++ b/bbs/_tail.php
@@ -1,4 +1,3 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
-include_once(G5_PATH.'/_tail.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/_tail.php');
\ No newline at end of file
diff --git a/bbs/_tail.sub.php b/bbs/_tail.sub.php
index 7d695a4aa..fd6db23b8 100644
--- a/bbs/_tail.sub.php
+++ b/bbs/_tail.sub.php
@@ -1,4 +1,3 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/ajax.autosave.php b/bbs/ajax.autosave.php
index cb31f0451..1e01c798a 100644
--- a/bbs/ajax.autosave.php
+++ b/bbs/ajax.autosave.php
@@ -3,9 +3,9 @@ include_once('./_common.php');
 
 if (!$is_member) die('0');
 
-$uid     = trim($_REQUEST['uid']);
-$subject = trim($_REQUEST['subject']);
-$content = trim($_REQUEST['content']);
+$uid     = isset($_REQUEST['uid']) ? preg_replace('/[^0-9]/', '', $_REQUEST['uid']) : 0;
+$subject = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
+$content = isset($_REQUEST['content']) ? trim($_REQUEST['content']) : '';
 
 if ($subject && $content) {
     $sql = " select count(*) as cnt from {$g5['autosave_table']} where mb_id = '{$member['mb_id']}' and as_subject = '$subject' and as_content = '$content' ";
@@ -16,5 +16,4 @@ if ($subject && $content) {
 
         echo autosave_count($member['mb_id']);
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/ajax.autosavedel.php b/bbs/ajax.autosavedel.php
index 1742fd408..27cd2d1e5 100644
--- a/bbs/ajax.autosavedel.php
+++ b/bbs/ajax.autosavedel.php
@@ -3,7 +3,7 @@ include_once("./_common.php");
 
 if (!$is_member) die("0");
 
-$as_id = (int)$_REQUEST['as_id'];
+$as_id = isset($_REQUEST['as_id']) ? (int)$_REQUEST['as_id'] : 0;
 
 $sql = " delete from {$g5['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} ";
 $result = sql_query($sql);
@@ -11,5 +11,4 @@ if (!$result) {
     echo "-1";
 }
 
-echo autosave_count($member['mb_id']);
-?>
\ No newline at end of file
+echo autosave_count($member['mb_id']);
\ No newline at end of file
diff --git a/bbs/ajax.autosavelist.php b/bbs/ajax.autosavelist.php
index b0ef3d1f9..e3b3e1da7 100644
--- a/bbs/ajax.autosavelist.php
+++ b/bbs/ajax.autosavelist.php
@@ -17,5 +17,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     echo "<datetime>{$datetime}</datetime>\n";
     echo "</item>\n";
 }
-echo "</list>";
-?>
\ No newline at end of file
+echo "</list>";
\ No newline at end of file
diff --git a/bbs/ajax.autosaveload.php b/bbs/ajax.autosaveload.php
index 2e291990b..ae2b4e087 100644
--- a/bbs/ajax.autosaveload.php
+++ b/bbs/ajax.autosaveload.php
@@ -3,7 +3,7 @@ include_once('./_common.php');
 
 if (!$is_member) die('');
 
-$as_id = (int)$_REQUEST['as_id'];
+$as_id = isset($_REQUEST['as_id']) ? (int) $_REQUEST['as_id'] : 0;
 
 $sql = " select as_subject, as_content from {$g5['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} ";
 $row = sql_fetch($sql);
@@ -14,5 +14,4 @@ echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
 echo "<item>\n";
 echo "<subject><![CDATA[{$subject}]]></subject>\n";
 echo "<content><![CDATA[{$content}]]></content>\n";
-echo "</item>\n";
-?>
\ No newline at end of file
+echo "</item>\n";
\ No newline at end of file
diff --git a/bbs/ajax.comment_token.php b/bbs/ajax.comment_token.php
index c90b09b9e..bc3974d41 100644
--- a/bbs/ajax.comment_token.php
+++ b/bbs/ajax.comment_token.php
@@ -10,5 +10,4 @@ $token = _token();
 
 set_session($ss_name, $token);
 
-die(json_encode(array('token'=>$token)));
-?>
\ No newline at end of file
+die(json_encode(array('token'=>$token)));
\ No newline at end of file
diff --git a/bbs/ajax.filter.php b/bbs/ajax.filter.php
index c210de889..05d7bc4c6 100644
--- a/bbs/ajax.filter.php
+++ b/bbs/ajax.filter.php
@@ -1,8 +1,8 @@
 <?php
 include_once('./_common.php');
 
-$subject = strip_tags($_POST['subject']);
-$content = strip_tags($_POST['content']);
+$subject = isset($_POST['subject']) ? strip_tags($_POST['subject']) : '';
+$content = isset($_POST['content']) ? strip_tags($_POST['content']) : '';
 
 //$filter = explode(",", strtolower(trim($config['cf_filter'])));
 // strtolower 에 의한 한글 변형으로 아래 코드로 대체 (곱슬최씨님이 알려 주셨습니다.)
@@ -27,5 +27,4 @@ for ($i=0; $i<count($filter); $i++) {
     }
 }
 
-die("{\"subject\":\"$subj\",\"content\":\"$cont\"}");
-?>
\ No newline at end of file
+die("{\"subject\":\"$subj\",\"content\":\"$cont\"}");
\ No newline at end of file
diff --git a/bbs/ajax.mb_email.php b/bbs/ajax.mb_email.php
index 21a7df62c..f3572b619 100644
--- a/bbs/ajax.mb_email.php
+++ b/bbs/ajax.mb_email.php
@@ -2,8 +2,8 @@
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 
-$mb_email = trim($_POST['reg_mb_email']);
-$mb_id    = trim($_POST['reg_mb_id']);
+$mb_email = isset($_POST['reg_mb_email']) ? trim($_POST['reg_mb_email']) : '';
+$mb_id    = isset($_POST['reg_mb_id']) ? trim($_POST['reg_mb_id']) : '';
 
 set_session('ss_check_mb_email', '');
 
@@ -12,5 +12,4 @@ if ($msg = valid_mb_email($mb_email)) die($msg);
 if ($msg = prohibit_mb_email($mb_email)) die($msg);
 if ($msg = exist_mb_email($mb_email, $mb_id)) die($msg);
 
-set_session('ss_check_mb_email', $mb_email);
-?>
\ No newline at end of file
+set_session('ss_check_mb_email', $mb_email);
\ No newline at end of file
diff --git a/bbs/ajax.mb_hp.php b/bbs/ajax.mb_hp.php
index eeeef8816..ab9e57570 100644
--- a/bbs/ajax.mb_hp.php
+++ b/bbs/ajax.mb_hp.php
@@ -2,9 +2,8 @@
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 
-$mb_hp   = trim($_POST['reg_mb_hp']);
-$mb_id   = trim($_POST['reg_mb_id']);
+$mb_hp   = isset($_POST['reg_mb_hp']) ? trim($_POST['reg_mb_hp']) : '';
+$mb_id   = isset($_POST['reg_mb_id']) ? trim($_POST['reg_mb_id']) : '';
 
 if ($msg = valid_mb_hp($mb_hp)) die($msg);
-//if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg);
-?>
\ No newline at end of file
+//if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg);
\ No newline at end of file
diff --git a/bbs/ajax.mb_id.php b/bbs/ajax.mb_id.php
index 6ab21cb3f..85498ae87 100644
--- a/bbs/ajax.mb_id.php
+++ b/bbs/ajax.mb_id.php
@@ -2,7 +2,7 @@
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 
-$mb_id = trim($_POST['reg_mb_id']);
+$mb_id = isset($_POST['reg_mb_id']) ? trim($_POST['reg_mb_id']) : '';
 
 set_session('ss_check_mb_id', '');
 
@@ -12,5 +12,4 @@ if ($msg = count_mb_id($mb_id))     die($msg);
 if ($msg = exist_mb_id($mb_id))     die($msg);
 if ($msg = reserve_mb_id($mb_id))   die($msg);
 
-set_session('ss_check_mb_id', $mb_id);
-?>
\ No newline at end of file
+set_session('ss_check_mb_id', $mb_id);
\ No newline at end of file
diff --git a/bbs/ajax.mb_nick.php b/bbs/ajax.mb_nick.php
index 74a289444..1bfe08642 100644
--- a/bbs/ajax.mb_nick.php
+++ b/bbs/ajax.mb_nick.php
@@ -2,8 +2,8 @@
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 
-$mb_nick = trim($_POST['reg_mb_nick']);
-$mb_id   = trim($_POST['reg_mb_id']);
+$mb_nick = isset($_POST['reg_mb_nick']) ? trim($_POST['reg_mb_nick']) : '';
+$mb_id   = isset($_POST['reg_mb_id']) ? trim($_POST['reg_mb_id']) : '';
 
 set_session('ss_check_mb_nick', '');
 
@@ -13,5 +13,4 @@ if ($msg = count_mb_nick($mb_nick)) die($msg);
 if ($msg = exist_mb_nick($mb_nick, $mb_id)) die($msg);
 if ($msg = reserve_mb_nick($mb_nick)) die($msg);
 
-set_session('ss_check_mb_nick', $mb_nick);
-?>
\ No newline at end of file
+set_session('ss_check_mb_nick', $mb_nick);
\ No newline at end of file
diff --git a/bbs/ajax.mb_recommend.php b/bbs/ajax.mb_recommend.php
index c19470fa0..c42af0c6e 100644
--- a/bbs/ajax.mb_recommend.php
+++ b/bbs/ajax.mb_recommend.php
@@ -2,12 +2,11 @@
 include_once("./_common.php");
 include_once(G5_LIB_PATH."/register.lib.php");
 
-$mb_recommend = trim($_POST["reg_mb_recommend"]);
+$mb_recommend = isset($_POST["reg_mb_recommend"]) ? trim($_POST["reg_mb_recommend"]) : '';
 
 if ($msg = valid_mb_id($mb_recommend)) {
     die("추천인의 아이디는 영문자, 숫자, _ 만 입력하세요.");
 }
 if (!($msg = exist_mb_id($mb_recommend))) {
     die("입력하신 추천인은 존재하지 않는 아이디 입니다.");
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/ajax.write.token.php b/bbs/ajax.write.token.php
new file mode 100644
index 000000000..bc7b41dcc
--- /dev/null
+++ b/bbs/ajax.write.token.php
@@ -0,0 +1,11 @@
+<?php
+include_once('./_common.php');
+include_once(G5_LIB_PATH.'/json.lib.php');
+
+$token_case = isset($_POST['token_case']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['token_case']) : '';
+
+if( $token_case ){
+    $token = _token();
+    set_session('ss_'.$token_case.'_token', $token);
+    die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
+}
\ No newline at end of file
diff --git a/bbs/alert.php b/bbs/alert.php
index 18d5053c2..26c3700a5 100644
--- a/bbs/alert.php
+++ b/bbs/alert.php
@@ -31,8 +31,8 @@ include_once(G5_PATH.'/head.sub.php');
 $msg = isset($msg) ? strip_tags($msg) : '';
 $msg2 = str_replace("\\n", "<br>", $msg);
 
-$url = clean_xss_tags($url, 1);
-if (!$url) $url = clean_xss_tags($_SERVER['HTTP_REFERER'], 1);
+$url = isset($url) ? clean_xss_tags($url, 1) : '';
+if (!$url) $url = isset($_SERVER['HTTP_REFERER']) ? clean_xss_tags($_SERVER['HTTP_REFERER'], 1) : '';
 
 $url = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", $url);
 $url = preg_replace('/\r\n|\r|\n|[^\x20-\x7e]/','', $url);
@@ -113,5 +113,4 @@ history.back();
 </noscript>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/alert_close.php b/bbs/alert_close.php
index 67b072f48..c0853330d 100644
--- a/bbs/alert_close.php
+++ b/bbs/alert_close.php
@@ -59,5 +59,4 @@ window.close();
 </noscript>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/board.php b/bbs/board.php
index b131a8e9f..15a969289 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -176,6 +176,8 @@ if ((isset($wr_id) && $wr_id) || (isset($wr_seo_title) && $wr_seo_title)) {
     $g5['title'] = $g5['board_title'].' '.$page.' 페이지';
 }
 
+$is_auth = $is_admin ? true : false;
+
 include_once(G5_PATH.'/head.sub.php');
 
 $width = $board['bo_table_width'];
@@ -240,5 +242,4 @@ include_once(G5_BBS_PATH.'/board_tail.php');
 
 echo "\n<!-- 사용스킨 : ".(G5_IS_MOBILE ? $board['bo_mobile_skin'] : $board['bo_skin'])." -->\n";
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/board_head.php b/bbs/board_head.php
index a62706a28..96508e75d 100644
--- a/bbs/board_head.php
+++ b/bbs/board_head.php
@@ -13,5 +13,4 @@ if (G5_IS_MOBILE) {
         include_once(G5_BBS_PATH.'/_head.php');
     }
     echo html_purifier(stripslashes($board['bo_content_head']));
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/board_list_update.php b/bbs/board_list_update.php
index a43924024..df04f7f37 100644
--- a/bbs/board_list_update.php
+++ b/bbs/board_list_update.php
@@ -1,21 +1,21 @@
 <?php
 include_once('./_common.php');
 
-$count = count($_POST['chk_wr_id']);
+$count = (isset($_POST['chk_wr_id']) && is_array($_POST['chk_wr_id'])) ? count($_POST['chk_wr_id']) : 0;
+$post_btn_submit = isset($_POST['btn_submit']) ? clean_xss_tags($_POST['btn_submit'], 1, 1) : '';
 
 if(!$count) {
-    alert($_POST['btn_submit'].' 하실 항목을 하나 이상 선택하세요.');
+    alert(addcslashes($post_btn_submit, '"\\/').' 하실 항목을 하나 이상 선택하세요.');
 }
 
-if($_POST['btn_submit'] == '선택삭제') {
+if($post_btn_submit === '선택삭제') {
     include './delete_all.php';
-} else if($_POST['btn_submit'] == '선택복사') {
+} else if($post_btn_submit === '선택복사') {
     $sw = 'copy';
     include './move.php';
-} else if($_POST['btn_submit'] == '선택이동') {
+} else if($post_btn_submit === '선택이동') {
     $sw = 'move';
     include './move.php';
 } else {
     alert('올바른 방법으로 이용해 주세요.');
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/board_tail.php b/bbs/board_tail.php
index 436e2cc3b..9358c1b3f 100644
--- a/bbs/board_tail.php
+++ b/bbs/board_tail.php
@@ -13,5 +13,4 @@ if (G5_IS_MOBILE) {
     } else {    //파일경로가 올바르지 않으면 기본파일을 가져옴
         include_once(G5_BBS_PATH.'/_tail.php');
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/confirm.php b/bbs/confirm.php
index 1d54d1384..ffdc3f738 100644
--- a/bbs/confirm.php
+++ b/bbs/confirm.php
@@ -5,13 +5,16 @@ include_once(G5_PATH.'/head.sub.php');
 $pattern1 = "/[\<\>\'\"\\\'\\\"\(\)]/";
 $pattern2 = "/\r\n|\r|\n|[^\x20-\x7e]/";
 
-$url1 = preg_replace($pattern1, "", clean_xss_tags($url1, 1));
+$url1 = isset($url1) ? preg_replace($pattern1, "", clean_xss_tags($url1, 1)) : '';
 $url1 = preg_replace($pattern2, "", $url1);
-$url2 = preg_replace($pattern1, "", clean_xss_tags($url2, 1));
+$url2 = isset($url2) ? preg_replace($pattern1, "", clean_xss_tags($url2, 1)) : '';
 $url2 = preg_replace($pattern2, "", $url2);
-$url3 = preg_replace($pattern1, "", clean_xss_tags($url3, 1));
+$url3 = isset($url3) ? preg_replace($pattern1, "", clean_xss_tags($url3, 1)) : '';
 $url3 = preg_replace($pattern2, "", $url3);
 
+$msg = isset($msg) ? $msg : '';
+$header = isset($header) ? $msg : '';
+
 // url 체크
 check_url_host($url1);
 check_url_host($url2);
@@ -46,5 +49,4 @@ if (confirm(conf)) {
 </noscript>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/content.php b/bbs/content.php
index 9098192a3..6d91c1387 100644
--- a/bbs/content.php
+++ b/bbs/content.php
@@ -1,7 +1,8 @@
 <?php
 include_once('./_common.php');
 
-$co_id = preg_replace('/[^a-z0-9_]/i', '', $co_id);
+$co_id = isset($_GET['co_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_GET['co_id']) : 0;
+$co_seo_title = isset($_GET['co_seo_title']) ? clean_xss_tags($_GET['co_seo_title'], 1, 1) : '';
 
 //dbconfig파일에 $g5['content_table'] 배열변수가 있는지 체크
 if( !isset($g5['content_table']) ){
@@ -11,12 +12,12 @@ if( !isset($g5['content_table']) ){
 // 내용
 if($co_seo_title){
     $co = get_content_by_field($g5['content_table'], 'content', 'co_seo_title', generate_seo_title($co_seo_title));
-    $co_id = $co['co_id'];
+    $co_id = isset($co['co_id']) ? $co['co_id'] : 0;
 } else {
     $co = get_content_db($co_id);
 }
 
-if( ! (isset($co['co_seo_title']) && $co['co_seo_title']) && $co['co_id'] ){
+if( ! (isset($co['co_seo_title']) && $co['co_seo_title']) && isset($co['co_id']) && $co['co_id'] ){
     seo_title_update($g5['content_table'], $co['co_id'], 'content');
 }
 
@@ -25,7 +26,7 @@ if (G5_IS_MOBILE) {
     return;
 }
 
-if (!$co['co_id'])
+if (! (isset($co['co_id']) && $co['co_id']))
     alert('등록된 내용이 없습니다.');
 
 $g5['title'] = $co['co_subject'];
@@ -40,35 +41,35 @@ $co['co_tag_filter_use'] = 1;
 $str = conv_content($co['co_content'], $co['co_html'], $co['co_tag_filter_use']);
 
 // $src 를 $dst 로 변환
-unset($src);
-unset($dst);
+$src = $dst = array();
 $src[] = "/{{쇼핑몰명}}|{{홈페이지제목}}/";
 $dst[] = $config['cf_title'];
-$src[] = "/{{회사명}}|{{상호}}/";
-$dst[] = $default['de_admin_company_name'];
-$src[] = "/{{대표자명}}/";
-$dst[] = $default['de_admin_company_owner'];
-$src[] = "/{{사업자등록번호}}/";
-$dst[] = $default['de_admin_company_saupja_no'];
-$src[] = "/{{대표전화번호}}/";
-$dst[] = $default['de_admin_company_tel'];
-$src[] = "/{{팩스번호}}/";
-$dst[] = $default['de_admin_company_fax'];
-$src[] = "/{{통신판매업신고번호}}/";
-$dst[] = $default['de_admin_company_tongsin_no'];
-$src[] = "/{{사업장우편번호}}/";
-$dst[] = $default['de_admin_company_zip'];
-$src[] = "/{{사업장주소}}/";
-$dst[] = $default['de_admin_company_addr'];
-$src[] = "/{{운영자명}}|{{관리자명}}/";
-$dst[] = $default['de_admin_name'];
-$src[] = "/{{운영자e-mail}}|{{관리자e-mail}}/i";
-$dst[] = $default['de_admin_email'];
-$src[] = "/{{정보관리책임자명}}/";
-$dst[] = $default['de_admin_info_name'];
-$src[] = "/{{정보관리책임자e-mail}}|{{정보책임자e-mail}}/i";
-$dst[] = $default['de_admin_info_email'];
-
+if(isset($default) && isset($default['de_admin_company_name'])){
+    $src[] = "/{{회사명}}|{{상호}}/";
+    $dst[] = isset($default['de_admin_company_name']) ? $default['de_admin_company_name'] : '';
+    $src[] = "/{{대표자명}}/";
+    $dst[] = isset($default['de_admin_company_owner']) ? $default['de_admin_company_owner'] : '';
+    $src[] = "/{{사업자등록번호}}/";
+    $dst[] = isset($default['de_admin_company_saupja_no']) ? $default['de_admin_company_saupja_no'] : '';
+    $src[] = "/{{대표전화번호}}/";
+    $dst[] = isset($default['de_admin_company_tel']) ? $default['de_admin_company_tel'] : '';
+    $src[] = "/{{팩스번호}}/";
+    $dst[] = isset($default['de_admin_company_fax']) ? $default['de_admin_company_fax'] : '';
+    $src[] = "/{{통신판매업신고번호}}/";
+    $dst[] = isset($default['de_admin_company_tongsin_no']) ? $default['de_admin_company_tongsin_no'] : '';
+    $src[] = "/{{사업장우편번호}}/";
+    $dst[] = isset($default['de_admin_company_zip']) ? $default['de_admin_company_zip'] : '';
+    $src[] = "/{{사업장주소}}/";
+    $dst[] = isset($default['de_admin_company_addr']) ? $default['de_admin_company_addr'] : '';
+    $src[] = "/{{운영자명}}|{{관리자명}}/";
+    $dst[] = isset($default['de_admin_name']) ? $default['de_admin_name'] : '';
+    $src[] = "/{{운영자e-mail}}|{{관리자e-mail}}/i";
+    $dst[] = isset($default['de_admin_email']) ? $default['de_admin_email'] : '';
+    $src[] = "/{{정보관리책임자명}}/";
+    $dst[] = isset($default['de_admin_info_name']) ? $default['de_admin_info_name'] : '';
+    $src[] = "/{{정보관리책임자e-mail}}|{{정보책임자e-mail}}/i";
+    $dst[] = isset($default['de_admin_info_email']) ? $default['de_admin_info_email'] : '';
+}
 $str = preg_replace($src, $dst, $str);
 
 // 스킨경로
@@ -101,5 +102,4 @@ if(is_file($skin_file)) {
 if ($co['co_include_tail'] && is_include_path_check($co['co_include_tail']))
     @include_once($co['co_include_tail']);
 else
-    include_once('./_tail.php');
-?>
+    include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/current_connect.php b/bbs/current_connect.php
index 5ad0e2a4e..38650a622 100644
--- a/bbs/current_connect.php
+++ b/bbs/current_connect.php
@@ -29,5 +29,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 
 include_once($connect_skin_path.'/current_connect.skin.php');
 
-include_once('./_tail.php');
-?>
\ No newline at end of file
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/db_table.optimize.php b/bbs/db_table.optimize.php
index 97a2fd8fa..58345832d 100644
--- a/bbs/db_table.optimize.php
+++ b/bbs/db_table.optimize.php
@@ -65,5 +65,4 @@ if($captcha_mp3 && is_array($captcha_mp3)) {
 // 실행일 기록
 if(isset($config['cf_optimize_date'])) {
     sql_query(" update {$g5['config_table']} set cf_optimize_date = '".G5_TIME_YMD."' ");
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/delete.php b/bbs/delete.php
index 1c28e9fcd..94f5ff665 100644
--- a/bbs/delete.php
+++ b/bbs/delete.php
@@ -9,6 +9,8 @@ if (!($token && $delete_token == $token))
 
 //$wr = sql_fetch(" select * from $write_table where wr_id = '$wr_id' ");
 
+$count_write = $count_comment = 0;
+
 @include_once($board_skin_path.'/delete.head.skin.php');
 
 if ($is_admin == 'super') // 최고관리자 통과
@@ -140,5 +142,4 @@ delete_cache_latest($bo_table);
 
 run_event('bbs_delete', $write, $board);
 
-goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr));
-?>
+goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr));
\ No newline at end of file
diff --git a/bbs/delete_all.php b/bbs/delete_all.php
index 178cca355..10a3f302e 100644
--- a/bbs/delete_all.php
+++ b/bbs/delete_all.php
@@ -14,7 +14,7 @@ $tmp_array = array();
 if ($wr_id) // 건별삭제
     $tmp_array[0] = $wr_id;
 else // 일괄삭제
-    $tmp_array = $_POST['chk_wr_id'];
+    $tmp_array = (isset($_POST['chk_wr_id']) && is_array($_POST['chk_wr_id'])) ? $_POST['chk_wr_id'] : array();
 
 $chk_count = count($tmp_array);
 
@@ -161,5 +161,4 @@ delete_cache_latest($bo_table);
 
 run_event('bbs_delete_all', $tmp_array, $board);
 
-goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr));
-?>
+goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr));
\ No newline at end of file
diff --git a/bbs/delete_comment.php b/bbs/delete_comment.php
index 44a6c1387..c23412939 100644
--- a/bbs/delete_comment.php
+++ b/bbs/delete_comment.php
@@ -2,7 +2,7 @@
 // 코멘트 삭제
 include_once('./_common.php');
 
-$comment_id = (int) $comment_id;
+$comment_id = isset($_REQUEST['comment_id']) ? (int) $_REQUEST['comment_id'] : 0;
 
 $delete_comment_token = get_session('ss_delete_comment_'.$comment_id.'_token');
 set_session('ss_delete_comment_'.$comment_id.'_token', '');
@@ -88,5 +88,4 @@ delete_cache_latest($bo_table);
 
 run_event('bbs_delete_comment', $comment_id, $board);
 
-goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$write['wr_parent'].'&amp;page='.$page. $qstr));
-?>
+goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$write['wr_parent'].'&amp;page='.$page. $qstr));
\ No newline at end of file
diff --git a/bbs/download.php b/bbs/download.php
index 60e0a7dc2..504595b74 100644
--- a/bbs/download.php
+++ b/bbs/download.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 // clean the output buffer
 ob_end_clean();
 
-$no = (int)$no;
+$no = isset($_REQUEST['no']) ? (int) $_REQUEST['no'] : 0;
 
 @include_once($board_skin_path.'/download.head.skin.php');
 
@@ -26,7 +26,7 @@ if (!$file['bf_file'])
 if($js != 'on' && $board['bo_download_point'] < 0) {
     $msg = $file['bf_source'].' 파일을 다운로드 하시면 포인트가 차감('.number_format($board['bo_download_point']).'점)됩니다.\\n포인트는 게시물당 한번만 차감되며 다음에 다시 다운로드 하셔도 중복하여 차감하지 않습니다.\\n그래도 다운로드 하시겠습니까?';
     $url1 = G5_BBS_URL.'/download.php?'.clean_query_string($_SERVER['QUERY_STRING'], false).'&js=on';
-    $url2 = clean_xss_tags($_SERVER['HTTP_REFERER']);
+    $url2 = isset($_SERVER['HTTP_REFERER']) ? clean_xss_tags($_SERVER['HTTP_REFERER']) : '';
     
     if( $url2 && stripos($url2, $_SERVER['REQUEST_URI']) !== false ){
         $url2 = G5_BBS_URL.'/board.php?'.clean_query_string($_SERVER['QUERY_STRING'], false);
@@ -150,5 +150,4 @@ while(!feof($fp)) {
     usleep(1000);
 }
 fclose ($fp);
-flush();
-?>
+flush();
\ No newline at end of file
diff --git a/bbs/email_certify.php b/bbs/email_certify.php
index 83465e706..e314ff24e 100644
--- a/bbs/email_certify.php
+++ b/bbs/email_certify.php
@@ -4,8 +4,8 @@ include_once('./_common.php');
 // 봇의 메일 링크 크롤링을 방지합니다.
 if(function_exists('check_mail_bot')){ check_mail_bot($_SERVER['REMOTE_ADDR']); }
 
-$mb_id  = trim($_GET['mb_id']);
-$mb_md5 = trim($_GET['mb_md5']);
+$mb_id  = isset($_GET['mb_id']) ? trim($_GET['mb_id']) : '';
+$mb_md5 = isset($_GET['mb_md5']) ? trim($_GET['mb_md5']) : '';
 
 $sql = " select mb_id, mb_email_certify2, mb_leave_date, mb_intercept_date from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $row = sql_fetch($sql);
@@ -33,5 +33,4 @@ if ($mb_md5)
     }
 }
 
-alert('제대로 된 값이 넘어오지 않았습니다.', G5_URL);
-?>
\ No newline at end of file
+alert('제대로 된 값이 넘어오지 않았습니다.', G5_URL);
\ No newline at end of file
diff --git a/bbs/email_stop.php b/bbs/email_stop.php
index 3635bb361..0a17ec707 100644
--- a/bbs/email_stop.php
+++ b/bbs/email_stop.php
@@ -1,6 +1,8 @@
 <?php
 include_once('./_common.php');
 
+$mb_id = isset($_REQUEST['mb_id']) ? clean_xss_tags($_REQUEST['mb_id'], 1, 1) : '';
+
 $sql = " select mb_id, mb_email, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $row = sql_fetch($sql);
 if (!$row['mb_id'])
@@ -15,5 +17,4 @@ if ($mb_md5) {
     }
 }
 
-alert('제대로 된 값이 넘어오지 않았습니다.', G5_URL);
-?>
\ No newline at end of file
+alert('제대로 된 값이 넘어오지 않았습니다.', G5_URL);
\ No newline at end of file
diff --git a/bbs/faq.php b/bbs/faq.php
index ce6ea356d..d34da00f2 100644
--- a/bbs/faq.php
+++ b/bbs/faq.php
@@ -13,11 +13,11 @@ $result = sql_query($sql);
 while ($row=sql_fetch_array($result))
 {
     $key = $row['fm_id'];
-    if (!$fm_id) $fm_id = $key;
+    if (!isset($fm_id)) $fm_id = $key;
     $faq_master_list[$key] = $row;
 }
 
-if ($fm_id){
+if (isset($fm_id) && $fm_id){
     $qstr .= '&amp;fm_id=' . $fm_id; // 마스터faq key_id
 }
 
@@ -94,5 +94,4 @@ if(is_file($skin_file)) {
     echo '<p>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</p>';
 }
 
-include_once('./_tail.php');
-?>
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/formmail.php b/bbs/formmail.php
index 3415623a5..d7f434c25 100644
--- a/bbs/formmail.php
+++ b/bbs/formmail.php
@@ -52,5 +52,4 @@ $type_checked[$type] = 'checked';
 
 include_once($member_skin_path.'/formmail.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/formmail_send.php b/bbs/formmail_send.php
index b36feed06..76fab9eea 100644
--- a/bbs/formmail_send.php
+++ b/bbs/formmail_send.php
@@ -55,5 +55,4 @@ include_once(G5_PATH.'/head.sub.php');
 
 alert_close('메일을 정상적으로 발송하였습니다.');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/good.php b/bbs/good.php
index 6f82443f3..7627c5aa3 100644
--- a/bbs/good.php
+++ b/bbs/good.php
@@ -159,5 +159,4 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
 
 run_event('bbs_good_after', $bo_table, $wr_id, $good);
 
-@include_once($board_skin_path.'/good.tail.skin.php');
-?>
\ No newline at end of file
+@include_once($board_skin_path.'/good.tail.skin.php');
\ No newline at end of file
diff --git a/bbs/group.php b/bbs/group.php
index 62ede7705..d202a181e 100644
--- a/bbs/group.php
+++ b/bbs/group.php
@@ -55,5 +55,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <!-- 메인화면 최신글 끝 -->
 </div>
 <?php
-include_once('./_tail.php');
-?>
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/link.php b/bbs/link.php
index e74536ca9..7fbc19a4a 100644
--- a/bbs/link.php
+++ b/bbs/link.php
@@ -3,6 +3,8 @@ include_once('./_common.php');
 
 $html_title = '링크 &gt; '.conv_subject($write['wr_subject'], 255);
 
+$no = isset($_REQUEST['no']) ? preg_replace('/[^0-9]/i', '', $_REQUEST['no']) : '';
+
 if (!($bo_table && $wr_id && $no))
     alert_close('값이 제대로 넘어오지 않았습니다.');
 
@@ -23,5 +25,4 @@ if (empty($_SESSION[$ss_name]))
     set_session($ss_name, true);
 }
 
-goto_url(set_http($write['wr_link'.$no]));
-?>
\ No newline at end of file
+goto_url(set_http($write['wr_link'.$no]));
\ No newline at end of file
diff --git a/bbs/list.php b/bbs/list.php
index 58961c364..bbe61e3e6 100644
--- a/bbs/list.php
+++ b/bbs/list.php
@@ -104,7 +104,7 @@ if (!$is_search_bbs) {
 
         $list[$i] = get_list($row, $board, $board_skin_url, G5_IS_MOBILE ? $board['bo_mobile_subject_len'] : $board['bo_subject_len']);
         $list[$i]['is_notice'] = true;
-
+        $list[$i]['num'] = 0;
         $i++;
         $notice_count++;
 
@@ -252,5 +252,4 @@ if ($board['bo_use_rss_view']) {
 }
 
 $stx = get_text(stripslashes($stx));
-include_once($board_skin_path.'/list.skin.php');
-?>
+include_once($board_skin_path.'/list.skin.php');
\ No newline at end of file
diff --git a/bbs/login.php b/bbs/login.php
index 3bfb79390..a743f9e2b 100644
--- a/bbs/login.php
+++ b/bbs/login.php
@@ -8,7 +8,7 @@ if( function_exists('social_check_login_before') ){
 $g5['title'] = '로그인';
 include_once('./_head.sub.php');
 
-$url = strip_tags($_GET['url']);
+$url = isset($_GET['url']) ? strip_tags($_GET['url']) : '';
 
 // url 체크
 check_url_host($url);
@@ -33,5 +33,4 @@ include_once($member_skin_path.'/login.skin.php');
 
 run_event('member_login_tail', $login_url, $login_action_url, $member_skin_path, $url);
 
-include_once('./_tail.sub.php');
-?>
+include_once('./_tail.sub.php');
\ No newline at end of file
diff --git a/bbs/login_check.php b/bbs/login_check.php
index 983b25020..0d57fea65 100644
--- a/bbs/login_check.php
+++ b/bbs/login_check.php
@@ -3,8 +3,10 @@ include_once('./_common.php');
 
 $g5['title'] = "로그인 검사";
 
-$mb_id       = trim($_POST['mb_id']);
-$mb_password = trim($_POST['mb_password']);
+$mb_id       = isset($_POST['mb_id']) ? trim($_POST['mb_id']) : '';
+$mb_password = isset($_POST['mb_password']) ? trim($_POST['mb_password']) : '';
+
+run_event('member_login_check_before', $mb_id);
 
 if (!$mb_id || !$mb_password)
     alert('회원아이디나 비밀번호가 공백이면 안됩니다.');
@@ -29,7 +31,7 @@ if(function_exists('social_is_login_check')){
 // 가입된 회원이 아니다. 비밀번호가 틀리다. 라는 메세지를 따로 보여주지 않는 이유는
 // 회원아이디를 입력해 보고 맞으면 또 비밀번호를 입력해보는 경우를 방지하기 위해서입니다.
 // 불법사용자의 경우 회원아이디가 틀린지, 비밀번호가 틀린지를 알기까지는 많은 시간이 소요되기 때문입니다.
-if (!$is_social_password_check && (!$mb['mb_id'] || !login_password_check($mb, $mb_password, $mb['mb_password'])) ) {
+if (!$is_social_password_check && (! (isset($mb['mb_id']) && $mb['mb_id']) || !login_password_check($mb, $mb_password, $mb['mb_password'])) ) {
 
     run_event('password_is_wrong', 'login', $mb);
 
@@ -73,7 +75,7 @@ if($config['cf_use_point']) {
 
 // 3.26
 // 아이디 쿠키에 한달간 저장
-if ($auto_login) {
+if (isset($auto_login) && $auto_login) {
     // 3.27
     // 자동로그인 ---------------------------
     // 쿠키 한달간 저장
@@ -127,5 +129,21 @@ if(function_exists('social_login_success_after')){
 
 run_event('member_login_check', $mb, $link, $is_social_login);
 
-goto_url($link);
-?>
+// 관리자로 로그인시 DATA 폴더의 쓰기 권한이 있는지 체크합니다. 쓰기 권한이 없으면 로그인을 못합니다.
+if( is_admin($mb['mb_id']) && is_dir(G5_DATA_PATH.'/tmp/') ){
+    $tmp_data_file = G5_DATA_PATH.'/tmp/tmp-write-test-'.time();
+    $tmp_data_check = @fopen($tmp_data_file, 'w');
+    if($tmp_data_check){
+        if(! @fwrite($tmp_data_check, G5_URL)){
+            $tmp_data_check = false;
+        }
+    }
+    @fclose($tmp_data_check);
+    @unlink($tmp_data_file);
+
+    if(! $tmp_data_check){
+        alert("data 폴더에 쓰기권한이 없거나 또는 웹하드 용량이 없는 경우\\n로그인을 못할수도 있으니, 용량 체크 및 쓰기 권한을 확인해 주세요.", $link);
+    }
+}
+
+goto_url($link);
\ No newline at end of file
diff --git a/bbs/logout.php b/bbs/logout.php
index 68c49c78b..2b39de70a 100644
--- a/bbs/logout.php
+++ b/bbs/logout.php
@@ -36,5 +36,4 @@ if ($url) {
 
 run_event('member_logout', $link);
 
-goto_url($link);
-?>
+goto_url($link);
\ No newline at end of file
diff --git a/bbs/member_confirm.php b/bbs/member_confirm.php
index dcfbfec7a..4c2f104a1 100644
--- a/bbs/member_confirm.php
+++ b/bbs/member_confirm.php
@@ -11,7 +11,7 @@ else
     $urlencode = urlencode($_SERVER[REQUEST_URI]);
 */
 
-$url = clean_xss_tags($_GET['url']);
+$url = isset($_GET['url']) ? clean_xss_tags($_GET['url']) : '';
 
 //소셜 로그인 한 경우
 if( function_exists('social_member_comfirm_redirect') && (! $url || $url === 'register_form.php' || (function_exists('social_is_edit_page') && social_is_edit_page($url) ) ) ){    
@@ -37,5 +37,4 @@ $url = get_text($url);
 
 include_once($member_skin_path.'/member_confirm.skin.php');
 
-include_once('./_tail.sub.php');
-?>
+include_once('./_tail.sub.php');
\ No newline at end of file
diff --git a/bbs/member_leave.php b/bbs/member_leave.php
index 139fb1a0a..bda999408 100644
--- a/bbs/member_leave.php
+++ b/bbs/member_leave.php
@@ -7,7 +7,9 @@ if (!$member['mb_id'])
 if ($is_admin == 'super')
     alert('최고 관리자는 탈퇴할 수 없습니다');
 
-if (!($_POST['mb_password'] && check_password($_POST['mb_password'], $member['mb_password'])))
+$post_mb_password = isset($_POST['mb_password']) ? trim($_POST['mb_password']) : '';
+
+if (!($post_mb_password && check_password($post_mb_password, $member['mb_password'])))
     alert('비밀번호가 틀립니다.');
 
 // 회원탈퇴일을 저장
@@ -26,5 +28,4 @@ if(function_exists('social_member_link_delete')){
     social_member_link_delete($member['mb_id']);
 }
 
-alert(''.$member['mb_nick'].'님께서는 '. date("Y년 m월 d일") .'에 회원에서 탈퇴 하셨습니다.', $url);
-?>
+alert(''.$member['mb_nick'].'님께서는 '. date("Y년 m월 d일") .'에 회원에서 탈퇴 하셨습니다.', $url);
\ No newline at end of file
diff --git a/bbs/memo.php b/bbs/memo.php
index 7de13908b..8dc446c13 100644
--- a/bbs/memo.php
+++ b/bbs/memo.php
@@ -9,7 +9,7 @@ set_session('ss_memo_delete_token', $token = uniqid(time()));
 $g5['title'] = '내 쪽지함';
 include_once(G5_PATH.'/head.sub.php');
 
-$kind = $kind ? clean_xss_tags(strip_tags($kind)) : 'recv';
+$kind = isset($_GET['kind']) ? clean_xss_tags($_GET['kind'], 0, 1) : 'recv';
 
 if ($kind == 'recv')
     $unkind = 'send';
@@ -83,5 +83,4 @@ $write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['c
 
 include_once($member_skin_path.'/memo.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/memo_delete.php b/bbs/memo_delete.php
index 4d5278e59..81f195ac7 100644
--- a/bbs/memo_delete.php
+++ b/bbs/memo_delete.php
@@ -10,7 +10,7 @@ set_session('ss_memo_delete_token', '');
 if (!($token && $delete_token == $token))
     alert('토큰 에러로 삭제 불가합니다.');
 
-$me_id = (int)$_REQUEST['me_id'];
+$me_id = isset($_REQUEST['me_id']) ? (int) $_REQUEST['me_id'] : 0;
 
 $sql = " select * from {$g5['memo_table']} where me_id = '{$me_id}' ";
 $row = sql_fetch($sql);
@@ -34,5 +34,4 @@ if (!$row['me_read_datetime'][0]) // 메모 받기전이면
 
 run_event('memo_delete', $me_id, $row);
 
-goto_url('./memo.php?kind='.$kind);
-?>
+goto_url('./memo.php?kind='.$kind);
\ No newline at end of file
diff --git a/bbs/memo_form.php b/bbs/memo_form.php
index 4ada2ccc3..7c46e98bc 100644
--- a/bbs/memo_form.php
+++ b/bbs/memo_form.php
@@ -9,6 +9,8 @@ if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id)
     alert_close("자신의 정보를 공개하지 않으면 다른분에게 쪽지를 보낼 수 없습니다. 정보공개 설정은 회원정보수정에서 하실 수 있습니다.");
 
 $content = "";
+$me_recv_mb_id = isset($_GET['me_recv_mb_id']) ? clean_xss_tags($_GET['me_recv_mb_id'], 1, 1) : '';
+
 // 탈퇴한 회원에게 쪽지 보낼 수 없음
 if ($me_recv_mb_id)
 {
@@ -38,5 +40,4 @@ include_once(G5_PATH.'/head.sub.php');
 $memo_action_url = G5_HTTPS_BBS_URL."/memo_form_update.php";
 include_once($member_skin_path.'/memo_form.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php
index f95526e76..42263fce5 100644
--- a/bbs/memo_form_update.php
+++ b/bbs/memo_form_update.php
@@ -9,7 +9,7 @@ if (!chk_captcha()) {
     alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
-$recv_list = explode(',', trim($_POST['me_recv_mb_id']));
+$recv_list = isset($_POST['me_recv_mb_id']) ? explode(',', trim($_POST['me_recv_mb_id'])) : array();
 $str_nick_list = '';
 $msg = '';
 $error_list  = array();
@@ -104,5 +104,4 @@ if ($member_list) {
     run_event('memo_form_update_failed', $member_list, $redirect_url, $_POST['me_memo']);
 
     alert("회원아이디 오류 같습니다.", $redirect_url, false);
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/memo_view.php b/bbs/memo_view.php
index be6bebc4f..441f05291 100644
--- a/bbs/memo_view.php
+++ b/bbs/memo_view.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 if (!$is_member)
     alert('회원만 이용하실 수 있습니다.');
 
-$me_id = (int)$_REQUEST['me_id'];
+$me_id = isset($_REQUEST['me_id']) ? (int) $_REQUEST['me_id'] : 0;
 
 if ($kind == 'recv')
 {
@@ -46,7 +46,7 @@ include_once(G5_PATH.'/head.sub.php');
 $sql = " select me.*, a.rownum from `{$g5['memo_table']}` as me inner join ( select me_id , (@rownum:=@rownum+1) as rownum from `{$g5['memo_table']}` as memo, (select @rownum:=0) tmp where me_{$kind}_mb_id = '{$member['mb_id']}' and memo.me_type = '$kind' order by me_id desc ) as a on a.me_id = me.me_id where me.me_id < '$me_id' and me.me_{$kind}_mb_id = '{$member['mb_id']}' and me.me_type = '$kind' order by me.me_id desc limit 1 ";
 
 $prev = sql_fetch($sql);
-if ($prev['me_id']) {
+if (isset($prev['me_id']) && $prev['me_id']) {
     $prev_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$prev['me_id'];
     $prev['page']  = ceil( (int)$prev['rownum'] / $config['cf_page_rows']);  // 이동할 페이지 계산
     if( (int)$prev['page'] > 0 ) $prev_link .= "&amp;page=".$prev['page'];
@@ -58,7 +58,7 @@ if ($prev['me_id']) {
 $sql = " select me.*, a.rownum from `{$g5['memo_table']}` as me inner join ( select me_id , (@rownum:=@rownum+1) as rownum from `{$g5['memo_table']}` as memo, (select @rownum:=0) tmp where me_{$kind}_mb_id = '{$member['mb_id']}' and memo.me_type = '$kind' order by me_id asc ) as a on a.me_id = me.me_id where me.me_id > '$me_id' and me.me_{$kind}_mb_id = '{$member['mb_id']}' and me.me_type = '$kind' order by me.me_id asc limit 1 ";
 
 $next = sql_fetch($sql);
-if ($next['me_id']) {
+if (isset($next['me_id']) && $next['me_id']) {
     $next_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$next['me_id'];
     $next['page']  = ceil( (int)$next['rownum'] / $config['cf_page_rows']);  // 이동할 페이지 계산
     if( (int)$next['page'] > 0 ) $next_link .= "&amp;page=".$next['page'];
@@ -78,5 +78,4 @@ if(isset($page) && $page){
 
 include_once($member_skin_path.'/memo_view.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/move.php b/bbs/move.php
index 1dfb5c02b..9fbc97d51 100644
--- a/bbs/move.php
+++ b/bbs/move.php
@@ -1,9 +1,11 @@
 <?php
 include_once('./_common.php');
 
-if ($sw == 'move')
+$sw = isset($_REQUEST['sw']) ? clean_xss_tags($_REQUEST['sw'], 1, 1) : '';
+
+if ($sw === 'move')
     $act = '이동';
-else if ($sw == 'copy')
+else if ($sw === 'copy')
     $act = '복사';
 else
     alert('sw 값이 제대로 넘어오지 않았습니다.');
@@ -20,8 +22,12 @@ if ($wr_id)
     $wr_id_list = $wr_id;
 else {
     $comma = '';
-    for ($i=0; $i<count($_POST['chk_wr_id']); $i++) {
-        $wr_id_list .= $comma . $_POST['chk_wr_id'][$i];
+
+    $count_chk_wr_id = (isset($_POST['chk_wr_id']) && is_array($_POST['chk_wr_id'])) ? count($_POST['chk_wr_id']) : 0;
+
+    for ($i=0; $i<$count_chk_wr_id; $i++) {
+        $wr_id_val = isset($_POST['chk_wr_id'][$i]) ? preg_replace('/[^0-9]/', '', $_POST['chk_wr_id'][$i]) : 0;
+        $wr_id_list .= $comma . $wr_id_val;
         $comma = ',';
     }
 }
@@ -157,5 +163,4 @@ function fboardmoveall_submit(f)
 
 <?php
 run_event('move_html_footer');
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/move_update.php b/bbs/move_update.php
index 0b5f85508..097af6863 100644
--- a/bbs/move_update.php
+++ b/bbs/move_update.php
@@ -2,6 +2,7 @@
 include_once('./_common.php');
 
 $act = isset($act) ? strip_tags($act) : '';
+$count_chk_bo_table = (isset($_POST['chk_bo_table']) && is_array($_POST['chk_bo_table'])) ? count($_POST['chk_bo_table']) : 0;
 
 // 게시판 관리자 이상 복사, 이동 가능
 if ($is_admin != 'board' && $is_admin != 'group' && $is_admin != 'super')
@@ -10,7 +11,7 @@ if ($is_admin != 'board' && $is_admin != 'group' && $is_admin != 'super')
 if ($sw != 'move' && $sw != 'copy')
     alert('sw 값이 제대로 넘어오지 않았습니다.');
 
-if(!count($_POST['chk_bo_table']))
+if(! $count_chk_bo_table)
     alert('게시물을 '.$act.'할 게시판을 한개 이상 선택해 주십시오.', $url);
 
 // 원본 파일 디렉토리
@@ -21,7 +22,7 @@ $save_count_write = 0;
 $save_count_comment = 0;
 $cnt = 0;
 
-$wr_id_list = preg_replace('/[^0-9\,]/', '', $_POST['wr_id_list']);
+$wr_id_list = isset($_POST['wr_id_list']) ? preg_replace('/[^0-9\,]/', '', $_POST['wr_id_list']) : '';
 
 $sql = " select distinct wr_num from $write_table where wr_id in ({$wr_id_list}) order by wr_id ";
 $result = sql_query($sql);
@@ -30,9 +31,9 @@ while ($row = sql_fetch_array($result))
     $save[$cnt]['wr_contents'] = array();
 
     $wr_num = $row['wr_num'];
-    for ($i=0; $i<count($_POST['chk_bo_table']); $i++)
+    for ($i=0; $i<$count_chk_bo_table; $i++)
     {
-        $move_bo_table = preg_replace('/[^a-z0-9_]/i', '', $_POST['chk_bo_table'][$i]);
+        $move_bo_table = isset($_POST['chk_bo_table'][$i]) ? preg_replace('/[^a-z0-9_]/i', '', $_POST['chk_bo_table'][$i]) : '';
 
         // 취약점 18-0075 참고
         $sql = "select * from {$g5['board_table']} where bo_table = '".sql_real_escape_string($move_bo_table)."' ";
@@ -129,7 +130,20 @@ while ($row = sql_fetch_array($result))
                     {
                         // 원본파일을 복사하고 퍼미션을 변경
                         // 제이프로님 코드제안 적용
-                        $copy_file_name = ($bo_table !== $move_bo_table) ? $row3['bf_file'] : $row2['wr_id'].'_copy_'.$insert_id.'_'.$row3['bf_file'];
+
+                        $copy_file_name = $row3['bf_file'];
+
+                        if($bo_table === $move_bo_table){
+                            if(preg_match('/_copy(\d+)?_(\d+)_/', $copy_file_name, $match)){
+
+                                $number = isset($match[1]) ? (int) $match[1] : 0;
+                                $replace_str = '_copy'.($number + 1).'_'.$insert_id.'_';
+                                $copy_file_name = preg_replace('/_copy(\d+)?_(\d+)_/', $replace_str, $copy_file_name);
+                            } else {
+                                $copy_file_name = $row2['wr_id'].'_copy_'.$insert_id.'_'.$row3['bf_file'];
+                            }
+                        }
+
                         $is_exist_file = is_file($src_dir.'/'.$row3['bf_file']) && file_exists($src_dir.'/'.$row3['bf_file']);
                         if( $is_exist_file ){
                             @copy($src_dir.'/'.$row3['bf_file'], $dst_dir.'/'.$copy_file_name);
@@ -192,12 +206,12 @@ while ($row = sql_fetch_array($result))
                 $save[$cnt]['wr_id'] = $row2['wr_parent'];
 
             $cnt++;
+
+            run_event('bbs_move_copy', $row2, $move_bo_table, $insert_id, $next_wr_num, $sw);
         }
 
         sql_query(" update {$g5['board_table']} set bo_count_write = bo_count_write + '$count_write' where bo_table = '$move_bo_table' ");
         sql_query(" update {$g5['board_table']} set bo_count_comment = bo_count_comment + '$count_comment' where bo_table = '$move_bo_table' ");
-        
-        run_event('bbs_move_copy', $row2, $move_bo_table, $insert_id, $next_wr_num, $sw);
 
         delete_cache_latest($move_bo_table);
     }
@@ -241,19 +255,16 @@ $opener_href  = get_pretty_url($bo_table,'','&amp;page='.$page.'&amp;'.$qstr);
 $opener_href1 = str_replace('&amp;', '&', $opener_href);
 
 run_event('bbs_move_update', $bo_table, $chk_bo_table, $wr_id_list, $opener_href);
-
-echo <<<HEREDOC
+?>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script>
-alert("$msg");
-opener.document.location.href = "$opener_href1";
+alert("<?php echo $msg; ?>");
+opener.document.location.href = "<?php echo $opener_href1; ?>";
 window.close();
 </script>
 <noscript>
 <p>
-    "$msg"
+    <?php echo $msg; ?>
 </p>
-<a href="$opener_href">돌아가기</a>
-</noscript>
-HEREDOC;
-?>
+<a href="<?php echo $opener_href; ?>">돌아가기</a>
+</noscript>
\ No newline at end of file
diff --git a/bbs/new.php b/bbs/new.php
index 708d2ffac..e439b9fe2 100644
--- a/bbs/new.php
+++ b/bbs/new.php
@@ -112,5 +112,4 @@ $write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['c
 
 include_once($new_skin_path.'/new.skin.php');
 
-include_once('./_tail.php');
-?>
\ No newline at end of file
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/new_delete.php b/bbs/new_delete.php
index 035653915..0cf1d425c 100644
--- a/bbs/new_delete.php
+++ b/bbs/new_delete.php
@@ -6,17 +6,20 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     alert("최고관리자만 접근이 가능합니다.");
 
-$board = array();
+$board = array('bo_table'=>'');
 $save_bo_table = array();
 $save_wr_id = array();
+$count_chk_bn_id = (isset($_POST['chk_bn_id']) && is_array($_POST['chk_bn_id'])) ? count($_POST['chk_bn_id']) : 0;
 
-for($i=0;$i<count($_POST['chk_bn_id']);$i++)
+for($i=0;$i<$count_chk_bn_id;$i++)
 {
     // 실제 번호를 넘김
-    $k = $_POST['chk_bn_id'][$i];
+    $k = isset($_POST['chk_bn_id'][$i]) ? (int) $_POST['chk_bn_id'][$i] : 0;
 
     $bo_table = isset($_POST['bo_table'][$k]) ? preg_replace('/[^a-z0-9_]/i', '', $_POST['bo_table'][$k]) : '';
     $wr_id    = isset($_POST['wr_id'][$k]) ? preg_replace('/[^0-9]/i', '', $_POST['wr_id'][$k]) : 0;
+    
+    $count_write = $count_comment = 0;
 
     $save_bo_table[$i] = $bo_table;
 	$save_wr_id[$i] = $wr_id;
@@ -50,9 +53,17 @@ for($i=0;$i<count($_POST['chk_bn_id']);$i++)
                 // 업로드된 파일이 있다면 파일삭제
                 $sql2 = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ";
                 $result2 = sql_query($sql2);
-                while ($row2 = sql_fetch_array($result2))
-                    @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
+                while ($row2 = sql_fetch_array($result2)){
 
+                    $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row2['bf_file']), $row2);
+                    if( file_exists($delete_file) ){
+                        @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
+                    }
+                    // 이미지파일이면 썸네일삭제
+                    if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {
+                        delete_board_thumbnail($bo_table, $row2['bf_file']);
+                    }
+                }
                 // 파일테이블 행 삭제
                 sql_query(" delete from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ");
 
@@ -60,9 +71,9 @@ for($i=0;$i<count($_POST['chk_bn_id']);$i++)
             }
             else
             {
-                // 코멘트 포인트 삭제
-                if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '코멘트'))
-                    insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 코멘트삭제");
+                // 댓글 포인트 삭제
+                if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '댓글'))
+                    insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 댓글삭제");
 
                 $count_comment++;
             }
@@ -117,8 +128,8 @@ for($i=0;$i<count($_POST['chk_bn_id']);$i++)
         $comment_reply = substr($write['wr_comment_reply'], 0, $len);
 
         // 코멘트 삭제
-        if (!delete_point($write['mb_id'], $bo_table, $comment_id, '코멘트')) {
-            insert_point($write['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_parent']}-{$comment_id} 코멘트삭제");
+        if (!delete_point($write['mb_id'], $bo_table, $comment_id, '댓글')) {
+            insert_point($write['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_parent']}-{$comment_id} 댓글삭제");
         }
 
         // 코멘트 삭제
@@ -145,5 +156,4 @@ foreach ($save_bo_table as $key=>$value) {
 
 run_event('bbs_new_delete', $chk_bn_id, $save_bo_table, $save_wr_id);
 
-goto_url("new.php?sfl=$sfl&stx=$stx&page=$page");
-?>
\ No newline at end of file
+goto_url("new.php?sfl=$sfl&stx=$stx&page=$page");
\ No newline at end of file
diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php
index e3f8aed55..d9043f606 100644
--- a/bbs/newwin.inc.php
+++ b/bbs/newwin.inc.php
@@ -16,7 +16,7 @@ $result = sql_query($sql, false);
 for ($i=0; $nw=sql_fetch_array($result); $i++)
 {
     // 이미 체크 되었다면 Continue
-    if ($_COOKIE["hd_pops_{$nw['nw_id']}"])
+    if (isset($_COOKIE["hd_pops_{$nw['nw_id']}"]) && $_COOKIE["hd_pops_{$nw['nw_id']}"])
         continue;
 ?>
 
diff --git a/bbs/password.php b/bbs/password.php
index 54209e9d3..31e807881 100644
--- a/bbs/password.php
+++ b/bbs/password.php
@@ -3,9 +3,7 @@ include_once('./_common.php');
 
 $g5['title'] = '비밀번호 입력';
 
-if( isset($comment_id) ){
-    $comment_id = (int) $comment_id;
-}
+$comment_id = isset($_REQUEST['comment_id']) ? preg_replace('/[^0-9]/', '', $_REQUEST['comment_id']) : 0;
 
 switch ($w) {
     case 'u' :
@@ -64,5 +62,4 @@ include_once($member_skin_path.'/password.skin.php');
 //if ($board['bo_content_tail']) { echo html_purifier(stripslashes($board['bo_content_tail'])); }
 //if ($board['bo_include_tail'] && is_include_path_check($board['bo_content_tail'])) { @include ($board['bo_include_tail']); }
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/password_check.php b/bbs/password_check.php
index 9eab6e5fe..cde4c408c 100644
--- a/bbs/password_check.php
+++ b/bbs/password_check.php
@@ -47,5 +47,4 @@ if ($w == 's') {
 } else
     alert('w 값이 제대로 넘어오지 않았습니다.');
 
-goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?'.$qstr));
-?>
+goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?'.$qstr));
\ No newline at end of file
diff --git a/bbs/password_lost.php b/bbs/password_lost.php
index 1e70ecf8d..c8f93f352 100644
--- a/bbs/password_lost.php
+++ b/bbs/password_lost.php
@@ -12,5 +12,4 @@ include_once(G5_PATH.'/head.sub.php');
 $action_url = G5_HTTPS_BBS_URL."/password_lost2.php";
 include_once($member_skin_path.'/password_lost.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/password_lost2.php b/bbs/password_lost2.php
index 96f57c7f9..9f8ec56da 100644
--- a/bbs/password_lost2.php
+++ b/bbs/password_lost2.php
@@ -73,5 +73,4 @@ mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb['mb_email'
 
 run_event('password_lost2_after', $mb, $mb_nonce, $mb_lost_certify);
 
-alert_close($email.' 메일로 회원아이디와 비밀번호를 인증할 수 있는 메일이 발송 되었습니다.\\n\\n메일을 확인하여 주십시오.');
-?>
+alert_close($email.' 메일로 회원아이디와 비밀번호를 인증할 수 있는 메일이 발송 되었습니다.\\n\\n메일을 확인하여 주십시오.');
\ No newline at end of file
diff --git a/bbs/password_lost_certify.php b/bbs/password_lost_certify.php
index b71cfc5d7..92aed20c2 100644
--- a/bbs/password_lost_certify.php
+++ b/bbs/password_lost_certify.php
@@ -8,8 +8,8 @@ run_event('password_lost_certify_before');
 
 // 오류시 공히 Error 라고 처리하는 것은 회원정보가 있는지? 비밀번호가 틀린지? 를 알아보려는 해킹에 대비한것
 
-$mb_no = preg_replace('#[^0-9]#', '', trim($_GET['mb_no']));
-$mb_nonce = trim($_GET['mb_nonce']);
+$mb_no = isset($_GET['mb_no']) ? preg_replace('#[^0-9]#', '', trim($_GET['mb_no'])) : 0;
+$mb_nonce = isset($_GET['mb_nonce']) ? trim($_GET['mb_nonce']) : '';
 
 // 회원아이디가 아닌 회원고유번호로 회원정보를 구한다.
 $sql = " select mb_id, mb_lost_certify from {$g5['member_table']} where mb_no = '$mb_no' ";
@@ -31,5 +31,4 @@ if ($mb_nonce === substr($mb['mb_lost_certify'], 0, 32)) {
 }
 else {
     die("Error");
-}
-?>
+}
\ No newline at end of file
diff --git a/bbs/point.php b/bbs/point.php
index e37fe67bc..e8e614fad 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -21,7 +21,17 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
+$sql = " select *
+            {$sql_common}
+            {$sql_order}
+            limit {$from_record}, {$rows} ";
+
+$result = sql_query($sql);
+
+for ($i=0; $row=sql_fetch_array($result); $i++) {
+    $list[] = $row;
+}
+
 include_once($member_skin_path.'/point.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/poll_etc_update.php b/bbs/poll_etc_update.php
index 14bf55553..772826872 100644
--- a/bbs/poll_etc_update.php
+++ b/bbs/poll_etc_update.php
@@ -4,9 +4,9 @@ include_once(G5_LIB_PATH.'/mailer.lib.php');
 
 if ($w == '')
 {
-    $po_id   = $_POST['po_id'];
-    $pc_name = $_POST['pc_name'];
-    $pc_idea = $_POST['pc_idea'];
+    $po_id   = isset($_POST['po_id']) ? (int) $_POST['po_id'] : '';
+    $pc_name = isset($_POST['pc_name']) ? clean_xss_tags($_POST['pc_name'], 1, 1) : '';
+    $pc_idea = isset($_POST['pc_idea']) ? clean_xss_tags($_POST['pc_idea'], 1, 1) : '';
 
     $po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '{$po_id}' ");
     if (!$po['po_id'])
@@ -55,5 +55,4 @@ else if ($w == 'd')
     }
 }
 
-goto_url('./poll_result.php?po_id='.$po_id.'&amp;skin_dir='.$skin_dir);
-?>
+goto_url('./poll_result.php?po_id='.$po_id.'&amp;skin_dir='.$skin_dir);
\ No newline at end of file
diff --git a/bbs/poll_result.php b/bbs/poll_result.php
index 939758de6..01e43773f 100644
--- a/bbs/poll_result.php
+++ b/bbs/poll_result.php
@@ -2,6 +2,8 @@
 include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 
+$po_id   = isset($_REQUEST['po_id']) ? (int) $_REQUEST['po_id'] : '';
+
 $po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '{$po_id}' ");
 if (!$po['po_id'])
     alert('설문조사 정보가 없습니다.');
@@ -15,9 +17,11 @@ $po_subject = $po['po_subject'];
 
 $max = 1;
 $total_po_cnt = 0;
-for ($i=1; $i<=9; $i++) {
+$poll_max_count = 9;
+
+for ($i=1; $i<=$poll_max_count; $i++) {
     $poll = $po['po_poll'.$i];
-    if ($poll == '') break;
+    if (! $poll) break;
 
     $count = $po['po_cnt'.$i];
     $total_po_cnt += $count;
@@ -29,12 +33,14 @@ $nf_total_po_cnt = number_format($total_po_cnt);
 
 $list = array();
 
-for ($i=1; $i<=9; $i++) {
+for ($i=1; $i<=$poll_max_count; $i++) {
     $poll = $po['po_poll'.$i];
-    if ($poll == '') { break; }
+    if (! $poll) { break; }
 
     $list[$i]['content'] = $poll;
     $list[$i]['cnt'] = $po['po_cnt'.$i];
+    $list[$i]['rate'] = 0;
+
     if ($total_po_cnt > 0)
         $list[$i]['rate'] = ($list[$i]['cnt'] / $total_po_cnt) * 100;
 
@@ -111,5 +117,4 @@ include_once(G5_PATH.'/head.sub.php');
 if (!file_exists($poll_skin_path.'/poll_result.skin.php')) die('skin error');
 include_once ($poll_skin_path.'/poll_result.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/poll_update.php b/bbs/poll_update.php
index 292e3ae7b..cca29431b 100644
--- a/bbs/poll_update.php
+++ b/bbs/poll_update.php
@@ -1,14 +1,16 @@
 <?php
 include_once('./_common.php');
 
+$po_id = isset($_POST['po_id']) ? preg_replace('/[^0-9]/', '', $_POST['po_id']) : 0;
+
 $po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '{$_POST['po_id']}' ");
-if (!$po['po_id'])
+if (! (isset($po['po_id']) && $po['po_id']))
     alert('po_id 값이 제대로 넘어오지 않았습니다.');
 
 if ($member['mb_level'] < $po['po_level'])
     alert_close('권한 '.$po['po_level'].' 이상 회원만 투표에 참여하실 수 있습니다.');
 
-$gb_poll = preg_replace('/[^0-9]/', '', $gb_poll);
+$gb_poll = isset($_POST['gb_poll']) ? preg_replace('/[^0-9]/', '', $_POST['gb_poll']) : 0;
 if(!$gb_poll)
     alert_close('항목을 선택하세요.');
 
@@ -35,7 +37,8 @@ if($is_member) {
     }
 }
 
-$result_url = G5_BBS_URL."/poll_result.php?po_id=$po_id&skin_dir={$_POST['skin_dir']}";
+$post_skin_dir = isset($_POST['skin_dir']) ? clean_xss_tags($_POST['skin_dir'], 1, 1) : '';
+$result_url = G5_BBS_URL."/poll_result.php?po_id=$po_id&skin_dir={$post_skin_dir}";
 
 // 없다면 선택한 투표항목을 1증가 시키고 ip, id를 저장
 if (!($search_ip || $search_mb_id)) {
@@ -50,12 +53,11 @@ if (!($search_ip || $search_mb_id)) {
 
     sql_query($sql);
 } else {
-    alert($po['po_subject'].'에 이미 참여하셨습니다.', $result_url);
+    alert(addcslashes($po['po_subject'], '"\\/').'에 이미 참여하셨습니다.', $result_url);
 }
 
 if (!$search_mb_id)
     insert_point($member['mb_id'], $po['po_point'], $po['po_id'] . '. ' . cut_str($po['po_subject'],20) . ' 투표 참여 ', '@poll', $po['po_id'], '투표');
 
 //goto_url($g5['bbs_url'].'/poll_result.php?po_id='.$po_id.'&amp;skin_dir='.$skin_dir);
-goto_url($result_url);
-?>
+goto_url($result_url);
\ No newline at end of file
diff --git a/bbs/profile.php b/bbs/profile.php
index d10ba16b8..b0f967dfa 100644
--- a/bbs/profile.php
+++ b/bbs/profile.php
@@ -32,5 +32,4 @@ $mb_profile = $mb['mb_profile'] ? conv_content($mb['mb_profile'],0) : '소개 
 
 include_once($member_skin_path.'/profile.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/qadelete.php b/bbs/qadelete.php
index 09e7b82cc..af92640eb 100644
--- a/bbs/qadelete.php
+++ b/bbs/qadelete.php
@@ -4,18 +4,21 @@ include_once('./_common.php');
 if($is_guest)
     alert('회원이시라면 로그인 후 이용해 주십시오.', G5_URL);
 
+$token = isset($_REQUEST['token']) ? clean_xss_tags($_REQUEST['token'], 1, 1) : '';
+$qa_id = isset($_REQUEST['qa_id']) ? (int) $_REQUEST['qa_id'] : 0;
+
 $delete_token = get_session('ss_qa_delete_token');
 set_session('ss_qa_delete_token', '');
 
-//관리자가 아닌경우에는 토큰을 검사합니다.
-if (!$is_admin && !($token && $delete_token == $token))
+//모든 회원의 토큰을 검사합니다.
+if (!($token && $delete_token === $token))
     alert('토큰 에러로 삭제 불가합니다.');
 
 $tmp_array = array();
 if ($qa_id) // 건별삭제
     $tmp_array[0] = $qa_id;
 else // 일괄삭제
-    $tmp_array = $_POST['chk_qa_id'];
+    $tmp_array = (isset($_POST['chk_qa_id']) && is_array($_POST['chk_qa_id'])) ? $_POST['chk_qa_id'] : array();
 
 $count = count($tmp_array);
 if(!$count)
@@ -42,7 +45,7 @@ for($i=0; $i<$count; $i++) {
 
     // 첨부파일 삭제
     for($k=1; $k<=2; $k++) {
-        @unlink(G5_DATA_PATH.'/qa/'.$row['qa_file'.$k]);
+        @unlink(G5_DATA_PATH.'/qa/'.clean_relative_paths($row['qa_file'.$k]));
         // 썸네일삭제
         if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['qa_file'.$k])) {
             delete_qa_thumbnail($row['qa_file'.$k]);
@@ -57,7 +60,7 @@ for($i=0; $i<$count; $i++) {
         $row2 = sql_fetch(" select qa_content, qa_file1, qa_file2 from {$g5['qa_content_table']} where qa_parent = '$qa_id' ");
         // 첨부파일 삭제
         for($k=1; $k<=2; $k++) {
-            @unlink(G5_DATA_PATH.'/qa/'.$row2['qa_file'.$k]);
+            @unlink(G5_DATA_PATH.'/qa/'.clean_relative_paths($row2['qa_file'.$k]));
             // 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['qa_file'.$k])) {
                 delete_qa_thumbnail($row2['qa_file'.$k]);
@@ -79,5 +82,4 @@ for($i=0; $i<$count; $i++) {
     sql_query(" delete from {$g5['qa_content_table']} where qa_id = '$qa_id' ");
 }
 
-goto_url(G5_BBS_URL.'/qalist.php'.preg_replace('/^&amp;/', '?', $qstr));
-?>
\ No newline at end of file
+goto_url(G5_BBS_URL.'/qalist.php'.preg_replace('/^&amp;/', '?', $qstr));
\ No newline at end of file
diff --git a/bbs/qadownload.php b/bbs/qadownload.php
index b6f163ed7..93cf8e210 100644
--- a/bbs/qadownload.php
+++ b/bbs/qadownload.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 // clean the output buffer
 ob_end_clean();
 
-$no = (int)$no;
+$no = isset($_REQUEST['no']) ? (int) $_REQUEST['no'] : 0;
 
 // 쿠키에 저장된 ID값과 넘어온 ID값을 비교하여 같지 않을 경우 오류 발생
 // 다른곳에서 링크 거는것을 방지하기 위한 코드
@@ -71,5 +71,4 @@ while(!feof($fp)) {
     usleep(1000);
 }
 fclose ($fp);
-flush();
-?>
+flush();
\ No newline at end of file
diff --git a/bbs/qahead.php b/bbs/qahead.php
index 976f4d524..256cd0058 100644
--- a/bbs/qahead.php
+++ b/bbs/qahead.php
@@ -14,5 +14,4 @@ if (G5_IS_MOBILE) {
     else
         include ('./_head.php');
     echo conv_content($qaconfig['qa_content_head'], 1);
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/qalist.php b/bbs/qalist.php
index 4d404c610..08fd0b175 100644
--- a/bbs/qalist.php
+++ b/bbs/qalist.php
@@ -6,12 +6,20 @@ if($is_guest)
 
 $qaconfig = get_qa_config();
 
+$token = '';
+if( $is_admin ){
+    $token = _token();
+    set_session('ss_qa_delete_token', $token);
+}
+
 $g5['title'] = $qaconfig['qa_title'];
 include_once('./qahead.php');
 
 $skin_file = $qa_skin_path.'/list.skin.php';
+$is_auth = $is_admin ? true : false;
 
 $category_option = '';
+
 if ($qaconfig['qa_category']) {
     $category_href = G5_BBS_URL.'/qalist.php';
 
@@ -120,5 +128,4 @@ if(is_file($skin_file)) {
     echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }
 
-include_once('./qatail.php');
-?>
\ No newline at end of file
+include_once('./qatail.php');
\ No newline at end of file
diff --git a/bbs/qatail.php b/bbs/qatail.php
index 8b22bcf66..1fb3cf646 100644
--- a/bbs/qatail.php
+++ b/bbs/qatail.php
@@ -11,5 +11,4 @@ if (G5_IS_MOBILE) {
         @include ($qaconfig['qa_include_tail']);
     else
         include ('./_tail.php');
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/qaview.php b/bbs/qaview.php
index 1bdbd48f3..59543188f 100644
--- a/bbs/qaview.php
+++ b/bbs/qaview.php
@@ -2,10 +2,16 @@
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
+$qa_id = isset($_REQUEST['qa_id']) ? (int) $_REQUEST['qa_id'] : 0;
+
 if($is_guest)
     alert('회원이시라면 로그인 후 이용해 보십시오.', './login.php?url='.urlencode(G5_BBS_URL.'/qaview.php?qa_id='.$qa_id));
 
 $qaconfig = get_qa_config();
+$content = '';
+
+$token = _token();
+set_session('ss_qa_delete_token', $token);
 
 $g5['title'] = $qaconfig['qa_title'];
 include_once('./qahead.php');
@@ -20,7 +26,7 @@ if(is_file($skin_file)) {
 
     $view = sql_fetch($sql);
 
-    if(!$view['qa_id'])
+    if(!(isset($view['qa_id']) && $view['qa_id']))
         alert('게시글이 존재하지 않습니다.\\n삭제되었거나 자신의 글이 아닌 경우입니다.');
 
     $subject_len = G5_IS_MOBILE ? $qaconfig['qa_mobile_subject_len'] : $qaconfig['qa_subject_len'];
@@ -107,9 +113,9 @@ if(is_file($skin_file)) {
             $update_href = G5_BBS_URL.'/qawrite.php?w=u&amp;qa_id='.$view['qa_id'].$qstr;
     }
     */
+
     if(($view['qa_type'] && $is_admin) || (!$view['qa_type'] && $view['qa_status'] == 0)) {
         $update_href = G5_BBS_URL.'/qawrite.php?w=u&amp;qa_id='.$view['qa_id'].$qstr;
-        set_session('ss_qa_delete_token', $token = uniqid(time()));
         $delete_href = G5_BBS_URL.'/qadelete.php?qa_id='.$view['qa_id'].'&amp;token='.$token.$qstr;
     }
 
@@ -126,7 +132,7 @@ if(is_file($skin_file)) {
 
         if($is_admin) {
             $answer_update_href = G5_BBS_URL.'/qawrite.php?w=u&amp;qa_id='.$answer['qa_id'].$qstr;
-            $answer_delete_href = G5_BBS_URL.'/qadelete.php?qa_id='.$answer['qa_id'].$qstr;
+            $answer_delete_href = G5_BBS_URL.'/qadelete.php?qa_id='.$answer['qa_id'].'&amp;token='.$token.$qstr;
         }
     }
 
@@ -168,10 +174,19 @@ if(is_file($skin_file)) {
         }
     }
 
+    $html_value = '';
+    $html_checked = '';
+    if (isset($view['qa_html']) && $view['qa_html']) {
+        $html_checked = 'checked';
+        $html_value = $view['qa_html'];
+
+        if($view['qa_html'] == 1 && !$is_dhtml_editor)
+            $html_value = 2;
+    }
+
     include_once($skin_file);
 } else {
     echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }
 
-include_once('./qatail.php');
-?>
\ No newline at end of file
+include_once('./qatail.php');
\ No newline at end of file
diff --git a/bbs/qawrite.php b/bbs/qawrite.php
index 484f271b5..fb041e0ad 100644
--- a/bbs/qawrite.php
+++ b/bbs/qawrite.php
@@ -6,10 +6,15 @@ if($w != '' && $w != 'u' && $w != 'r') {
     alert('올바른 방법으로 이용해 주십시오.');
 }
 
+$qa_id = isset($_REQUEST['qa_id']) ? (int) $_REQUEST['qa_id'] : 0;
+$write = array('qa_email_recv'=>'', 'qa_subject'=>'', 'qa_category'=>'');
+
 if($is_guest)
     alert('회원이시라면 로그인 후 이용해 보십시오.', './login.php?url='.urlencode(G5_BBS_URL.'/qalist.php'));
 
 $qaconfig = get_qa_config();
+$token = _token();
+set_session('ss_qa_write_token', $token);
 
 $g5['title'] = $qaconfig['qa_title'];
 include_once('./qahead.php');
@@ -90,7 +95,7 @@ if(is_file($skin_file)) {
     $upload_max_filesize = number_format($qaconfig['qa_upload_size']) . ' 바이트';
 
     $html_value = '';
-    if ($write['qa_html']) {
+    if (isset($write['qa_html']) && $write['qa_html']) {
         $html_checked = 'checked';
         $html_value = $write['qa_html'];
 
@@ -137,5 +142,4 @@ if(is_file($skin_file)) {
     echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }
 
-include_once('./qatail.php');
-?>
\ No newline at end of file
+include_once('./qatail.php');
\ No newline at end of file
diff --git a/bbs/qawrite_update.php b/bbs/qawrite_update.php
index 02ebd1cef..ab0b9b3a7 100644
--- a/bbs/qawrite_update.php
+++ b/bbs/qawrite_update.php
@@ -12,9 +12,18 @@ if($is_guest)
 
 $msg = array();
 
+$write_token = get_session('ss_qa_write_token');
+set_session('ss_qa_write_token', '');
+
+$token = isset($_POST['token']) ? clean_xss_tags($_POST['token'], 1, 1) : '';
+
+//모든 회원의 토큰을 검사합니다.
+if (!($token && $write_token === $token))
+    alert('올바른 방법으로 이용해 주십시오.');
+
 // 1:1문의 설정값
 $qaconfig = get_qa_config();
-$qa_id = isset($qa_id) ? (int) $qa_id : 0;
+$qa_id = isset($_POST['qa_id']) ? (int) $_POST['qa_id'] : 0;
 
 if(trim($qaconfig['qa_category'])) {
     if($w != 'a') {
@@ -57,8 +66,7 @@ if (!empty($msg)) {
     alert($msg);
 }
 
-if($qa_hp)
-    $qa_hp = preg_replace('/[^0-9\-]/', '', strip_tags($qa_hp));
+$qa_hp = isset($_POST['qa_hp']) ? preg_replace('/[^0-9\-]/', '', $_POST['qa_hp']) : '';
 
 // 090710
 if (substr_count($qa_content, '&#') > 50) {
@@ -72,6 +80,13 @@ if (empty($_POST)) {
     alert("파일 또는 글내용의 크기가 서버에서 설정한 값을 넘어 오류가 발생하였습니다.\\npost_max_size=".ini_get('post_max_size')." , upload_max_filesize=".$upload_max_filesize."\\n게시판관리자 또는 서버관리자에게 문의 바랍니다.");
 }
 
+$qa_type = 0;
+$qa_parent = 0;
+$qa_related = 0;
+$qa_email_recv = (isset($_POST['qa_email_recv']) && $_POST['qa_email_recv']) ? 1 : 0;
+$qa_sms_recv = (isset($_POST['qa_sms_recv']) && $_POST['qa_sms_recv']) ? 1 : 0;
+$qa_status = 0;
+
 for ($i=1; $i<=5; $i++) {
     $var = "qa_$i";
     $$var = "";
@@ -115,7 +130,7 @@ if($w == 'u' || $w == 'a' || $w == 'r') {
 
 // 파일개수 체크
 $file_count   = 0;
-$upload_count = count($_FILES['bf_file']['name']);
+$upload_count = isset($_FILES['bf_file']['name']) ? count($_FILES['bf_file']['name']) : 0;
 
 for ($i=1; $i<=$upload_count; $i++) {
     if($_FILES['bf_file']['name'][$i] && is_uploaded_file($_FILES['bf_file']['tmp_name'][$i]))
@@ -134,7 +149,7 @@ $chars_array = array_merge(range(0,9), range('a','z'), range('A','Z'));
 // 가변 파일 업로드
 $file_upload_msg = '';
 $upload = array();
-for ($i=1; $i<=count($_FILES['bf_file']['name']); $i++) {
+for ($i=1; $i<=$upload_count; $i++) {
     $upload[$i]['file']     = '';
     $upload[$i]['source']   = '';
     $upload[$i]['del_check'] = false;
@@ -142,7 +157,7 @@ for ($i=1; $i<=count($_FILES['bf_file']['name']); $i++) {
     // 삭제에 체크가 되어있다면 파일을 삭제합니다.
     if (isset($_POST['bf_file_del'][$i]) && $_POST['bf_file_del'][$i]) {
         $upload[$i]['del_check'] = true;
-        @unlink(G5_DATA_PATH.'/qa/'.$write['qa_file'.$i]);
+        @unlink(G5_DATA_PATH.'/qa/'.clean_relative_paths($write['qa_file'.$i]));
         // 썸네일삭제
         if(preg_match("/\.({$config['cf_image_extension']})$/i", $write['qa_file'.$i])) {
             delete_qa_thumbnail($write['qa_file'.$i]);
@@ -189,7 +204,7 @@ for ($i=1; $i<=count($_FILES['bf_file']['name']); $i++) {
 
         if ($w == 'u') {
             // 존재하는 파일이 있다면 삭제합니다.
-            @unlink(G5_DATA_PATH.'/qa/'.$write['qa_file'.$i]);
+            @unlink(G5_DATA_PATH.'/qa/'.clean_relative_paths($write['qa_file'.$i]));
             // 이미지파일이면 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $write['qa_file'.$i])) {
                 delete_qa_thumbnail($row['qa_file'.$i]);
@@ -229,11 +244,16 @@ if($w == '' || $w == 'a' || $w == 'r') {
         $qa_num = $write['qa_num'];
         $qa_parent = $write['qa_id'];
         $qa_related = $write['qa_related'];
-        $qa_category = $write['qa_category'];
+        $qa_category = addslashes($write['qa_category']);
         $qa_type = 1;
         $qa_status = 1;
     }
 
+    $insert_qa_file1 = isset($upload[1]['file']) ? $upload[1]['file'] : '';
+    $insert_qa_source1 = isset($upload[1]['source']) ? $upload[1]['source'] : '';
+    $insert_qa_file2 = isset($upload[2]['file']) ? $upload[2]['file'] : '';
+    $insert_qa_source2 = isset($upload[2]['source']) ? $upload[2]['source'] : '';
+
     $sql = " insert into {$g5['qa_content_table']}
                 set qa_num          = '$qa_num',
                     mb_id           = '{$member['mb_id']}',
@@ -250,10 +270,10 @@ if($w == '' || $w == 'a' || $w == 'r') {
                     qa_subject      = '$qa_subject',
                     qa_content      = '$qa_content',
                     qa_status       = '$qa_status',
-                    qa_file1        = '{$upload[1]['file']}',
-                    qa_source1      = '{$upload[1]['source']}',
-                    qa_file2        = '{$upload[2]['file']}',
-                    qa_source2      = '{$upload[2]['source']}',
+                    qa_file1        = '{$insert_qa_file1}',
+                    qa_source1      = '{$insert_qa_source1}',
+                    qa_file2        = '{$insert_qa_file2}',
+                    qa_source2      = '{$insert_qa_source2}',
                     qa_ip           = '{$_SERVER['REMOTE_ADDR']}',
                     qa_datetime     = '".G5_TIME_YMDHIS."',
                     qa_1            = '$qa_1',
@@ -450,5 +470,4 @@ else
 if ($file_upload_msg)
     alert($file_upload_msg, $result_url);
 else
-    goto_url($result_url);
-?>
\ No newline at end of file
+    goto_url($result_url);
\ No newline at end of file
diff --git a/bbs/register.php b/bbs/register.php
index e6fbb31a3..b417534c6 100644
--- a/bbs/register.php
+++ b/bbs/register.php
@@ -15,5 +15,4 @@ include_once('./_head.php');
 $register_action_url = G5_BBS_URL.'/register_form.php';
 include_once($member_skin_path.'/register.skin.php');
 
-include_once('./_tail.php');
-?>
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/register_email.php b/bbs/register_email.php
index 2d83f2c72..54ab2f6f7 100644
--- a/bbs/register_email.php
+++ b/bbs/register_email.php
@@ -5,14 +5,19 @@ include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 $g5['title'] = '메일인증 메일주소 변경';
 include_once('./_head.php');
 
-$mb_id = substr(clean_xss_tags($_GET['mb_id']), 0, 20);
-$sql = " select mb_email, mb_datetime, mb_ip, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
+$mb_id = isset($_GET['mb_id']) ? substr(clean_xss_tags($_GET['mb_id']), 0, 20) : '';
+$sql = " select mb_email, mb_datetime, mb_ip, mb_email_certify, mb_id from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $mb = sql_fetch($sql);
+
+if(! (isset($mb['mb_id']) && $mb['mb_id'])){
+    alert("해당 회원이 존재하지 않습니다.", G5_URL);
+}
+
 if (substr($mb['mb_email_certify'],0,1)!=0) {
     alert("이미 메일인증 하신 회원입니다.", G5_URL);
 }
 
-$ckey = trim($_GET['ckey']);
+$ckey = isset($_GET['ckey']) ? trim($_GET['ckey']) : '';
 $key  = md5($mb['mb_ip'].$mb['mb_datetime']);
 
 if(!$ckey || $ckey != $key)
@@ -54,5 +59,4 @@ function fregister_email_submit(f)
 }
 </script>
 <?php
-include_once('./_tail.php');
-?>
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/register_email_update.php b/bbs/register_email_update.php
index ec6a5672d..0dda117d9 100644
--- a/bbs/register_email_update.php
+++ b/bbs/register_email_update.php
@@ -3,8 +3,8 @@ include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-$mb_id = substr(clean_xss_tags($_POST['mb_id']), 0, 20);
-$mb_email = get_email_address(trim($_POST['mb_email']));
+$mb_id = isset($_POST['mb_id']) ? substr(clean_xss_tags($_POST['mb_id']), 0, 20) : '';
+$mb_email = isset($_POST['mb_email']) ? get_email_address(trim($_POST['mb_email'])) : '';
 
 if(!$mb_id || !$mb_email)
     alert('올바른 방법으로 이용해 주십시오.', G5_URL);
@@ -47,5 +47,4 @@ mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb_email, $su
 $sql = " update {$g5['member_table']} set mb_email = '$mb_email' where mb_id = '$mb_id' ";
 sql_query($sql);
 
-alert("인증메일을 {$mb_email} 메일로 다시 보내 드렸습니다.\\n\\n잠시후 {$mb_email} 메일을 확인하여 주십시오.", G5_URL);
-?>
\ No newline at end of file
+alert("인증메일을 {$mb_email} 메일로 다시 보내 드렸습니다.\\n\\n잠시후 {$mb_email} 메일을 확인하여 주십시오.", G5_URL);
\ No newline at end of file
diff --git a/bbs/register_form.php b/bbs/register_form.php
index d72804dd2..c79046575 100644
--- a/bbs/register_form.php
+++ b/bbs/register_form.php
@@ -14,7 +14,7 @@ set_session("ss_cert_type", "");
 
 $is_social_login_modify = false;
 
-if( $provider && function_exists('social_nonce_is_valid') ){   //모바일로 소셜 연결을 했다면
+if( isset($_REQUEST['provider']) && $_REQUEST['provider']  && function_exists('social_nonce_is_valid') ){   //모바일로 소셜 연결을 했다면
     if( social_nonce_is_valid(get_session("social_link_token"), $provider) ){  //토큰값이 유효한지 체크
         $w = 'u';   //회원 수정으로 처리
         $_POST['mb_id'] = $member['mb_id'];
@@ -87,7 +87,7 @@ if ($w == "") {
 
     if (isset($_POST['mb_password'])) {
         // 수정된 정보를 업데이트후 되돌아 온것이라면 비밀번호가 암호화 된채로 넘어온것임
-        if ($_POST['is_update']) {
+        if (isset($_POST['is_update']) && $_POST['is_update']) {
             $tmp_password = $_POST['mb_password'];
             $pass_check = ($member['mb_password'] === $tmp_password);
         } else {
@@ -131,19 +131,21 @@ include_once('./_head.php');
 
 // 회원아이콘 경로
 $mb_icon_path = G5_DATA_PATH.'/member/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif';
-$mb_icon_url  = G5_DATA_URL.'/member/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif';
+$mb_icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME && file_exists($mb_icon_path)) ? '?'.filemtime($mb_icon_path) : '';
+$mb_icon_url  = G5_DATA_URL.'/member/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'.$mb_icon_filemtile;
 
 // 회원이미지 경로
 $mb_img_path = G5_DATA_PATH.'/member_image/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif';
-$mb_img_url  = G5_DATA_URL.'/member_image/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif';
+$mb_img_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME && file_exists($mb_img_path)) ? '?'.filemtime($mb_img_path) : '';
+$mb_img_url  = G5_DATA_URL.'/member_image/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'.$mb_img_filemtile;
 
 $register_action_url = G5_HTTPS_BBS_URL.'/register_form_update.php';
 $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", G5_SERVER_TIME - ($config['cf_nick_modify'] * 86400)));
 $required = ($w=='') ? 'required' : '';
 $readonly = ($w=='u') ? 'readonly' : '';
 
-$agree  = preg_replace('#[^0-9]#', '', $agree);
-$agree2 = preg_replace('#[^0-9]#', '', $agree2);
+$agree  = isset($_REQUEST['agree']) ? preg_replace('#[^0-9]#', '', $_REQUEST['agree']) : '';
+$agree2 = isset($_REQUEST['agree2']) ? preg_replace('#[^0-9]#', '', $_REQUEST['agree2']) : '';
 
 // add_javascript('js 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 if ($config['cf_use_addr'])
@@ -153,5 +155,4 @@ include_once($member_skin_path.'/register_form.skin.php');
 
 run_event('register_form_after', $w, $agree, $agree2);
 
-include_once('./_tail.php');
-?>
\ No newline at end of file
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index c68a33687..9cafded03 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -24,18 +24,18 @@ if (!chk_captcha()) {
 if($w == 'u')
     $mb_id = isset($_SESSION['ss_mb_id']) ? trim($_SESSION['ss_mb_id']) : '';
 else if($w == '')
-    $mb_id = trim($_POST['mb_id']);
+    $mb_id = isset($_POST['mb_id']) ? trim($_POST['mb_id']) : '';
 else
     alert('잘못된 접근입니다', G5_URL);
 
 if(!$mb_id)
     alert('회원아이디 값이 없습니다. 올바른 방법으로 이용해 주십시오.');
 
-$mb_password    = trim($_POST['mb_password']);
-$mb_password_re = trim($_POST['mb_password_re']);
-$mb_name        = trim($_POST['mb_name']);
-$mb_nick        = trim($_POST['mb_nick']);
-$mb_email       = trim($_POST['mb_email']);
+$mb_password    = isset($_POST['mb_password']) ? trim($_POST['mb_password']) : '';
+$mb_password_re = isset($_POST['mb_password_re']) ? trim($_POST['mb_password_re']) : '';
+$mb_name        = isset($_POST['mb_name']) ? trim($_POST['mb_name']) : '';
+$mb_nick        = isset($_POST['mb_nick']) ? trim($_POST['mb_nick']) : '';
+$mb_email       = isset($_POST['mb_email']) ? trim($_POST['mb_email']) : '';
 $mb_sex         = isset($_POST['mb_sex'])           ? trim($_POST['mb_sex'])         : "";
 $mb_birth       = isset($_POST['mb_birth'])         ? trim($_POST['mb_birth'])       : "";
 $mb_homepage    = isset($_POST['mb_homepage'])      ? trim($_POST['mb_homepage'])    : "";
@@ -127,7 +127,8 @@ if ($w == '' || $w == 'u') {
 
         // 본인확인 체크
         if($config['cf_cert_use'] && $config['cf_cert_req']) {
-            if(trim($_POST['cert_no']) != $_SESSION['ss_cert_no'] || !$_SESSION['ss_cert_no'])
+            $post_cert_no = isset($_POST['cert_no']) ? trim($_POST['cert_no']) : '';
+            if($post_cert_no !== get_session('ss_cert_no') || ! get_session('ss_cert_no'))
                 alert("회원가입을 위해서는 본인확인을 해주셔야 합니다.");
         }
 
@@ -161,9 +162,9 @@ if ($w == '' || $w == 'u') {
 //  본인확인
 //---------------------------------------------------------------
 $mb_hp = hyphen_hp_number($mb_hp);
-if($config['cf_cert_use'] && $_SESSION['ss_cert_type'] && $_SESSION['ss_cert_dupinfo']) {
+if($config['cf_cert_use'] && get_session('ss_cert_type') && get_session('ss_cert_dupinfo')) {
     // 중복체크
-    $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$_SESSION['ss_cert_dupinfo']}' ";
+    $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '".get_session('ss_cert_dupinfo')."' ";
     $row = sql_fetch($sql);
     if ($row['mb_id']) {
         alert("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']);
@@ -171,17 +172,17 @@ if($config['cf_cert_use'] && $_SESSION['ss_cert_type'] && $_SESSION['ss_cert_dup
 }
 
 $sql_certify = '';
-$md5_cert_no = $_SESSION['ss_cert_no'];
-$cert_type = $_SESSION['ss_cert_type'];
+$md5_cert_no = get_session('ss_cert_no');
+$cert_type = get_session('ss_cert_type');
 if ($config['cf_cert_use'] && $cert_type && $md5_cert_no) {
     // 해시값이 같은 경우에만 본인확인 값을 저장한다.
-    if ($_SESSION['ss_cert_hash'] == md5($mb_name.$cert_type.$_SESSION['ss_cert_birth'].$md5_cert_no)) {
+    if (get_session('ss_cert_hash') == md5($mb_name.$cert_type.get_session('ss_cert_birth').$md5_cert_no)) {
         $sql_certify .= " , mb_hp = '{$mb_hp}' ";
         $sql_certify .= " , mb_certify  = '{$cert_type}' ";
-        $sql_certify .= " , mb_adult = '{$_SESSION['ss_cert_adult']}' ";
-        $sql_certify .= " , mb_birth = '{$_SESSION['ss_cert_birth']}' ";
-        $sql_certify .= " , mb_sex = '{$_SESSION['ss_cert_sex']}' ";
-        $sql_certify .= " , mb_dupinfo = '{$_SESSION['ss_cert_dupinfo']}' ";
+        $sql_certify .= " , mb_adult = '".get_session('ss_cert_adult')."' ";
+        $sql_certify .= " , mb_birth = '".get_session('ss_cert_birth')."' ";
+        $sql_certify .= " , mb_sex = '".get_session('ss_cert_sex')."' ";
+        $sql_certify .= " , mb_dupinfo = '".get_session('ss_cert_dupinfo')."' ";
         if($w == 'u')
             $sql_certify .= " , mb_name = '{$mb_name}' ";
     } else {
@@ -304,7 +305,7 @@ if ($w == '') {
     set_session('ss_mb_reg', $mb_id);
 
 } else if ($w == 'u') {
-    if (!trim($_SESSION['ss_mb_id']))
+    if (!trim(get_session('ss_mb_id')))
         alert('로그인 되어 있지 않습니다.');
 
     if (trim($_POST['mb_id']) != $mb_id)
@@ -508,11 +509,11 @@ if ($config['cf_use_email_certify'] && $old_email != $mb_email) {
 // 사용자 코드 실행
 @include_once ($member_skin_path.'/register_form_update.tail.skin.php');
 
-unset($_SESSION['ss_cert_type']);
-unset($_SESSION['ss_cert_no']);
-unset($_SESSION['ss_cert_hash']);
-unset($_SESSION['ss_cert_birth']);
-unset($_SESSION['ss_cert_adult']);
+if(isset($_SESSION['ss_cert_type'])) unset($_SESSION['ss_cert_type']);
+if(isset($_SESSION['ss_cert_no'])) unset($_SESSION['ss_cert_no']);
+if(isset($_SESSION['ss_cert_hash'])) unset($_SESSION['ss_cert_hash']);
+if(isset($_SESSION['ss_cert_birth'])) unset($_SESSION['ss_cert_birth']);
+if(isset($_SESSION['ss_cert_adult'])) unset($_SESSION['ss_cert_adult']);
 
 if ($msg)
     echo '<script>alert(\''.$msg.'\');</script>';
@@ -549,5 +550,4 @@ if ($w == '') {
         </body>
         </html>';
     }
-}
-?>
+}
\ No newline at end of file
diff --git a/bbs/register_result.php b/bbs/register_result.php
index cc27753cd..cc7523794 100644
--- a/bbs/register_result.php
+++ b/bbs/register_result.php
@@ -11,5 +11,4 @@ if (!$mb['mb_id'])
 $g5['title'] = '회원가입 완료';
 include_once('./_head.php');
 include_once($member_skin_path.'/register_result.skin.php');
-include_once('./_tail.php');
-?>
\ No newline at end of file
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/rss.php b/bbs/rss.php
index 9d6def1d0..bde5af31f 100644
--- a/bbs/rss.php
+++ b/bbs/rss.php
@@ -86,5 +86,4 @@ $date = date('r', strtotime($date));
 }
 
 echo '</channel>'."\n";
-echo '</rss>'."\n";
-?>
+echo '</rss>'."\n";
\ No newline at end of file
diff --git a/bbs/scrap.php b/bbs/scrap.php
index 20644214a..bc4ff4673 100644
--- a/bbs/scrap.php
+++ b/bbs/scrap.php
@@ -56,5 +56,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 
 include_once($member_skin_path.'/scrap.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/scrap_delete.php b/bbs/scrap_delete.php
index 64f83ca0a..6859caaf9 100644
--- a/bbs/scrap_delete.php
+++ b/bbs/scrap_delete.php
@@ -1,6 +1,8 @@
 <?php
 include_once('./_common.php');
 
+$ms_id = isset($_REQUEST['ms_id']) ? (int) $_REQUEST['ms_id'] : 0;
+
 if (!$is_member)
     alert('회원만 이용하실 수 있습니다.');
 
@@ -10,5 +12,4 @@ sql_query($sql);
 $sql = " update `{$g5['member_table']}` set mb_scrap_cnt = '".get_scrap_totals($member['mb_id'])."' where mb_id = '{$member['mb_id']}' ";
 sql_query($sql);
 
-goto_url('./scrap.php?page='.$page);
-?>
+goto_url('./scrap.php?page='.$page);
\ No newline at end of file
diff --git a/bbs/scrap_popin.php b/bbs/scrap_popin.php
index 13e5b4cac..3ab5bef64 100644
--- a/bbs/scrap_popin.php
+++ b/bbs/scrap_popin.php
@@ -59,5 +59,4 @@ HEREDOC;
 
 include_once($member_skin_path.'/scrap_popin.skin.php');
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/scrap_popin_update.php b/bbs/scrap_popin_update.php
index c1fb89399..86d25137a 100644
--- a/bbs/scrap_popin_update.php
+++ b/bbs/scrap_popin_update.php
@@ -11,7 +11,7 @@ if (!$is_member)
 }
 
 // 게시글 존재하는지
-if(!$write['wr_id'])
+if(! (isset($write['wr_id']) && $write['wr_id']))
     alert_close('스크랩하시려는 게시글이 존재하지 않습니다.');
 
 $sql = " select count(*) as cnt from {$g5['scrap_table']}
@@ -19,7 +19,7 @@ $sql = " select count(*) as cnt from {$g5['scrap_table']}
             and bo_table = '$bo_table'
             and wr_id = '$wr_id' ";
 $row = sql_fetch($sql);
-if ($row['cnt'])
+if (isset($row['cnt']) && $row['cnt'])
 {
     echo '
     <script>
@@ -36,14 +36,14 @@ if ($row['cnt'])
     exit;
 }
 
-$wr_content = trim($_POST['wr_content']);
+$wr_content = isset($_POST['wr_content']) ? trim($_POST['wr_content']) : '';
 
 // 덧글이 넘어오고 코멘트를 쓸 권한이 있다면
 if ($wr_content && ($member['mb_level'] >= $board['bo_comment_level']))
 {
     $wr = get_write($write_table, $wr_id);
     // 원글이 존재한다면
-    if ($wr['wr_id'])
+    if (isset($wr['wr_id']) && $wr['wr_id'])
     {
 
         // 세션의 시간 검사
@@ -105,17 +105,14 @@ $sql = " update `{$g5['member_table']}` set mb_scrap_cnt = '".get_scrap_totals($
 sql_query($sql);
 
 delete_cache_latest($bo_table);
-
-echo <<<HEREDOC
+?>
 <script>
-    if (confirm('이 글을 스크랩 하였습니다.\\n\\n지금 스크랩을 확인하시겠습니까?'))
-        document.location.href = './scrap.php';
+    if (confirm("이 글을 스크랩 하였습니다.\n\n지금 스크랩을 확인하시겠습니까?"))
+        document.location.href = "./scrap.php";
     else
         window.close();
 </script>
 <noscript>
 <p>이 글을 스크랩 하였습니다.</p>
 <a href="./scrap.php">스크랩 확인하기</a>
-</noscript>
-HEREDOC;
-?>
+</noscript>
\ No newline at end of file
diff --git a/bbs/search.php b/bbs/search.php
index 33f786bc9..4211a6db6 100644
--- a/bbs/search.php
+++ b/bbs/search.php
@@ -151,7 +151,7 @@ if ($stx) {
     for ($i=0; $i<count($search_table); $i++) {
         if ($from_record < $search_table_count[$i]) {
             $table_index = $i;
-            $from_record = $from_record - $search_table_count[$i-1];
+            $from_record = $from_record - ($i > 0 ? $search_table_count[$i-1] : 0);
             break;
         }
     }
@@ -183,7 +183,7 @@ if ($stx) {
             }
 
             // 비밀글은 검색 불가
-            if (strstr($row['wr_option'].$row2['wr_option'], 'secret'))
+            if (strstr($row['wr_option'].(isset($row2['wr_option']) ? $row2['wr_option'] : ''), 'secret'))
                 $row['wr_content'] = '[비밀글 입니다.]';
 
             $subject = get_text($row['wr_subject']);
@@ -228,7 +228,7 @@ $group_select = '<label for="gr_id" class="sound_only">게시판 그룹선택</l
 $sql = " select gr_id, gr_subject from {$g5['group_table']} order by gr_id ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++)
-    $group_select .= "<option value=\"".$row['gr_id']."\"".get_selected($_GET['gr_id'], $row['gr_id']).">".$row['gr_subject']."</option>";
+    $group_select .= "<option value=\"".$row['gr_id']."\"".get_selected($gr_id, $row['gr_id']).">".$row['gr_subject']."</option>";
 $group_select .= '</select>';
 
 if (!$sfl) $sfl = 'wr_subject';
@@ -236,5 +236,4 @@ if (!$sop) $sop = 'or';
 
 include_once($search_skin_path.'/search.skin.php');
 
-include_once('./_tail.php');
-?>
\ No newline at end of file
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/bbs/sns_send.php b/bbs/sns_send.php
index 972d16257..0593f23a6 100644
--- a/bbs/sns_send.php
+++ b/bbs/sns_send.php
@@ -1,13 +1,16 @@
 <?php
 include_once("./_common.php");
 
-$title    =  urlencode(str_replace('\"', '"',$_REQUEST['title']));
-$short_url = googl_short_url($_REQUEST['longurl']);
+$title    =  isset($_REQUEST['title']) ? urlencode(str_replace('\"', '"', $_REQUEST['title'])) : '';
+$short_url = isset($_REQUEST['longurl']) ? googl_short_url($_REQUEST['longurl']) : '';
+$sns = isset($_REQUEST['sns']) ? $_REQUEST['sns'] : '';
+
 if(!$short_url)
-    $short_url = urlencode($_REQUEST['longurl']);
+    $short_url = isset($_REQUEST['longurl']) ? urlencode($_REQUEST['longurl']) : '';
+
 $title_url = $title.' : '.$short_url;
 
-switch($_REQUEST['sns']) {
+switch($sns) {
     case 'facebook' :
         header("Location:http://www.facebook.com/sharer/sharer.php?s=100&u=".$short_url."&p=".$title);
         break;
@@ -19,5 +22,4 @@ switch($_REQUEST['sns']) {
         break;
     default :
         echo 'Error';
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/view.php b/bbs/view.php
index bea95be85..d78fa7b0e 100644
--- a/bbs/view.php
+++ b/bbs/view.php
@@ -28,7 +28,7 @@ if (!$board['bo_use_list_view']) {
     $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply < '{$write['wr_reply']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
     $prev = sql_fetch($sql);
     // 위의 쿼리문으로 값을 얻지 못했다면
-    if (!$prev['wr_id'])     {
+    if (! (isset($prev['wr_id']) && $prev['wr_id'])) {
         $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num < '{$write['wr_num']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
         $prev = sql_fetch($sql);
     }
@@ -37,7 +37,7 @@ if (!$board['bo_use_list_view']) {
     $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply > '{$write['wr_reply']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
     $next = sql_fetch($sql);
     // 위의 쿼리문으로 값을 얻지 못했다면
-    if (!$next['wr_id']) {
+    if (! (isset($next['wr_id']) && $next['wr_id'])) {
         $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num > '{$write['wr_num']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
         $next = sql_fetch($sql);
     }
@@ -142,5 +142,4 @@ if ($board['bo_use_signature'] && $view['mb_id']) {
 
 include_once($board_skin_path.'/view.skin.php');
 
-@include_once($board_skin_path.'/view.tail.skin.php');
-?>
+@include_once($board_skin_path.'/view.tail.skin.php');
\ No newline at end of file
diff --git a/bbs/view_comment.php b/bbs/view_comment.php
index 795780110..f7cb5d087 100644
--- a/bbs/view_comment.php
+++ b/bbs/view_comment.php
@@ -7,6 +7,9 @@ if ($is_guest && $board['bo_comment_level'] < 2) {
     $captcha_html = captcha_html('_comment');
 }
 
+$c_id = isset($_GET['c_id']) ? clean_xss_tags($_GET['c_id'], 1, 1) : '';
+$c_wr_content = '';
+
 @include_once($board_skin_path.'/view_comment.head.skin.php');
 
 $list = array();
@@ -126,5 +129,4 @@ include_once($board_skin_path.'/view_comment.skin.php');
 if (!$member['mb_id']) // 비회원일 경우에만
     echo '<script src="'.G5_JS_URL.'/md5.js"></script>'."\n";
 
-@include_once($board_skin_path.'/view_comment.tail.skin.php');
-?>
\ No newline at end of file
+@include_once($board_skin_path.'/view_comment.tail.skin.php');
\ No newline at end of file
diff --git a/bbs/view_image.php b/bbs/view_image.php
index ba3d9ba7b..6be5aedd0 100644
--- a/bbs/view_image.php
+++ b/bbs/view_image.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 $g5['title'] = '이미지 크게보기';
 include_once(G5_PATH.'/head.sub.php');
 
-$filename = preg_replace('/[^A-Za-z0-9 _ .\-\/]/', '', $_GET['fn']);
+$filename = isset($_GET['fn']) ? preg_replace('/[^A-Za-z0-9 _ .\-\/]/', '', $_GET['fn']) : '';
 
 if(function_exists('clean_relative_paths')){
     $filename = clean_relative_paths($filename);
@@ -145,5 +145,4 @@ $.fn.imgLoad = function(callback) {
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/visit_browscap.inc.php b/bbs/visit_browscap.inc.php
index 7bfd0db38..7b1f99de4 100644
--- a/bbs/visit_browscap.inc.php
+++ b/bbs/visit_browscap.inc.php
@@ -17,5 +17,4 @@ if(defined('G5_VISIT_BROWSCAP_USE') && G5_VISIT_BROWSCAP_USE && is_file(G5_DATA_
     $vi_browser = $info->Comment;
     $vi_os = $info->Platform;
     $vi_device = $info->Device_Type;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bbs/visit_insert.inc.php b/bbs/visit_insert.inc.php
index b8154e215..4aa235bd3 100644
--- a/bbs/visit_insert.inc.php
+++ b/bbs/visit_insert.inc.php
@@ -41,22 +41,22 @@ if (get_cookie('ck_visit_ip') != $_SERVER['REMOTE_ADDR'])
         // 오늘
         $sql = " select vs_count as cnt from {$g5['visit_sum_table']} where vs_date = '".G5_TIME_YMD."' ";
         $row = sql_fetch($sql);
-        $vi_today = $row['cnt'];
+        $vi_today = isset($row['cnt']) ? $row['cnt'] : 0;
 
         // 어제
         $sql = " select vs_count as cnt from {$g5['visit_sum_table']} where vs_date = DATE_SUB('".G5_TIME_YMD."', INTERVAL 1 DAY) ";
         $row = sql_fetch($sql);
-        $vi_yesterday = $row['cnt'];
+        $vi_yesterday = isset($row['cnt']) ? $row['cnt'] : 0;
 
         // 최대
         $sql = " select max(vs_count) as cnt from {$g5['visit_sum_table']} ";
         $row = sql_fetch($sql);
-        $vi_max = $row['cnt'];
+        $vi_max = isset($row['cnt']) ? $row['cnt'] : 0;
 
         // 전체
         $sql = " select sum(vs_count) as total from {$g5['visit_sum_table']} ";
         $row = sql_fetch($sql);
-        $vi_sum = $row['total'];
+        $vi_sum = isset($row['total']) ? $row['total'] : 0;
 
         $visit = '오늘:'.$vi_today.',어제:'.$vi_yesterday.',최대:'.$vi_max.',전체:'.$vi_sum;
 
@@ -65,5 +65,4 @@ if (get_cookie('ck_visit_ip') != $_SERVER['REMOTE_ADDR'])
         // 쿼리의 수를 상당부분 줄임
         sql_query(" update {$g5['config_table']} set cf_visit = '{$visit}' ");
     }
-}
-?>
+}
\ No newline at end of file
diff --git a/bbs/write.php b/bbs/write.php
index f8da422d8..e9c253cbb 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -340,8 +340,16 @@ if ($w == '') {
     }
 
     $file = get_file($bo_table, $wr_id);
-    if($file_count < $file['count'])
+    if($file_count < $file['count']) {
         $file_count = $file['count'];
+    }
+
+    for($i=0;$i<$file_count;$i++){
+        if(! isset($file[$i])) {
+            $file[$i] = array('file'=>null, 'source'=>null, 'size'=>null);
+        }
+    }
+
 } else if ($w == 'r') {
     if (strstr($write['wr_option'], 'secret')) {
         $is_secret = true;
@@ -355,8 +363,8 @@ if ($w == '') {
     }
 }
 
-set_session('ss_bo_table', $_REQUEST['bo_table']);
-set_session('ss_wr_id', $_REQUEST['wr_id']);
+set_session('ss_bo_table', $bo_table);
+set_session('ss_wr_id', $wr_id);
 
 $subject = "";
 if (isset($write['wr_subject'])) {
@@ -433,5 +441,4 @@ include_once ($board_skin_path.'/write.skin.php');
 
 include_once('./board_tail.php');
 @include_once ($board_skin_path.'/write.tail.skin.php');
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php
index cdf1b1679..71e7c5c50 100644
--- a/bbs/write_comment_update.php
+++ b/bbs/write_comment_update.php
@@ -6,7 +6,7 @@ include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 // 토큰체크
 $comment_token = trim(get_session('ss_comment_token'));
 set_session('ss_comment_token', '');
-if(!trim($_POST['token']) || !$comment_token || $comment_token != $_POST['token'])
+if(empty($_POST['token']) || !$comment_token || $comment_token != $_POST['token'])
     alert('올바른 방법으로 이용해 주십시오.');
 
 // 090710
@@ -15,16 +15,31 @@ if (substr_count($wr_content, "&#") > 50) {
     exit;
 }
 
-@include_once($board_skin_path.'/write_comment_update.head.skin.php');
-
-$w = $_POST["w"];
-$wr_name  = trim($_POST['wr_name']);
-$wr_email = '';
+$w = isset($_POST['w']) ? clean_xss_tags($_POST['w']) : '';
+$wr_name  = isset($_POST['wr_name']) ? clean_xss_tags(trim($_POST['wr_name'])) : '';
+$wr_secret = isset($_POST['wr_secret']) ? clean_xss_tags($_POST['wr_secret']) : '';
+$wr_email = $wr_subject = '';
 $reply_array = array();
 
+$wr_1 = isset($_POST['wr_1']) ? $_POST['wr_1'] : '';
+$wr_2 = isset($_POST['wr_2']) ? $_POST['wr_2'] : '';
+$wr_3 = isset($_POST['wr_3']) ? $_POST['wr_3'] : '';
+$wr_4 = isset($_POST['wr_4']) ? $_POST['wr_4'] : '';
+$wr_5 = isset($_POST['wr_5']) ? $_POST['wr_5'] : '';
+$wr_6 = isset($_POST['wr_6']) ? $_POST['wr_6'] : '';
+$wr_7 = isset($_POST['wr_7']) ? $_POST['wr_7'] : '';
+$wr_8 = isset($_POST['wr_8']) ? $_POST['wr_8'] : '';
+$wr_9 = isset($_POST['wr_9']) ? $_POST['wr_9'] : '';
+$wr_10 = isset($_POST['wr_10']) ? $_POST['wr_10'] : '';
+$wr_facebook_user = isset($_POST['wr_facebook_user']) ? clean_xss_tags($_POST['wr_facebook_user'], 1, 1) : '';
+$wr_twitter_user = isset($_POST['wr_twitter_user']) ? clean_xss_tags($_POST['wr_twitter_user'], 1, 1) : '';
+$wr_homepage = isset($_POST['wr_homepage']) ? clean_xss_tags($_POST['wr_homepage'], 1, 1) : '';
+
 if (!empty($_POST['wr_email']))
     $wr_email = get_email_address(trim($_POST['wr_email']));
 
+@include_once($board_skin_path.'/write_comment_update.head.skin.php');
+
 // 비회원의 경우 이름이 누락되는 경우가 있음
 if ($is_guest) {
     if ($wr_name == '')
@@ -42,7 +57,7 @@ else
 
 // 세션의 시간 검사
 // 4.00.15 - 댓글 수정시 연속 게시물 등록 메시지로 인한 오류 수정
-if ($w == 'c' && $_SESSION['ss_datetime'] >= (G5_SERVER_TIME - $config['cf_delay_sec']) && !$is_admin)
+if ($w == 'c' && !$is_admin && isset($_SESSION['ss_datetime']) && $_SESSION['ss_datetime'] >= (G5_SERVER_TIME - $config['cf_delay_sec']))
     alert('너무 빠른 시간내에 게시물을 연속해서 올릴 수 없습니다.');
 
 set_session('ss_datetime', G5_SERVER_TIME);
@@ -325,11 +340,11 @@ else if ($w == 'cu') // 댓글 수정
                      wr_7 = '$wr_7',
                      wr_8 = '$wr_8',
                      wr_9 = '$wr_9',
-                     wr_10 = '$wr_10',
-                     wr_option = '$wr_option'
+                     wr_10 = '$wr_10'
                      $sql_ip
                      $sql_secret
               where wr_id = '$comment_id' ";
+
     sql_query($sql);
 }
 
@@ -343,5 +358,4 @@ $redirect_url = short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table
 
 run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url, $comment_id, $reply_array);
 
-goto_url($redirect_url);
-?>
+goto_url($redirect_url);
\ No newline at end of file
diff --git a/bbs/write_comment_update.sns.php b/bbs/write_comment_update.sns.php
index 0b3a0754b..cca0fdb05 100644
--- a/bbs/write_comment_update.sns.php
+++ b/bbs/write_comment_update.sns.php
@@ -10,7 +10,7 @@ set_cookie('ck_twitter_checked' , false, 86400*31);
 // 페이스북
 //----------------------------------------------------------------------------
 $wr_facebook_user = "";
-if ($_POST['facebook_checked']) {
+if (! empty($_POST['facebook_checked'])) {
     include_once(G5_SNS_PATH."/facebook/src/facebook.php");
 
     $facebook = new Facebook(array(
@@ -48,7 +48,7 @@ if ($_POST['facebook_checked']) {
 // 트위터
 //----------------------------------------------------------------------------
 $wr_twitter_user = "";
-if ($_POST['twitter_checked']) {
+if (! empty($_POST['twitter_checked'])) {
     include_once(G5_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
     include_once(G5_SNS_PATH."/twitter/twitterconfig.php");
 
@@ -68,5 +68,4 @@ if ($_POST['twitter_checked']) {
 
     $wr_twitter_user = get_session("ss_twitter_user");
 }
-//============================================================================
-?>
\ No newline at end of file
+//============================================================================;
\ No newline at end of file
diff --git a/bbs/write_token.php b/bbs/write_token.php
index e8578ef7e..b14245b5d 100644
--- a/bbs/write_token.php
+++ b/bbs/write_token.php
@@ -9,5 +9,4 @@ set_session('ss_write_'.$bo_table.'_token', '');
 
 $token = get_write_token($bo_table);
 
-die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
-?>
\ No newline at end of file
+die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
\ No newline at end of file
diff --git a/bbs/write_update.php b/bbs/write_update.php
index b12a4beb8..8e01109a8 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -9,9 +9,10 @@ check_write_token($bo_table);
 $g5['title'] = '게시글 저장';
 
 $msg = array();
+$uid = isset($_POST['uid']) ? preg_replace('/[^0-9]/', '', $_POST['uid']) : 0;
 
 if($board['bo_use_category']) {
-    $ca_name = trim($_POST['ca_name']);
+    $ca_name = isset($_POST['ca_name']) ? trim($_POST['ca_name']) : '';
     if(!$ca_name) {
         $msg[] = '<strong>분류</strong>를 선택하세요.';
     } else {
@@ -76,6 +77,11 @@ if (empty($_POST)) {
 }
 
 $notice_array = explode(",", $board['bo_notice']);
+$wr_password = isset($_POST['wr_password']) ? $_POST['wr_password'] : '';
+$bf_content = isset($_POST['bf_content']) ? (array) $_POST['bf_content'] : array();
+$_POST['html'] = isset($_POST['html']) ? clean_xss_tags($_POST['html'], 1, 1) : '';
+$_POST['secret'] = isset($_POST['secret']) ? clean_xss_tags($_POST['secret'], 1, 1) : '';
+$_POST['mail'] = isset($_POST['mail']) ? clean_xss_tags($_POST['mail'], 1, 1) : '';
 
 if ($w == 'u' || $w == 'r') {
     $wr = get_write($write_table, $wr_id);
@@ -537,14 +543,16 @@ if(isset($_FILES['bf_file']['name']) && is_array($_FILES['bf_file']['name'])) {
             if ($w == 'u') {
                 // 존재하는 파일이 있다면 삭제합니다.
                 $row = sql_fetch(" select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_no = '$i' ");
-
-                $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row['bf_file']), $row);
-                if( file_exists($delete_file) ){
-                    @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
-                }
-                // 이미지파일이면 썸네일삭제
-                if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['bf_file'])) {
-                    delete_board_thumbnail($bo_table, $row['bf_file']);
+                
+                if(isset($row['bf_file']) && $row['bf_file']){
+                    $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row['bf_file']), $row);
+                    if( file_exists($delete_file) ){
+                        @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
+                    }
+                    // 이미지파일이면 썸네일삭제
+                    if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['bf_file'])) {
+                        delete_board_thumbnail($bo_table, $row['bf_file']);
+                    }
                 }
             }
 
@@ -578,9 +586,11 @@ if(isset($_FILES['bf_file']['name']) && is_array($_FILES['bf_file']['name'])) {
 // 나중에 테이블에 저장하는 이유는 $wr_id 값을 저장해야 하기 때문입니다.
 for ($i=0; $i<count($upload); $i++)
 {
-    if (!get_magic_quotes_gpc()) {
-        $upload[$i]['source'] = addslashes($upload[$i]['source']);
-    }
+    $upload[$i]['source'] = sql_real_escape_string($upload[$i]['source']);
+    $bf_content[$i] = isset($bf_content[$i]) ? sql_real_escape_string($bf_content[$i]) : '';
+    $bf_width = isset($upload[$i]['image'][0]) ? (int) $upload[$i]['image'][0] : 0;
+    $bf_height = isset($upload[$i]['image'][1]) ? (int) $upload[$i]['image'][1] : 0;
+    $bf_type = isset($upload[$i]['image'][2]) ? (int) $upload[$i]['image'][2] : 0;
 
     $row = sql_fetch(" select count(*) as cnt from {$g5['board_file_table']} where bo_table = '{$bo_table}' and wr_id = '{$wr_id}' and bf_no = '{$i}' ");
     if ($row['cnt'])
@@ -597,9 +607,9 @@ for ($i=0; $i<count($upload); $i++)
                              bf_thumburl = '{$upload[$i]['thumburl']}',
                              bf_storage = '{$upload[$i]['storage']}',
                              bf_filesize = '".(int)$upload[$i]['filesize']."',
-                             bf_width = '".(int)$upload[$i]['image'][0]."',
-                             bf_height = '".(int)$upload[$i]['image'][1]."',
-                             bf_type = '".(int)$upload[$i]['image'][2]."',
+                             bf_width = '".$bf_width."',
+                             bf_height = '".$bf_height."',
+                             bf_type = '".$bf_type."',
                              bf_datetime = '".G5_TIME_YMDHIS."'
                       where bo_table = '{$bo_table}'
                                 and wr_id = '{$wr_id}'
@@ -630,9 +640,9 @@ for ($i=0; $i<count($upload); $i++)
                          bf_storage = '{$upload[$i]['storage']}',
                          bf_download = 0,
                          bf_filesize = '".(int)$upload[$i]['filesize']."',
-                         bf_width = '".(int)$upload[$i]['image'][0]."',
-                         bf_height = '".(int)$upload[$i]['image'][1]."',
-                         bf_type = '".(int)$upload[$i]['image'][2]."',
+                         bf_width = '".$bf_width."',
+                         bf_height = '".$bf_height."',
+                         bf_type = '".$bf_type."',
                          bf_datetime = '".G5_TIME_YMDHIS."' ";
         sql_query($sql);
 
@@ -740,5 +750,4 @@ run_event('write_update_after', $board, $wr_id, $w, $qstr, $redirect_url);
 if ($file_upload_msg)
     alert($file_upload_msg, $redirect_url);
 else
-    goto_url($redirect_url);
-?>
+    goto_url($redirect_url);
\ No newline at end of file
diff --git a/common.php b/common.php
index fc22fb036..0e35dd7b1 100644
--- a/common.php
+++ b/common.php
@@ -57,6 +57,10 @@ include_once($g5_path['path'].'/config.php');   // 설정 파일
 
 unset($g5_path);
 
+// IIS 에서 SERVER_ADDR 서버변수가 없다면
+if(! isset($_SERVER['SERVER_ADDR'])) {
+    $_SERVER['SERVER_ADDR'] = isset($_SERVER['LOCAL_ADDR']) ? $_SERVER['LOCAL_ADDR'] : '';
+}
 
 // multi-dimensional array에 사용자지정 함수적용
 function array_map_deep($fn, $array)
@@ -98,7 +102,7 @@ function sql_escape_string($str)
 // SQL Injection 등으로 부터 보호를 위해 sql_escape_string() 적용
 //------------------------------------------------------------------------------
 // magic_quotes_gpc 에 의한 backslashes 제거
-if (get_magic_quotes_gpc()) {
+if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
     $_POST    = array_map_deep('stripslashes',  $_POST);
     $_GET     = array_map_deep('stripslashes',  $_GET);
     $_COOKIE  = array_map_deep('stripslashes',  $_COOKIE);
@@ -123,10 +127,11 @@ $_REQUEST = array_map_deep(G5_ESCAPE_FUNCTION,  $_REQUEST);
 // 완두콩님이 알려주신 보안관련 오류 수정
 // $member 에 값을 직접 넘길 수 있음
 $config = array();
-$member = array();
-$board  = array();
-$group  = array();
+$member = array('mb_id'=>'', 'mb_level'=> 1, 'mb_name'=> '', 'mb_point'=> 0, 'mb_certify'=>'', 'mb_email'=>'', 'mb_open'=>'', 'mb_homepage'=>'', 'mb_tel'=>'', 'mb_hp'=>'', 'mb_zip1'=>'', 'mb_zip2'=>'', 'mb_addr1'=>'', 'mb_addr2'=>'', 'mb_addr3'=>'', 'mb_addr_jibeon'=>'', 'mb_signature'=>'', 'mb_profile'=>'');
+$board  = array('bo_table'=>'', 'bo_skin'=>'', 'bo_mobile_skin'=>'', 'bo_upload_count' => 0, 'bo_use_dhtml_editor'=>'', 'bo_subject'=>'', 'bo_image_width'=>0);
+$group  = array('gr_device'=>'', 'gr_subject'=>'');
 $g5     = array();
+if( version_compare( phpversion(), '8.0.0', '>=' ) ) { $g5 = array('title'=>''); }
 $qaconfig = array();
 $g5_debug = array('php'=>array(),'sql'=>array());
 
@@ -353,7 +358,7 @@ if (isset($_REQUEST['wr_id'])) {
     $wr_id = 0;
 }
 
-if (isset($_REQUEST['bo_table'])) {
+if (isset($_REQUEST['bo_table']) && ! is_array($_REQUEST['bo_table'])) {
     $bo_table = preg_replace('/[^a-z0-9_]/i', '', trim($_REQUEST['bo_table']));
     $bo_table = substr($bo_table, 0, 20);
 } else {
@@ -384,7 +389,7 @@ if (isset($_REQUEST['gr_id'])) {
 
 
 // 자동로그인 부분에서 첫로그인에 포인트 부여하던것을 로그인중일때로 변경하면서 코드도 대폭 수정하였습니다.
-if ($_SESSION['ss_mb_id']) { // 로그인중이라면
+if (isset($_SESSION['ss_mb_id']) && $_SESSION['ss_mb_id']) { // 로그인중이라면
     $member = get_member($_SESSION['ss_mb_id']);
 
     // 차단된 회원이면 ss_mb_id 초기화
@@ -410,7 +415,7 @@ if ($_SESSION['ss_mb_id']) { // 로그인중이라면
 
         $tmp_mb_id = substr(preg_replace("/[^a-zA-Z0-9_]*/", "", $tmp_mb_id), 0, 20);
         // 최고관리자는 자동로그인 금지
-        if (strtolower($tmp_mb_id) != strtolower($config['cf_admin'])) {
+        if (strtolower($tmp_mb_id) !== strtolower($config['cf_admin'])) {
             $sql = " select mb_password, mb_intercept_date, mb_leave_date, mb_email_certify from {$g5['member_table']} where mb_id = '{$tmp_mb_id}' ";
             $row = sql_fetch($sql);
             if($row['mb_password']){
@@ -440,10 +445,10 @@ if ($_SESSION['ss_mb_id']) { // 로그인중이라면
 
 
 $write = array();
-$write_table = "";
+$write_table = '';
 if ($bo_table) {
     $board = get_board_db($bo_table, true);
-    if ($board['bo_table']) {
+    if (isset($board['bo_table']) && $board['bo_table']) {
         set_cookie("ck_bo_table", $board['bo_table'], 86400 * 1);
         $gr_id = $board['gr_id'];
         $write_table = $g5['write_prefix'] . $bo_table; // 게시판 테이블 전체이름
@@ -477,7 +482,7 @@ if ($config['cf_editor']) {
 // 회원, 비회원 구분
 $is_member = $is_guest = false;
 $is_admin = '';
-if ($member['mb_id']) {
+if (isset($member['mb_id']) && $member['mb_id']) {
     $is_member = true;
     $is_admin = is_admin($member['mb_id']);
     $member['mb_dir'] = substr($member['mb_id'],0,2);
@@ -530,7 +535,7 @@ if ($is_admin != 'super') {
 
 // 테마경로
 if(defined('_THEME_PREVIEW_') && _THEME_PREVIEW_ === true)
-    $config['cf_theme'] = trim($_GET['theme']);
+    $config['cf_theme'] = isset($_GET['theme']) ? trim($_GET['theme']) : '';
 
 if(isset($config['cf_theme']) && trim($config['cf_theme'])) {
     $theme_path = G5_PATH.'/'.G5_THEME_DIR.'/'.$config['cf_theme'];
@@ -600,9 +605,9 @@ if(defined('G5_SET_DEVICE') && $set_device) {
 // G5_MOBILE_AGENT : config.php 에서 선언
 //------------------------------------------------------------------------------
 if (G5_USE_MOBILE && $set_device) {
-    if ($_REQUEST['device']=='pc')
+    if (isset($_REQUEST['device']) && $_REQUEST['device']=='pc')
         $is_mobile = false;
-    else if ($_REQUEST['device']=='mobile')
+    else if (isset($_REQUEST['device']) && $_REQUEST['device']=='mobile')
         $is_mobile = true;
     else if (isset($_SESSION['ss_is_mobile']))
         $is_mobile = $_SESSION['ss_is_mobile'];
@@ -616,7 +621,7 @@ $_SESSION['ss_is_mobile'] = $is_mobile;
 define('G5_IS_MOBILE', $is_mobile);
 define('G5_DEVICE_BUTTON_DISPLAY', $set_device);
 if (G5_IS_MOBILE) {
-    $g5['mobile_path'] = G5_PATH.'/'.$g5['mobile_dir'];
+    $g5['mobile_path'] = G5_PATH.'/'.G5_MOBILE_DIR;
 }
 //==============================================================================
 
@@ -694,5 +699,4 @@ header('Pragma: no-cache'); // HTTP/1.0
 
 run_event('common_header');
 
-$html_process = new html_process();
-?>
+$html_process = new html_process();
\ No newline at end of file
diff --git a/config.php b/config.php
index acc666055..95a9bc288 100644
--- a/config.php
+++ b/config.php
@@ -5,13 +5,13 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.3');
+define('G5_GNUBOARD_VER', '5.4.5.2');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
 
 // 기본 시간대 설정
-date_default_timezone_set("Asia/Seoul"); 
+date_default_timezone_set("Asia/Seoul");
 
 /********************
     경로 상수
@@ -231,5 +231,4 @@ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') {   //https 통신일때
     define('G5_POSTCODE_JS', '<script src="https://spi.maps.daum.net/imap/map_js_init/postcode.v2.js"></script>');
 } else {  //http 통신일때 daum 주소 js
     define('G5_POSTCODE_JS', '<script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script>');
-}
-?>
+}
\ No newline at end of file
diff --git a/css/default.css b/css/default.css
index 98f21daaa..d70724799 100644
--- a/css/default.css
+++ b/css/default.css
@@ -80,7 +80,7 @@ border:1px solid #558ab7 !important;
 
 #logo {float:left;padding:30px 0 0}
 
-.hd_sch_wr {float:left;padding:30px 0;;width:445px;margin-left:65px}
+.hd_sch_wr {float:left;padding:30px 0;width:445px;margin-left:65px}
 #hd_sch h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #hd_sch {border-radius:30px;overflow:hidden}
 #hd_sch #sch_stx {float:left;width:385px;height:45px;padding-left:10px;border-radius:30px 0 0 30px;background:#2c2c2c;border:0;border-right:0;font-size:1.25em;color:#fff}
diff --git a/extend/debugbar.extend.php b/extend/debugbar.extend.php
index 757b9e16e..e1a51637a 100644
--- a/extend/debugbar.extend.php
+++ b/extend/debugbar.extend.php
@@ -14,8 +14,7 @@ function show_debug_bar() {
     }
 
     $memory_usage = function_exists( 'memory_get_peak_usage' ) ? memory_get_peak_usage() : memory_get_usage();
-    $php_run_time = get_microtime()-$g5_debug['php']['begin_time'];
+    $php_run_time = (isset($g5_debug['php']) && isset($g5_debug['php']['begin_time'])) ? ( get_microtime() - $g5_debug['php']['begin_time'] ) : 0;
 
     include_once( G5_PLUGIN_PATH.'/debugbar/debugbar.php' );
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/extend/default.config.php b/extend/default.config.php
index 4a134a7a8..0df67714a 100644
--- a/extend/default.config.php
+++ b/extend/default.config.php
@@ -4,6 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // 유저 사이드뷰에서 아이콘 지정 안했을시 기본 no 프로필 이미지
 define('G5_NO_PROFILE_IMG', '<span class="profile_img"><img src="'.G5_IMG_URL.'/no_profile.gif" alt="no_profile" width="'.$config['cf_member_icon_width'].'" height="'.$config['cf_member_icon_height'].'"></span>');
 
+define('G5_USE_MEMBER_IMAGE_FILETIME', TRUE);
+
 // 썸네일 처리 방식, 비율유지 하지 않고 썸네일을 생성하려면 주석을 풀고 값은 false 입력합니다. ( true 또는 주석으로 된 경우에는 비율 유지합니다. )
-//define('G5_USE_THUMB_RATIO', false);
-?>
\ No newline at end of file
+//define('G5_USE_THUMB_RATIO', false);
\ No newline at end of file
diff --git a/extend/g5_54version_update.extend.php b/extend/g5_54version_update.extend.php
index e90d9fa0e..b3188ac77 100644
--- a/extend/g5_54version_update.extend.php
+++ b/extend/g5_54version_update.extend.php
@@ -66,5 +66,4 @@ function g54_user_memo_insert($kind, $unkind, $page=1){
         sql_query($sql);
     }
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/extend/smarteditor_upload_extend.php b/extend/smarteditor_upload_extend.php
index 80a3203e9..1f0a28421 100644
--- a/extend/smarteditor_upload_extend.php
+++ b/extend/smarteditor_upload_extend.php
@@ -7,5 +7,4 @@ define('SMARTEDITOR_UPLOAD_RESIZE', 0);  // 스마트에디터 업로드 이미
 define('SMARTEDITOR_UPLOAD_MAX_WIDTH', 1200);  // 스마트에디터 업로드 이미지 리사이즈 제한 width
 define('SMARTEDITOR_UPLOAD_MAX_HEIGHT', 2800);  // 스마트에디터 업로드 이미지 리사이즈 제한 height
 define('SMARTEDITOR_UPLOAD_SIZE_LIMIT', 20);  // 스마트에디터 업로드 사이즈 제한 ( 기본 20MB )
-define('SMARTEDITOR_UPLOAD_IMAGE_QUALITY', 98);  // 썸네일 이미지 JPG, PNG 압축률
-?>
\ No newline at end of file
+define('SMARTEDITOR_UPLOAD_IMAGE_QUALITY', 98);  // 썸네일 이미지 JPG, PNG 압축률;
\ No newline at end of file
diff --git a/extend/sms5.extend.php b/extend/sms5.extend.php
index cae7e38a3..3c0212d42 100644
--- a/extend/sms5.extend.php
+++ b/extend/sms5.extend.php
@@ -29,7 +29,7 @@ $g5['sms5_book_group_table']      = $g5['sms5_prefix'] . 'book_group';
 $g5['sms5_form_table']            = $g5['sms5_prefix'] . 'form';
 $g5['sms5_form_group_table']      = $g5['sms5_prefix'] . 'form_group';
 
-$sms5 = array();
+$sms5 = array('cf_skin'=>'', 'cf_datetime'=>'', 'cf_phone'=>'');
 
 if (!empty($config['cf_sms_use'])) {
 
@@ -44,5 +44,4 @@ if (!empty($config['cf_sms_use'])) {
         // 아이코드에 실제로 보내지 않고 가상(Random)으로 전송결과를 저장합니다.
         $g5['sms5_demo_send'] = true;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/extend/social_login.extend.php b/extend/social_login.extend.php
index fd851f6b4..8b8872b22 100644
--- a/extend/social_login.extend.php
+++ b/extend/social_login.extend.php
@@ -44,5 +44,4 @@ define('G5_SOCIAL_CERTIFY_MAIL', false);
 // 소셜 DEBUG 관련 설정, 기본값은 false, true 로 설정시 data/tmp/social_anystring.log 파일이 생성됩니다.
 define('G5_SOCIAL_IS_DEBUG', false);
 
-include_once(G5_SOCIAL_LOGIN_PATH.'/includes/functions.php');
-?>
\ No newline at end of file
+include_once(G5_SOCIAL_LOGIN_PATH.'/includes/functions.php');
\ No newline at end of file
diff --git a/extend/user.config.php b/extend/user.config.php
index b7dbae41b..106b2a847 100644
--- a/extend/user.config.php
+++ b/extend/user.config.php
@@ -1,3 +1,2 @@
 <?php
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-?>
\ No newline at end of file
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가;
\ No newline at end of file
diff --git a/extend/version.extend.php b/extend/version.extend.php
index 1d8089d83..f8837d05d 100644
--- a/extend/version.extend.php
+++ b/extend/version.extend.php
@@ -2,5 +2,4 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 define('G5_JS_VER',  '191202');
-define('G5_CSS_VER', '191202');
-?>
\ No newline at end of file
+define('G5_CSS_VER', '191202');
\ No newline at end of file
diff --git a/g4_import.php b/g4_import.php
index 86a8745bd..0bb6c23bd 100644
--- a/g4_import.php
+++ b/g4_import.php
@@ -58,5 +58,4 @@ function fimport_submit(f)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.php');
\ No newline at end of file
diff --git a/g4_import_run.php b/g4_import_run.php
index a0515bbaa..2c25383f2 100644
--- a/g4_import_run.php
+++ b/g4_import_run.php
@@ -22,7 +22,7 @@ if(get_session('tables_copied') == 'done')
 if($is_admin != 'super')
     alert('최고관리자로 로그인 후 실행해 주십시오.', G5_URL);
 
-$g4_config_file = trim($_POST['file_path']);
+$g4_config_file = isset($_POST['file_path']) ? trim($_POST['file_path']) : '';
 
 if(!$g4_config_file)
     alert('config.php 파일의 경로를 입력해 주십시오.');
@@ -90,7 +90,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     // 중복체크
     $sql2 = " select count(*) as cnt from {$g5['member_table']} where mb_id = '{$row['mb_id']}' ";
     $row2 = sql_fetch($sql2);
-    if($row2['cnt'])
+    if(isset($row2['cnt']) && $row2['cnt'])
         continue;
 
     $comma = '';
@@ -148,7 +148,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     // 중복체크
     $sql2 = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$row['lo_ip']}' ";
     $row2 = sql_fetch($sql2);
-    if($row2['cnt'])
+    if(isset($row2['cnt']) && $row2['cnt'])
         continue;
 
     $comma = '';
@@ -240,7 +240,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     // 중복체크
     $sql2 = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$row['gr_id']}' ";
     $row2 = sql_fetch($sql2);
-    if($row2['cnt'])
+    if(isset($row2['cnt']) && $row2['cnt'])
         continue;
 
     $comma = '';
@@ -274,7 +274,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     // 중복체크
     $sql2 = " select count(*) as cnt from {$g5['board_table']} where bo_table = '{$row['bo_table']}' ";
     $row2 = sql_fetch($sql2);
-    if($row2['cnt'])
+    if(isset($row2['cnt']) && $row2['cnt'])
         continue;
 
     $comma = '';
@@ -434,5 +434,4 @@ set_session('tables_copied', 'done');
 </div>
 
 <?php
-include_once(G5_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.php');
\ No newline at end of file
diff --git a/head.php b/head.php
index 894187c5b..7dc273c1e 100644
--- a/head.php
+++ b/head.php
@@ -208,4 +208,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
     <div id="container_wr">
    
     <div id="container">
-        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php } ?>
+        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php }
\ No newline at end of file
diff --git a/head.sub.php b/head.sub.php
index 0f6db3c01..504f663e7 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -15,8 +15,8 @@ if (!isset($g5['title'])) {
     $g5_head_title = $g5['title'];
 }
 else {
-    $g5_head_title = $g5['title']; // 상태바에 표시될 제목
-    $g5_head_title .= " | ".$config['cf_title'];
+    // 상태바에 표시될 제목
+    $g5_head_title = implode(' | ', array_filter(array($g5['title'], $config['cf_title'])));
 }
 
 $g5['title'] = strip_tags($g5['title']);
@@ -107,5 +107,4 @@ if ($is_member) { // 회원이라면 로그인 중이라는 메세지를 출력
 
     echo '<div id="hd_login_msg">'.$sr_admin_msg.get_text($member['mb_nick']).'님 로그인 중 ';
     echo '<a href="'.G5_BBS_URL.'/logout.php">로그아웃</a></div>';
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/index.php b/index.php
index 6eb147847..653c0bc69 100644
--- a/index.php
+++ b/index.php
@@ -70,5 +70,4 @@ include_once(G5_PATH.'/head.php');
     <!-- } 최신글 끝 -->
 </div>
 <?php
-include_once(G5_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.php');
\ No newline at end of file
diff --git a/install/ajax.install.check.php b/install/ajax.install.check.php
index bdfaaab2a..a754bee72 100644
--- a/install/ajax.install.check.php
+++ b/install/ajax.install.check.php
@@ -15,20 +15,20 @@ if (file_exists($dbconfig_file)) {
     die(install_json_msg('프로그램이 이미 설치되어 있습니다.'));
 }
 
-if (preg_match("/[^0-9a-z_]+/i", $_POST['table_prefix']) ) {
+if (isset($_POST['table_prefix']) && preg_match("/[^0-9a-z_]+/i", $_POST['table_prefix']) ) {
     die(install_json_msg('TABLE명 접두사는 영문자, 숫자, _ 만 입력하세요.'));
 }
 
-$mysql_host  = safe_install_string_check($_POST['mysql_host'], 'json');
-$mysql_user  = safe_install_string_check($_POST['mysql_user'], 'json');
-$mysql_pass  = safe_install_string_check($_POST['mysql_pass'], 'json');
-$mysql_db    = safe_install_string_check($_POST['mysql_db'], 'json');
-$table_prefix= safe_install_string_check(preg_replace('/[^a-zA-Z0-9_]/', '_', $_POST['table_prefix']));
+$mysql_host  = isset($_POST['mysql_host']) ? safe_install_string_check($_POST['mysql_host'], 'json') : '';
+$mysql_user  = isset($_POST['mysql_user']) ? safe_install_string_check($_POST['mysql_user'], 'json') : '';
+$mysql_pass  = isset($_POST['mysql_pass']) ? safe_install_string_check($_POST['mysql_pass'], 'json') : '';
+$mysql_db    = isset($_POST['mysql_db']) ? safe_install_string_check($_POST['mysql_db'], 'json') : '';
+$table_prefix= isset($_POST['table_prefix']) ? safe_install_string_check(preg_replace('/[^a-zA-Z0-9_]/', '_', $_POST['table_prefix'])) : '';
 
 $tmp_str = isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '';
 $ajax_token = md5($tmp_str.$_SERVER['REMOTE_ADDR'].dirname(dirname(__FILE__).'/'));
 
-$bool_ajax_token = ($ajax_token == $_POST['ajax_token']) ? true : false;
+$bool_ajax_token = (isset($_POST['ajax_token']) && ($ajax_token == $_POST['ajax_token'])) ? true : false;
 
 if( !($mysql_host && $mysql_user && $mysql_pass && $mysql_db && $table_prefix && $bool_ajax_token) ){
     die(install_json_msg('잘못된 요청입니다.'));
@@ -56,5 +56,4 @@ if(sql_query("DESCRIBE `{$table_prefix}config`", G5_DISPLAY_SQL_ERROR, $dblink))
     die(install_json_msg('주의! 이미 테이블이 존재하므로, 기존 DB 자료가 망실됩니다. 계속 진행하겠습니까?', 'exists'));
 }
 
-die(install_json_msg('ok', 'success'));
-?>
\ No newline at end of file
+die(install_json_msg('ok', 'success'));
\ No newline at end of file
diff --git a/install/index.php b/install/index.php
index 990b5938a..809079367 100644
--- a/install/index.php
+++ b/install/index.php
@@ -50,5 +50,4 @@ function frm_submit(f)
 ?>
 
 <?php
-include_once ('./install.inc2.php');
-?>
+include_once ('./install.inc2.php');
\ No newline at end of file
diff --git a/install/install.function.php b/install/install.function.php
index 4739e9bc4..775d8b6a7 100644
--- a/install/install.function.php
+++ b/install/install.function.php
@@ -1,6 +1,26 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
+if( ! function_exists('array_map_deep') ){
+    // multi-dimensional array에 사용자지정 함수적용
+    function array_map_deep($fn, $array)
+    {
+        if(is_array($array)) {
+            foreach($array as $key => $value) {
+                if(is_array($value)) {
+                    $array[$key] = array_map_deep($fn, $value);
+                } else {
+                    $array[$key] = call_user_func($fn, $value);
+                }
+            }
+        } else {
+            $array = call_user_func($fn, $array);
+        }
+
+        return $array;
+    }
+}
+
 if( ! function_exists('safe_install_string_check') ){
     function safe_install_string_check( $str, $is_json=false ) {
         $is_check = false;
@@ -23,7 +43,7 @@ if( ! function_exists('safe_install_string_check') ){
             die($msg);
         }
 
-        return $str;
+        return array_map_deep('stripslashes', $str);
     }
 }
 
@@ -36,5 +56,4 @@ if( ! function_exists('install_json_msg') ){
 
         return json_encode(array('error'=>$error_msg, 'success'=>$success_msg, 'exists'=>$exists_msg));
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/install/install.inc.php b/install/install.inc.php
index 13977884d..1b1cdcc42 100644
--- a/install/install.inc.php
+++ b/install/install.inc.php
@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 $data_path = '../'.G5_DATA_DIR;
 
-if (!$title) $title = G5_VERSION." 설치";
+if (! (isset($title) && $title)) $title = G5_VERSION." 설치";
 ?>
 <!doctype html>
 <html lang="ko">
@@ -92,5 +92,4 @@ if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
             $write_data_dir = false;
         }
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/install/install_config.php b/install/install_config.php
index 43e3abbeb..3a3a81a27 100644
--- a/install/install_config.php
+++ b/install/install_config.php
@@ -202,5 +202,4 @@ function frm_install_submit(f)
 </script>
 
 <?php
-include_once ('./install.inc2.php');
-?>
\ No newline at end of file
+include_once ('./install.inc2.php');
\ No newline at end of file
diff --git a/install/install_db.php b/install/install_db.php
index bd2a66acf..371c57822 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -23,15 +23,15 @@ include_once ('./install.inc.php');
 
 //print_r($_POST); exit;
 
-$mysql_host  = safe_install_string_check($_POST['mysql_host']);
-$mysql_user  = safe_install_string_check($_POST['mysql_user']);
-$mysql_pass  = safe_install_string_check($_POST['mysql_pass']);
-$mysql_db    = safe_install_string_check($_POST['mysql_db']);
-$table_prefix= safe_install_string_check($_POST['table_prefix']);
-$admin_id    = $_POST['admin_id'];
-$admin_pass  = $_POST['admin_pass'];
-$admin_name  = $_POST['admin_name'];
-$admin_email = $_POST['admin_email'];
+$mysql_host  = isset($_POST['mysql_host']) ? safe_install_string_check($_POST['mysql_host']) : '';
+$mysql_user  = isset($_POST['mysql_user']) ? safe_install_string_check($_POST['mysql_user']) : '';
+$mysql_pass  = isset($_POST['mysql_pass']) ? safe_install_string_check($_POST['mysql_pass']) : '';
+$mysql_db    = isset($_POST['mysql_db']) ? safe_install_string_check($_POST['mysql_db']) : '';
+$table_prefix= isset($_POST['table_prefix']) ? safe_install_string_check($_POST['table_prefix']) : '';
+$admin_id    = isset($_POST['admin_id']) ? $_POST['admin_id'] : '';
+$admin_pass  = isset($_POST['admin_pass']) ? $_POST['admin_pass'] : '';
+$admin_name  = isset($_POST['admin_name']) ? $_POST['admin_name'] : '';
+$admin_email = isset($_POST['admin_email']) ? $_POST['admin_email'] : '';
 
 if (preg_match("/[^0-9a-z_]+/i", $table_prefix) ) {
     die('<div class="ins_inner"><p>TABLE명 접두사는 영문자, 숫자, _ 만 입력하세요.</p><div class="inner_btn"><a href="./install_config.php">뒤로가기</a></div></div>');
@@ -55,6 +55,7 @@ if (!$dblink) {
     exit;
 }
 
+$g5['connect_db'] = $dblink;
 $select_db = sql_select_db($mysql_db, $dblink);
 if (!$select_db) {
 ?>
@@ -199,6 +200,7 @@ $sql = " insert into `{$table_prefix}member`
                  mb_level = '10',
                  mb_mailling = '1',
                  mb_open = '1',
+                 mb_nick_date = '".G5_TIME_YMDHIS."',
                  mb_email_certify = '".G5_TIME_YMDHIS."',
                  mb_datetime = '".G5_TIME_YMDHIS."',
                  mb_ip = '{$_SERVER['REMOTE_ADDR']}'
@@ -426,5 +428,4 @@ fclose($f);
 </div>
 
 <?php
-include_once ('./install.inc2.php');
-?>
\ No newline at end of file
+include_once ('./install.inc2.php');
\ No newline at end of file
diff --git a/install/library.check.php b/install/library.check.php
index c01d9643e..1adebf557 100644
--- a/install/library.check.php
+++ b/install/library.check.php
@@ -5,5 +5,4 @@ if(!extension_loaded('gd') || !function_exists('gd_info')) {
     echo '<script>'.PHP_EOL;
     echo 'alert("'.G5_VERSION.'의 정상적인 사용을 위해서는 GD 라이브러리가 필요합니다.\nGD 라이브러리가 없을 경우 자동등록방지 문자와 썸네일 기능이 작동하지 않습니다.");'.PHP_EOL;
     echo '</script>'.PHP_EOL;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/js/certify.js b/js/certify.js
index bcf4f9ed8..214c50561 100644
--- a/js/certify.js
+++ b/js/certify.js
@@ -18,13 +18,13 @@ function certify_win_open(type, url, event)
     }
     else if(type == 'kcp-hp')
     {
-        if($("input[name=veri_up_hash]").size() < 1)
+        if($("input[name=veri_up_hash]").length < 1)
                 $("input[name=cert_no]").after('<input type="hidden" name="veri_up_hash" value="">');
 
         if( navigator.userAgent.indexOf("Android") > - 1 || navigator.userAgent.indexOf("iPhone") > - 1 )
         {
             var $frm = $(event.target.form);
-            if($("#kcp_cert").size() < 1) {
+            if($("#kcp_cert").length < 1) {
                 $frm.wrap('<div id="cert_info"></div>');
 
                 $("#cert_info").append('<form name="form_temp" method="post">');
@@ -66,7 +66,7 @@ function certify_win_open(type, url, event)
             var $frm = $(event.target.form),
                 lgu_cert = "lgu_cert";
 
-            if($("#lgu_cert").size() < 1) {
+            if($("#lgu_cert").length < 1) {
                 $frm.wrap('<div id="cert_info"></div>');
 
                 $("#cert_info").append('<form name="form_temp" method="post">');
diff --git a/js/jquery.fancylist.js b/js/jquery.fancylist.js
index 242a39733..1fbfb29c5 100644
--- a/js/jquery.fancylist.js
+++ b/js/jquery.fancylist.js
@@ -18,7 +18,7 @@
         var $element = this.find(cfg.element);
         var $this = this;
 
-        if($element.size() < 1)
+        if($element.length < 1)
             return;
 
         function item_arrange()
diff --git a/js/jquery.menu.js b/js/jquery.menu.js
index a05b03de6..87cc26017 100644
--- a/js/jquery.menu.js
+++ b/js/jquery.menu.js
@@ -89,7 +89,7 @@ function menu_rearrange(el)
         $gnb_1dli = $(".gnb_1dli:eq("+i+")");
         w1 = $gnb_1dli.outerWidth();
 
-        if($gnb_1dli.find(".gnb_2dul").size())
+        if($gnb_1dli.find(".gnb_2dul").length)
             w2 = $gnb_1dli.find(".gnb_2dli > a").outerWidth(true);
         else
             w2 = w1;
diff --git a/lib/Cache/FileCache.class.php b/lib/Cache/FileCache.class.php
index e220f6282..ccfe4aa59 100644
--- a/lib/Cache/FileCache.class.php
+++ b/lib/Cache/FileCache.class.php
@@ -199,5 +199,4 @@ class FileCache
     {
         return unserialize(base64_decode($data));
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/Cache/obj.class.php b/lib/Cache/obj.class.php
index b82ee39f9..b75cf0980 100644
--- a/lib/Cache/obj.class.php
+++ b/lib/Cache/obj.class.php
@@ -87,6 +87,4 @@ Class G5_object_cache {
         return true;
     }
 
-}   //end Class
-
-?>
\ No newline at end of file
+}   //end Class;
\ No newline at end of file
diff --git a/lib/Excel/oleread.inc.php b/lib/Excel/oleread.inc.php
index c7241aa86..c169b6025 100644
--- a/lib/Excel/oleread.inc.php
+++ b/lib/Excel/oleread.inc.php
@@ -267,5 +267,4 @@ class OLERead {
     	}
     }
     
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_biffwriter.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_biffwriter.inc.php
index 04f90fbbc..93bdefd48 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_biffwriter.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_biffwriter.inc.php
@@ -204,6 +204,4 @@ class writeexcel_biffwriter {
         return $tmp;
     }
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_format.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_format.inc.php
index 15435c049..b24f4223f 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_format.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_format.inc.php
@@ -690,6 +690,4 @@ class writeexcel_format {
         $this->_right_color=$this->_get_color($color);
     }
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_formula.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_formula.inc.php
index 7a04fd63a..b1a321f50 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_formula.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_formula.inc.php
@@ -153,7 +153,7 @@ function parse_formula() {
 
     $this->_formula	 = $formula;
     $this->_current_char = 0;
-    $this->_lookahead    = $this->_formula{1};
+    $this->_lookahead    = $this->_formula[1];
     $this->_advance($formula);
     $parsetree = $this->_condition();
 
@@ -1005,7 +1005,7 @@ function _cellToRowcol($cell)
     $col    = 0;
     for ($i=0; $i < strlen($col_ref); $i++)
  {
-        $col += (ord($col_ref{$i}) - ord('A') + 1) * pow(26, $expn);
+        $col += (ord($col_ref[$i]) - ord('A') + 1) * pow(26, $expn);
         $expn--;
     }
 
@@ -1027,19 +1027,19 @@ function _advance()
     // eat up white spaces
     if ($i < strlen($this->_formula))
  {
-        while ($this->_formula{$i} == " ") {
+        while ($this->_formula[$i] == " ") {
             $i++;
         }
         if ($i < strlen($this->_formula) - 1) {
-            $this->_lookahead = $this->_formula{$i+1};
+            $this->_lookahead = $this->_formula[$i+1];
         }
         $token = "";
     }
     while ($i < strlen($this->_formula))
  {
-        $token .= $this->_formula{$i};
+        $token .= $this->_formula[$i];
         if ($i < strlen($this->_formula) - 1) {
-            $this->_lookahead = $this->_formula{$i+1};
+            $this->_lookahead = $this->_formula[$i+1];
         }
  else {
             $this->_lookahead = '';
@@ -1054,7 +1054,7 @@ function _advance()
             return 1;
         }
         if ($i < strlen($this->_formula) - 2) {
-            $this->_lookahead = $this->_formula{$i+2};
+            $this->_lookahead = $this->_formula[$i+2];
         }
  else {
         // if we run out of characters _lookahead becomes empty
@@ -1195,7 +1195,7 @@ function parse($formula)
  {
     $this->_current_char = 0;
     $this->_formula      = $formula;
-    $this->_lookahead    = $formula{1};
+    $this->_lookahead    = $formula[1];
     $this->_advance();
     $this->_parse_tree   = $this->_condition();
     if ($this->isError($this->_parse_tree)) {
@@ -1604,7 +1604,4 @@ function toReversePolish($tree = array())
     return $polish;
 }
 
-}
-
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_olewriter.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_olewriter.inc.php
index 133a1b501..184149520 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_olewriter.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_olewriter.inc.php
@@ -348,6 +348,4 @@ class writeexcel_olewriter {
         }
     }
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_workbook.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_workbook.inc.php
index 11c7c0e2b..be13fb2d8 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_workbook.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_workbook.inc.php
@@ -1144,6 +1144,4 @@ function _store_codepage() {
     $this->_append($header.$data);
 }
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_workbookbig.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_workbookbig.inc.php
index 3fb2f61d1..d705cb268 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_workbookbig.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_workbookbig.inc.php
@@ -50,6 +50,4 @@ class writeexcel_workbookbig extends writeexcel_workbook {
         $ole->save($this->_filename);
     }
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/php_writeexcel/class.writeexcel_worksheet.inc.php b/lib/Excel/php_writeexcel/class.writeexcel_worksheet.inc.php
index 9860cbf7e..5127cf21c 100644
--- a/lib/Excel/php_writeexcel/class.writeexcel_worksheet.inc.php
+++ b/lib/Excel/php_writeexcel/class.writeexcel_worksheet.inc.php
@@ -2963,6 +2963,4 @@ function insert_bitmap() {
         $this->_append($header . $data);
     }
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/lib/Excel/reader.php b/lib/Excel/reader.php
index 72836d5c0..02cdfc32f 100644
--- a/lib/Excel/reader.php
+++ b/lib/Excel/reader.php
@@ -1079,6 +1079,4 @@ class Spreadsheet_Excel_Reader
  * c-basic-offset: 4
  * c-hanging-comment-ender-p: nil
  * End:
- */
-
-?>
+ */;
\ No newline at end of file
diff --git a/lib/Hook/hook.class.php b/lib/Hook/hook.class.php
index 70452b041..600ab9009 100644
--- a/lib/Hook/hook.class.php
+++ b/lib/Hook/hook.class.php
@@ -322,6 +322,4 @@ class Hook
 
         return array();
     }
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/Hook/hook.extends.class.php b/lib/Hook/hook.extends.class.php
index 47e9e4348..bf5bc03e2 100644
--- a/lib/Hook/hook.extends.class.php
+++ b/lib/Hook/hook.extends.class.php
@@ -130,10 +130,11 @@ Class GML_Hook extends Hook {
 
         if (isset($that->callback_filters[$tag]) && isset($that->callback_filters[$tag][$priority]) ) {
             
-            $found_key = array_search($func, array_column($that->callback_filters[$tag][$priority], 'function'));
-
-            if( $found_key !== false ){
-                unset($that->callback_filters[$tag][$priority][$found_key]);
+            foreach((array) $that->callback_filters[$tag][$priority] as $key=>$value){
+                if(isset($value['function']) && $value['function'] === $func) {
+                    unset($that->callback_filters[$tag][$priority][$key]);
+                    $is_remove = true;
+                }
             }
         }
 
@@ -148,10 +149,11 @@ Class GML_Hook extends Hook {
 
         if (isset($that->callbacks[$tag]) && isset($that->callbacks[$tag][$priority]) ) {
             
-            $found_key = array_search($func, array_column($that->callbacks[$tag][$priority], 'function'));
-
-            if( $found_key !== false ){
-                unset($that->callbacks[$tag][$priority][$found_key]);
+            foreach((array) $that->callbacks[$tag][$priority] as $key=>$value){
+                if(isset($value['function']) && $value['function'] === $func) {
+                    unset($that->callbacks[$tag][$priority][$key]);
+                    $is_remove = true;
+                }
             }
         }
 
@@ -159,6 +161,4 @@ Class GML_Hook extends Hook {
     }
 }
 
-// end  Hook Class
-
-?>
\ No newline at end of file
+// end  Hook Class;
\ No newline at end of file
diff --git a/lib/PHPExcel.php b/lib/PHPExcel.php
new file mode 100644
index 000000000..b8dbe0efd
--- /dev/null
+++ b/lib/PHPExcel.php
@@ -0,0 +1,1153 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel
+{
+    /**
+     * Unique ID
+     *
+     * @var string
+     */
+    private $uniqueID;
+
+    /**
+     * Document properties
+     *
+     * @var PHPExcel_DocumentProperties
+     */
+    private $properties;
+
+    /**
+     * Document security
+     *
+     * @var PHPExcel_DocumentSecurity
+     */
+    private $security;
+
+    /**
+     * Collection of Worksheet objects
+     *
+     * @var PHPExcel_Worksheet[]
+     */
+    private $workSheetCollection = array();
+
+    /**
+     * Calculation Engine
+     *
+     * @var PHPExcel_Calculation
+     */
+    private $calculationEngine;
+
+    /**
+     * Active sheet index
+     *
+     * @var integer
+     */
+    private $activeSheetIndex = 0;
+
+    /**
+     * Named ranges
+     *
+     * @var PHPExcel_NamedRange[]
+     */
+    private $namedRanges = array();
+
+    /**
+     * CellXf supervisor
+     *
+     * @var PHPExcel_Style
+     */
+    private $cellXfSupervisor;
+
+    /**
+     * CellXf collection
+     *
+     * @var PHPExcel_Style[]
+     */
+    private $cellXfCollection = array();
+
+    /**
+     * CellStyleXf collection
+     *
+     * @var PHPExcel_Style[]
+     */
+    private $cellStyleXfCollection = array();
+
+    /**
+    * hasMacros : this workbook have macros ?
+    *
+    * @var bool
+    */
+    private $hasMacros = false;
+
+    /**
+    * macrosCode : all macros code (the vbaProject.bin file, this include form, code,  etc.), null if no macro
+    *
+    * @var binary
+    */
+    private $macrosCode;
+    /**
+    * macrosCertificate : if macros are signed, contains vbaProjectSignature.bin file, null if not signed
+    *
+    * @var binary
+    */
+    private $macrosCertificate;
+
+    /**
+    * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI
+    *
+    * @var null|string
+    */
+    private $ribbonXMLData;
+
+    /**
+    * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements
+    * ignored if $ribbonXMLData is null
+    *
+    * @var null|array
+    */
+    private $ribbonBinObjects;
+
+    /**
+    * The workbook has macros ?
+    *
+    * @return boolean true if workbook has macros, false if not
+    */
+    public function hasMacros()
+    {
+        return $this->hasMacros;
+    }
+
+    /**
+    * Define if a workbook has macros
+    *
+    * @param boolean $hasMacros true|false
+    */
+    public function setHasMacros($hasMacros = false)
+    {
+        $this->hasMacros = (bool) $hasMacros;
+    }
+
+    /**
+    * Set the macros code
+    *
+    * @param string $MacrosCode string|null
+    */
+    public function setMacrosCode($MacrosCode = null)
+    {
+        $this->macrosCode=$MacrosCode;
+        $this->setHasMacros(!is_null($MacrosCode));
+    }
+
+    /**
+    * Return the macros code
+    *
+    * @return string|null
+    */
+    public function getMacrosCode()
+    {
+        return $this->macrosCode;
+    }
+
+    /**
+    * Set the macros certificate
+    *
+    * @param string|null $Certificate
+    */
+    public function setMacrosCertificate($Certificate = null)
+    {
+        $this->macrosCertificate=$Certificate;
+    }
+
+    /**
+    * Is the project signed ?
+    *
+    * @return boolean true|false
+    */
+    public function hasMacrosCertificate()
+    {
+        return !is_null($this->macrosCertificate);
+    }
+
+    /**
+    * Return the macros certificate
+    *
+    * @return string|null
+    */
+    public function getMacrosCertificate()
+    {
+        return $this->macrosCertificate;
+    }
+
+    /**
+    * Remove all macros, certificate from spreadsheet
+    *
+    */
+    public function discardMacros()
+    {
+        $this->hasMacros=false;
+        $this->macrosCode=null;
+        $this->macrosCertificate=null;
+    }
+
+    /**
+    * set ribbon XML data
+    *
+    */
+    public function setRibbonXMLData($Target = null, $XMLData = null)
+    {
+        if (!is_null($Target) && !is_null($XMLData)) {
+            $this->ribbonXMLData = array('target' => $Target, 'data' => $XMLData);
+        } else {
+            $this->ribbonXMLData = null;
+        }
+    }
+
+    /**
+    * retrieve ribbon XML Data
+    *
+    * return string|null|array
+    */
+    public function getRibbonXMLData($What = 'all') //we need some constants here...
+    {
+        $ReturnData = null;
+        $What = strtolower($What);
+        switch ($What){
+            case 'all':
+                $ReturnData = $this->ribbonXMLData;
+                break;
+            case 'target':
+            case 'data':
+                if (is_array($this->ribbonXMLData) && array_key_exists($What, $this->ribbonXMLData)) {
+                    $ReturnData = $this->ribbonXMLData[$What];
+                }
+                break;
+        }
+
+        return $ReturnData;
+    }
+
+    /**
+    * store binaries ribbon objects (pictures)
+    *
+    */
+    public function setRibbonBinObjects($BinObjectsNames = null, $BinObjectsData = null)
+    {
+        if (!is_null($BinObjectsNames) && !is_null($BinObjectsData)) {
+            $this->ribbonBinObjects = array('names' => $BinObjectsNames, 'data' => $BinObjectsData);
+        } else {
+            $this->ribbonBinObjects = null;
+        }
+    }
+    /**
+    * return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function)
+    *
+    */
+    private function getExtensionOnly($ThePath)
+    {
+        return pathinfo($ThePath, PATHINFO_EXTENSION);
+    }
+
+    /**
+    * retrieve Binaries Ribbon Objects
+    *
+    */
+    public function getRibbonBinObjects($What = 'all')
+    {
+        $ReturnData = null;
+        $What = strtolower($What);
+        switch($What) {
+            case 'all':
+                return $this->ribbonBinObjects;
+                break;
+            case 'names':
+            case 'data':
+                if (is_array($this->ribbonBinObjects) && array_key_exists($What, $this->ribbonBinObjects)) {
+                    $ReturnData=$this->ribbonBinObjects[$What];
+                }
+                break;
+            case 'types':
+                if (is_array($this->ribbonBinObjects) &&
+                    array_key_exists('data', $this->ribbonBinObjects) && is_array($this->ribbonBinObjects['data'])) {
+                    $tmpTypes=array_keys($this->ribbonBinObjects['data']);
+                    $ReturnData = array_unique(array_map(array($this, 'getExtensionOnly'), $tmpTypes));
+                } else {
+                    $ReturnData=array(); // the caller want an array... not null if empty
+                }
+                break;
+        }
+        return $ReturnData;
+    }
+
+    /**
+    * This workbook have a custom UI ?
+    *
+    * @return boolean true|false
+    */
+    public function hasRibbon()
+    {
+        return !is_null($this->ribbonXMLData);
+    }
+
+    /**
+    * This workbook have additionnal object for the ribbon ?
+    *
+    * @return boolean true|false
+    */
+    public function hasRibbonBinObjects()
+    {
+        return !is_null($this->ribbonBinObjects);
+    }
+
+    /**
+     * Check if a sheet with a specified code name already exists
+     *
+     * @param string $pSheetCodeName  Name of the worksheet to check
+     * @return boolean
+     */
+    public function sheetCodeNameExists($pSheetCodeName)
+    {
+        return ($this->getSheetByCodeName($pSheetCodeName) !== null);
+    }
+
+    /**
+     * Get sheet by code name. Warning : sheet don't have always a code name !
+     *
+     * @param string $pName Sheet name
+     * @return PHPExcel_Worksheet
+     */
+    public function getSheetByCodeName($pName = '')
+    {
+        $worksheetCount = count($this->workSheetCollection);
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            if ($this->workSheetCollection[$i]->getCodeName() == $pName) {
+                return $this->workSheetCollection[$i];
+            }
+        }
+
+        return null;
+    }
+
+     /**
+     * Create a new PHPExcel with one Worksheet
+     */
+    public function __construct()
+    {
+        $this->uniqueID = uniqid();
+        $this->calculationEngine = new PHPExcel_Calculation($this);
+
+        // Initialise worksheet collection and add one worksheet
+        $this->workSheetCollection = array();
+        $this->workSheetCollection[] = new PHPExcel_Worksheet($this);
+        $this->activeSheetIndex = 0;
+
+        // Create document properties
+        $this->properties = new PHPExcel_DocumentProperties();
+
+        // Create document security
+        $this->security = new PHPExcel_DocumentSecurity();
+
+        // Set named ranges
+        $this->namedRanges = array();
+
+        // Create the cellXf supervisor
+        $this->cellXfSupervisor = new PHPExcel_Style(true);
+        $this->cellXfSupervisor->bindParent($this);
+
+        // Create the default style
+        $this->addCellXf(new PHPExcel_Style);
+        $this->addCellStyleXf(new PHPExcel_Style);
+    }
+
+    /**
+     * Code to execute when this worksheet is unset()
+     *
+     */
+    public function __destruct()
+    {
+        $this->calculationEngine = null;
+        $this->disconnectWorksheets();
+    }
+
+    /**
+     * Disconnect all worksheets from this PHPExcel workbook object,
+     *    typically so that the PHPExcel object can be unset
+     *
+     */
+    public function disconnectWorksheets()
+    {
+        $worksheet = null;
+        foreach ($this->workSheetCollection as $k => &$worksheet) {
+            $worksheet->disconnectCells();
+            $this->workSheetCollection[$k] = null;
+        }
+        unset($worksheet);
+        $this->workSheetCollection = array();
+    }
+
+    /**
+     * Return the calculation engine for this worksheet
+     *
+     * @return PHPExcel_Calculation
+     */
+    public function getCalculationEngine()
+    {
+        return $this->calculationEngine;
+    }    //    function getCellCacheController()
+
+    /**
+     * Get properties
+     *
+     * @return PHPExcel_DocumentProperties
+     */
+    public function getProperties()
+    {
+        return $this->properties;
+    }
+
+    /**
+     * Set properties
+     *
+     * @param PHPExcel_DocumentProperties    $pValue
+     */
+    public function setProperties(PHPExcel_DocumentProperties $pValue)
+    {
+        $this->properties = $pValue;
+    }
+
+    /**
+     * Get security
+     *
+     * @return PHPExcel_DocumentSecurity
+     */
+    public function getSecurity()
+    {
+        return $this->security;
+    }
+
+    /**
+     * Set security
+     *
+     * @param PHPExcel_DocumentSecurity    $pValue
+     */
+    public function setSecurity(PHPExcel_DocumentSecurity $pValue)
+    {
+        $this->security = $pValue;
+    }
+
+    /**
+     * Get active sheet
+     *
+     * @return PHPExcel_Worksheet
+     *
+     * @throws PHPExcel_Exception
+     */
+    public function getActiveSheet()
+    {
+        return $this->getSheet($this->activeSheetIndex);
+    }
+
+    /**
+     * Create sheet and add it to this workbook
+     *
+     * @param  int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
+     * @return PHPExcel_Worksheet
+     * @throws PHPExcel_Exception
+     */
+    public function createSheet($iSheetIndex = null)
+    {
+        $newSheet = new PHPExcel_Worksheet($this);
+        $this->addSheet($newSheet, $iSheetIndex);
+        return $newSheet;
+    }
+
+    /**
+     * Check if a sheet with a specified name already exists
+     *
+     * @param  string $pSheetName  Name of the worksheet to check
+     * @return boolean
+     */
+    public function sheetNameExists($pSheetName)
+    {
+        return ($this->getSheetByName($pSheetName) !== null);
+    }
+
+    /**
+     * Add sheet
+     *
+     * @param  PHPExcel_Worksheet $pSheet
+     * @param  int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
+     * @return PHPExcel_Worksheet
+     * @throws PHPExcel_Exception
+     */
+    public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = null)
+    {
+        if ($this->sheetNameExists($pSheet->getTitle())) {
+            throw new PHPExcel_Exception(
+                "Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first."
+            );
+        }
+
+        if ($iSheetIndex === null) {
+            if ($this->activeSheetIndex < 0) {
+                $this->activeSheetIndex = 0;
+            }
+            $this->workSheetCollection[] = $pSheet;
+        } else {
+            // Insert the sheet at the requested index
+            array_splice(
+                $this->workSheetCollection,
+                $iSheetIndex,
+                0,
+                array($pSheet)
+            );
+
+            // Adjust active sheet index if necessary
+            if ($this->activeSheetIndex >= $iSheetIndex) {
+                ++$this->activeSheetIndex;
+            }
+        }
+
+        if ($pSheet->getParent() === null) {
+            $pSheet->rebindParent($this);
+        }
+
+        return $pSheet;
+    }
+
+    /**
+     * Remove sheet by index
+     *
+     * @param  int $pIndex Active sheet index
+     * @throws PHPExcel_Exception
+     */
+    public function removeSheetByIndex($pIndex = 0)
+    {
+
+        $numSheets = count($this->workSheetCollection);
+        if ($pIndex > $numSheets - 1) {
+            throw new PHPExcel_Exception(
+                "You tried to remove a sheet by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
+            );
+        } else {
+            array_splice($this->workSheetCollection, $pIndex, 1);
+        }
+        // Adjust active sheet index if necessary
+        if (($this->activeSheetIndex >= $pIndex) &&
+            ($pIndex > count($this->workSheetCollection) - 1)) {
+            --$this->activeSheetIndex;
+        }
+
+    }
+
+    /**
+     * Get sheet by index
+     *
+     * @param  int $pIndex Sheet index
+     * @return PHPExcel_Worksheet
+     * @throws PHPExcel_Exception
+     */
+    public function getSheet($pIndex = 0)
+    {
+        if (!isset($this->workSheetCollection[$pIndex])) {
+            $numSheets = $this->getSheetCount();
+            throw new PHPExcel_Exception(
+                "Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
+            );
+        }
+
+        return $this->workSheetCollection[$pIndex];
+    }
+
+    /**
+     * Get all sheets
+     *
+     * @return PHPExcel_Worksheet[]
+     */
+    public function getAllSheets()
+    {
+        return $this->workSheetCollection;
+    }
+
+    /**
+     * Get sheet by name
+     *
+     * @param  string $pName Sheet name
+     * @return PHPExcel_Worksheet
+     */
+    public function getSheetByName($pName = '')
+    {
+        $worksheetCount = count($this->workSheetCollection);
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            if ($this->workSheetCollection[$i]->getTitle() === $pName) {
+                return $this->workSheetCollection[$i];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get index for sheet
+     *
+     * @param  PHPExcel_Worksheet $pSheet
+     * @return int Sheet index
+     * @throws PHPExcel_Exception
+     */
+    public function getIndex(PHPExcel_Worksheet $pSheet)
+    {
+        foreach ($this->workSheetCollection as $key => $value) {
+            if ($value->getHashCode() == $pSheet->getHashCode()) {
+                return $key;
+            }
+        }
+
+        throw new PHPExcel_Exception("Sheet does not exist.");
+    }
+
+    /**
+     * Set index for sheet by sheet name.
+     *
+     * @param  string $sheetName Sheet name to modify index for
+     * @param  int $newIndex New index for the sheet
+     * @return int New sheet index
+     * @throws PHPExcel_Exception
+     */
+    public function setIndexByName($sheetName, $newIndex)
+    {
+        $oldIndex = $this->getIndex($this->getSheetByName($sheetName));
+        $pSheet = array_splice(
+            $this->workSheetCollection,
+            $oldIndex,
+            1
+        );
+        array_splice(
+            $this->workSheetCollection,
+            $newIndex,
+            0,
+            $pSheet
+        );
+        return $newIndex;
+    }
+
+    /**
+     * Get sheet count
+     *
+     * @return int
+     */
+    public function getSheetCount()
+    {
+        return count($this->workSheetCollection);
+    }
+
+    /**
+     * Get active sheet index
+     *
+     * @return int Active sheet index
+     */
+    public function getActiveSheetIndex()
+    {
+        return $this->activeSheetIndex;
+    }
+
+    /**
+     * Set active sheet index
+     *
+     * @param  int $pIndex Active sheet index
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function setActiveSheetIndex($pIndex = 0)
+    {
+        $numSheets = count($this->workSheetCollection);
+
+        if ($pIndex > $numSheets - 1) {
+            throw new PHPExcel_Exception(
+                "You tried to set a sheet active by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
+            );
+        } else {
+            $this->activeSheetIndex = $pIndex;
+        }
+        return $this->getActiveSheet();
+    }
+
+    /**
+     * Set active sheet index by name
+     *
+     * @param  string $pValue Sheet title
+     * @return PHPExcel_Worksheet
+     * @throws PHPExcel_Exception
+     */
+    public function setActiveSheetIndexByName($pValue = '')
+    {
+        if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) {
+            $this->setActiveSheetIndex($this->getIndex($worksheet));
+            return $worksheet;
+        }
+
+        throw new PHPExcel_Exception('Workbook does not contain sheet:' . $pValue);
+    }
+
+    /**
+     * Get sheet names
+     *
+     * @return string[]
+     */
+    public function getSheetNames()
+    {
+        $returnValue = array();
+        $worksheetCount = $this->getSheetCount();
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            $returnValue[] = $this->getSheet($i)->getTitle();
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Add external sheet
+     *
+     * @param  PHPExcel_Worksheet $pSheet External sheet to add
+     * @param  int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function addExternalSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = null)
+    {
+        if ($this->sheetNameExists($pSheet->getTitle())) {
+            throw new PHPExcel_Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
+        }
+
+        // count how many cellXfs there are in this workbook currently, we will need this below
+        $countCellXfs = count($this->cellXfCollection);
+
+        // copy all the shared cellXfs from the external workbook and append them to the current
+        foreach ($pSheet->getParent()->getCellXfCollection() as $cellXf) {
+            $this->addCellXf(clone $cellXf);
+        }
+
+        // move sheet to this workbook
+        $pSheet->rebindParent($this);
+
+        // update the cellXfs
+        foreach ($pSheet->getCellCollection(false) as $cellID) {
+            $cell = $pSheet->getCell($cellID);
+            $cell->setXfIndex($cell->getXfIndex() + $countCellXfs);
+        }
+
+        return $this->addSheet($pSheet, $iSheetIndex);
+    }
+
+    /**
+     * Get named ranges
+     *
+     * @return PHPExcel_NamedRange[]
+     */
+    public function getNamedRanges()
+    {
+        return $this->namedRanges;
+    }
+
+    /**
+     * Add named range
+     *
+     * @param  PHPExcel_NamedRange $namedRange
+     * @return boolean
+     */
+    public function addNamedRange(PHPExcel_NamedRange $namedRange)
+    {
+        if ($namedRange->getScope() == null) {
+            // global scope
+            $this->namedRanges[$namedRange->getName()] = $namedRange;
+        } else {
+            // local scope
+            $this->namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange;
+        }
+        return true;
+    }
+
+    /**
+     * Get named range
+     *
+     * @param  string $namedRange
+     * @param  PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
+     * @return PHPExcel_NamedRange|null
+     */
+    public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null)
+    {
+        $returnValue = null;
+
+        if ($namedRange != '' && ($namedRange !== null)) {
+            // first look for global defined name
+            if (isset($this->namedRanges[$namedRange])) {
+                $returnValue = $this->namedRanges[$namedRange];
+            }
+
+            // then look for local defined name (has priority over global defined name if both names exist)
+            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
+                $returnValue = $this->namedRanges[$pSheet->getTitle() . '!' . $namedRange];
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Remove named range
+     *
+     * @param  string  $namedRange
+     * @param  PHPExcel_Worksheet|null  $pSheet  Scope: use null for global scope.
+     * @return PHPExcel
+     */
+    public function removeNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null)
+    {
+        if ($pSheet === null) {
+            if (isset($this->namedRanges[$namedRange])) {
+                unset($this->namedRanges[$namedRange]);
+            }
+        } else {
+            if (isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
+                unset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get worksheet iterator
+     *
+     * @return PHPExcel_WorksheetIterator
+     */
+    public function getWorksheetIterator()
+    {
+        return new PHPExcel_WorksheetIterator($this);
+    }
+
+    /**
+     * Copy workbook (!= clone!)
+     *
+     * @return PHPExcel
+     */
+    public function copy()
+    {
+        $copied = clone $this;
+
+        $worksheetCount = count($this->workSheetCollection);
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            $this->workSheetCollection[$i] = $this->workSheetCollection[$i]->copy();
+            $this->workSheetCollection[$i]->rebindParent($this);
+        }
+
+        return $copied;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        foreach ($this as $key => $val) {
+            if (is_object($val) || (is_array($val))) {
+                $this->{$key} = unserialize(serialize($val));
+            }
+        }
+    }
+
+    /**
+     * Get the workbook collection of cellXfs
+     *
+     * @return PHPExcel_Style[]
+     */
+    public function getCellXfCollection()
+    {
+        return $this->cellXfCollection;
+    }
+
+    /**
+     * Get cellXf by index
+     *
+     * @param  int $pIndex
+     * @return PHPExcel_Style
+     */
+    public function getCellXfByIndex($pIndex = 0)
+    {
+        return $this->cellXfCollection[$pIndex];
+    }
+
+    /**
+     * Get cellXf by hash code
+     *
+     * @param  string $pValue
+     * @return PHPExcel_Style|boolean False if no match found
+     */
+    public function getCellXfByHashCode($pValue = '')
+    {
+        foreach ($this->cellXfCollection as $cellXf) {
+            if ($cellXf->getHashCode() == $pValue) {
+                return $cellXf;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if style exists in style collection
+     *
+     * @param  PHPExcel_Style $pCellStyle
+     * @return boolean
+     */
+    public function cellXfExists($pCellStyle = null)
+    {
+        return in_array($pCellStyle, $this->cellXfCollection, true);
+    }
+
+    /**
+     * Get default style
+     *
+     * @return PHPExcel_Style
+     * @throws PHPExcel_Exception
+     */
+    public function getDefaultStyle()
+    {
+        if (isset($this->cellXfCollection[0])) {
+            return $this->cellXfCollection[0];
+        }
+        throw new PHPExcel_Exception('No default style found for this workbook');
+    }
+
+    /**
+     * Add a cellXf to the workbook
+     *
+     * @param PHPExcel_Style $style
+     */
+    public function addCellXf(PHPExcel_Style $style)
+    {
+        $this->cellXfCollection[] = $style;
+        $style->setIndex(count($this->cellXfCollection) - 1);
+    }
+
+    /**
+     * Remove cellXf by index. It is ensured that all cells get their xf index updated.
+     *
+     * @param integer $pIndex Index to cellXf
+     * @throws PHPExcel_Exception
+     */
+    public function removeCellXfByIndex($pIndex = 0)
+    {
+        if ($pIndex > count($this->cellXfCollection) - 1) {
+            throw new PHPExcel_Exception("CellXf index is out of bounds.");
+        } else {
+            // first remove the cellXf
+            array_splice($this->cellXfCollection, $pIndex, 1);
+
+            // then update cellXf indexes for cells
+            foreach ($this->workSheetCollection as $worksheet) {
+                foreach ($worksheet->getCellCollection(false) as $cellID) {
+                    $cell = $worksheet->getCell($cellID);
+                    $xfIndex = $cell->getXfIndex();
+                    if ($xfIndex > $pIndex) {
+                        // decrease xf index by 1
+                        $cell->setXfIndex($xfIndex - 1);
+                    } elseif ($xfIndex == $pIndex) {
+                        // set to default xf index 0
+                        $cell->setXfIndex(0);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the cellXf supervisor
+     *
+     * @return PHPExcel_Style
+     */
+    public function getCellXfSupervisor()
+    {
+        return $this->cellXfSupervisor;
+    }
+
+    /**
+     * Get the workbook collection of cellStyleXfs
+     *
+     * @return PHPExcel_Style[]
+     */
+    public function getCellStyleXfCollection()
+    {
+        return $this->cellStyleXfCollection;
+    }
+
+    /**
+     * Get cellStyleXf by index
+     *
+     * @param integer $pIndex Index to cellXf
+     * @return PHPExcel_Style
+     */
+    public function getCellStyleXfByIndex($pIndex = 0)
+    {
+        return $this->cellStyleXfCollection[$pIndex];
+    }
+
+    /**
+     * Get cellStyleXf by hash code
+     *
+     * @param  string $pValue
+     * @return PHPExcel_Style|boolean False if no match found
+     */
+    public function getCellStyleXfByHashCode($pValue = '')
+    {
+        foreach ($this->cellStyleXfCollection as $cellStyleXf) {
+            if ($cellStyleXf->getHashCode() == $pValue) {
+                return $cellStyleXf;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Add a cellStyleXf to the workbook
+     *
+     * @param PHPExcel_Style $pStyle
+     */
+    public function addCellStyleXf(PHPExcel_Style $pStyle)
+    {
+        $this->cellStyleXfCollection[] = $pStyle;
+        $pStyle->setIndex(count($this->cellStyleXfCollection) - 1);
+    }
+
+    /**
+     * Remove cellStyleXf by index
+     *
+     * @param integer $pIndex Index to cellXf
+     * @throws PHPExcel_Exception
+     */
+    public function removeCellStyleXfByIndex($pIndex = 0)
+    {
+        if ($pIndex > count($this->cellStyleXfCollection) - 1) {
+            throw new PHPExcel_Exception("CellStyleXf index is out of bounds.");
+        } else {
+            array_splice($this->cellStyleXfCollection, $pIndex, 1);
+        }
+    }
+
+    /**
+     * Eliminate all unneeded cellXf and afterwards update the xfIndex for all cells
+     * and columns in the workbook
+     */
+    public function garbageCollect()
+    {
+        // how many references are there to each cellXf ?
+        $countReferencesCellXf = array();
+        foreach ($this->cellXfCollection as $index => $cellXf) {
+            $countReferencesCellXf[$index] = 0;
+        }
+
+        foreach ($this->getWorksheetIterator() as $sheet) {
+            // from cells
+            foreach ($sheet->getCellCollection(false) as $cellID) {
+                $cell = $sheet->getCell($cellID);
+                ++$countReferencesCellXf[$cell->getXfIndex()];
+            }
+
+            // from row dimensions
+            foreach ($sheet->getRowDimensions() as $rowDimension) {
+                if ($rowDimension->getXfIndex() !== null) {
+                    ++$countReferencesCellXf[$rowDimension->getXfIndex()];
+                }
+            }
+
+            // from column dimensions
+            foreach ($sheet->getColumnDimensions() as $columnDimension) {
+                ++$countReferencesCellXf[$columnDimension->getXfIndex()];
+            }
+        }
+
+        // remove cellXfs without references and create mapping so we can update xfIndex
+        // for all cells and columns
+        $countNeededCellXfs = 0;
+        $map = array();
+        foreach ($this->cellXfCollection as $index => $cellXf) {
+            if ($countReferencesCellXf[$index] > 0 || $index == 0) { // we must never remove the first cellXf
+                ++$countNeededCellXfs;
+            } else {
+                unset($this->cellXfCollection[$index]);
+            }
+            $map[$index] = $countNeededCellXfs - 1;
+        }
+        $this->cellXfCollection = array_values($this->cellXfCollection);
+
+        // update the index for all cellXfs
+        foreach ($this->cellXfCollection as $i => $cellXf) {
+            $cellXf->setIndex($i);
+        }
+
+        // make sure there is always at least one cellXf (there should be)
+        if (empty($this->cellXfCollection)) {
+            $this->cellXfCollection[] = new PHPExcel_Style();
+        }
+
+        // update the xfIndex for all cells, row dimensions, column dimensions
+        foreach ($this->getWorksheetIterator() as $sheet) {
+            // for all cells
+            foreach ($sheet->getCellCollection(false) as $cellID) {
+                $cell = $sheet->getCell($cellID);
+                $cell->setXfIndex($map[$cell->getXfIndex()]);
+            }
+
+            // for all row dimensions
+            foreach ($sheet->getRowDimensions() as $rowDimension) {
+                if ($rowDimension->getXfIndex() !== null) {
+                    $rowDimension->setXfIndex($map[$rowDimension->getXfIndex()]);
+                }
+            }
+
+            // for all column dimensions
+            foreach ($sheet->getColumnDimensions() as $columnDimension) {
+                $columnDimension->setXfIndex($map[$columnDimension->getXfIndex()]);
+            }
+
+            // also do garbage collection for all the sheets
+            $sheet->garbageCollect();
+        }
+    }
+
+    /**
+     * Return the unique ID value assigned to this spreadsheet workbook
+     *
+     * @return string
+     */
+    public function getID()
+    {
+        return $this->uniqueID;
+    }
+}
diff --git a/lib/PHPExcel/Autoloader.php b/lib/PHPExcel/Autoloader.php
new file mode 100644
index 000000000..c3b95a20c
--- /dev/null
+++ b/lib/PHPExcel/Autoloader.php
@@ -0,0 +1,81 @@
+<?php
+
+PHPExcel_Autoloader::register();
+//    As we always try to run the autoloader before anything else, we can use it to do a few
+//        simple checks and initialisations
+//PHPExcel_Shared_ZipStreamWrapper::register();
+// check mbstring.func_overload
+if (ini_get('mbstring.func_overload') & 2) {
+    throw new PHPExcel_Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
+}
+PHPExcel_Shared_String::buildCharacterSets();
+
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Autoloader
+{
+    /**
+     * Register the Autoloader with SPL
+     *
+     */
+    public static function register()
+    {
+        if (function_exists('__autoload')) {
+            // Register any existing autoloader function with SPL, so we don't get any clashes
+            spl_autoload_register('__autoload');
+        }
+        // Register ourselves with SPL
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+            return spl_autoload_register(array('PHPExcel_Autoloader', 'load'), true, true);
+        } else {
+            return spl_autoload_register(array('PHPExcel_Autoloader', 'load'));
+        }
+    }
+
+    /**
+     * Autoload a class identified by name
+     *
+     * @param    string    $pClassName        Name of the object to load
+     */
+    public static function load($pClassName)
+    {
+        if ((class_exists($pClassName, false)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
+            // Either already loaded, or not a PHPExcel class request
+            return false;
+        }
+
+        $pClassFilePath = PHPEXCEL_ROOT .
+            str_replace('_', DIRECTORY_SEPARATOR, $pClassName) .
+            '.php';
+
+        if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
+            // Can't load
+            return false;
+        }
+
+        require($pClassFilePath);
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/APC.php b/lib/PHPExcel/CachedObjectStorage/APC.php
new file mode 100644
index 000000000..c74b07fee
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/APC.php
@@ -0,0 +1,290 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_APC
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Prefix used to uniquely identify cache data for this worksheet
+     *
+     * @access    private
+     * @var string
+     */
+    private $cachePrefix = null;
+
+    /**
+     * Cache timeout
+     *
+     * @access    private
+     * @var integer
+     */
+    private $cacheTime = 600;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @access  private
+     * @return  void
+     * @throws  PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            if (!apc_store(
+                $this->cachePrefix . $this->currentObjectID . '.cache',
+                serialize($this->currentObject),
+                $this->cacheTime
+            )) {
+                $this->__destruct();
+                throw new PHPExcel_Exception('Failed to store cell ' . $this->currentObjectID . ' in APC');
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @access  public
+     * @param   string         $pCoord  Coordinate address of the cell to update
+     * @param   PHPExcel_Cell  $cell    Cell to update
+     * @return  PHPExcel_Cell
+     * @throws  PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+        $this->cellCache[$pCoord] = true;
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @access  public
+     * @param   string  $pCoord  Coordinate address of the cell to check
+     * @throws  PHPExcel_Exception
+     * @return  boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        //    Check if the requested entry is the current object, or exists in the cache
+        if (parent::isDataSet($pCoord)) {
+            if ($this->currentObjectID == $pCoord) {
+                return true;
+            }
+            //    Check if the requested entry still exists in apc
+            $success = apc_fetch($this->cachePrefix.$pCoord.'.cache');
+            if ($success === false) {
+                //    Entry no longer exists in APC, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @access  public
+     * @param   string         $pCoord  Coordinate of the cell
+     * @throws  PHPExcel_Exception
+     * @return  PHPExcel_Cell  Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (parent::isDataSet($pCoord)) {
+            $obj = apc_fetch($this->cachePrefix . $pCoord . '.cache');
+            if ($obj === false) {
+                //    Entry no longer exists in APC, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
+            }
+        } else {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @access  public
+     * @param   string  $pCoord  Coordinate address of the cell to delete
+     * @throws  PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        //    Delete the entry from APC
+        apc_delete($this->cachePrefix.$pCoord.'.cache');
+
+        //    Delete the entry from our cell address array
+        parent::deleteCacheData($pCoord);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @access  public
+     * @param   PHPExcel_Worksheet  $parent  The new worksheet
+     * @throws  PHPExcel_Exception
+     * @return  void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            if ($cellID != $this->currentObjectID) {
+                $obj = apc_fetch($this->cachePrefix . $cellID . '.cache');
+                if ($obj === false) {
+                    //    Entry no longer exists in APC, so clear it from the cache array
+                    parent::deleteCacheData($cellID);
+                    throw new PHPExcel_Exception('Cell entry ' . $cellID . ' no longer exists in APC');
+                }
+                if (!apc_store($newCachePrefix . $cellID . '.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception('Failed to store cell ' . $cellID . ' in APC');
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return  void
+     */
+    public function unsetWorksheetCells()
+    {
+        if ($this->currentObject !== null) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+
+        //    Flush the APC cache
+        $this->__destruct();
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param  PHPExcel_Worksheet  $parent     The worksheet for this cell collection
+     * @param  array of mixed      $arguments  Additional initialisation arguments
+     */
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
+
+        if ($this->cachePrefix === null) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+            $this->cacheTime = $cacheTime;
+
+            parent::__construct($parent);
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            apc_delete($this->cachePrefix . $cellID . '.cache');
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return  boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        if (!function_exists('apc_store')) {
+            return false;
+        }
+        if (apc_sma_info() === false) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/CacheBase.php b/lib/PHPExcel/CachedObjectStorage/CacheBase.php
new file mode 100644
index 000000000..9a12ec86e
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/CacheBase.php
@@ -0,0 +1,368 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_CacheBase
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_CachedObjectStorage_CacheBase
+{
+    /**
+     * Parent worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    protected $parent;
+
+    /**
+     * The currently active Cell
+     *
+     * @var PHPExcel_Cell
+     */
+    protected $currentObject = null;
+
+    /**
+     * Coordinate address of the currently active Cell
+     *
+     * @var string
+     */
+    protected $currentObjectID = null;
+
+    /**
+     * Flag indicating whether the currently active Cell requires saving
+     *
+     * @var boolean
+     */
+    protected $currentCellIsDirty = true;
+
+    /**
+     * An array of cells or cell pointers for the worksheet cells held in this cache,
+     *        and indexed by their coordinate address within the worksheet
+     *
+     * @var array of mixed
+     */
+    protected $cellCache = array();
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
+        //    Set our parent worksheet.
+        //    This is maintained within the cache controller to facilitate re-attaching it to PHPExcel_Cell objects when
+        //        they are woken from a serialized state
+        $this->parent = $parent;
+    }
+
+    /**
+     * Return the parent worksheet for this cell collection
+     *
+     * @return    PHPExcel_Worksheet
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+        //    Check if the requested entry exists in the cache
+        return isset($this->cellCache[$pCoord]);
+    }
+
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
+        $this->currentCellIsDirty = true;
+        if (isset($this->cellCache[$fromAddress])) {
+            $this->cellCache[$toAddress] = &$this->cellCache[$fromAddress];
+            unset($this->cellCache[$fromAddress]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Add or Update a cell in cache
+     *
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function updateCacheData(PHPExcel_Cell $cell)
+    {
+        return $this->addCacheData($cell->getCoordinate(), $cell);
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID && !is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
+
+        if (is_object($this->cellCache[$pCoord])) {
+            $this->cellCache[$pCoord]->detach();
+            unset($this->cellCache[$pCoord]);
+        }
+        $this->currentCellIsDirty = false;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    string[]
+     */
+    public function getCellList()
+    {
+        return array_keys($this->cellCache);
+    }
+
+    /**
+     * Sort the list of all cell addresses currently held in cache by row and column
+     *
+     * @return    string[]
+     */
+    public function getSortedCellList()
+    {
+        $sortKeys = array();
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $column, $row);
+            $sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
+        }
+        ksort($sortKeys);
+
+        return array_values($sortKeys);
+    }
+
+    /**
+     * Get highest worksheet column and highest row that have cell records
+     *
+     * @return array Highest column name and highest row number
+     */
+    public function getHighestRowAndColumn()
+    {
+        // Lookup highest column and highest row
+        $col = array('A' => '1A');
+        $row = array(1);
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            $row[$r] = $r;
+            $col[$c] = strlen($c).$c;
+        }
+        if (!empty($row)) {
+            // Determine highest column and row
+            $highestRow = max($row);
+            $highestColumn = substr(max($col), 1);
+        }
+
+        return array(
+            'row'    => $highestRow,
+            'column' => $highestColumn
+        );
+    }
+
+    /**
+     * Return the cell address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentAddress()
+    {
+        return $this->currentObjectID;
+    }
+
+    /**
+     * Return the column address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentColumn()
+    {
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
+        return $column;
+    }
+
+    /**
+     * Return the row address of the currently active cell object
+     *
+     * @return    integer
+     */
+    public function getCurrentRow()
+    {
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
+        return (integer) $row;
+    }
+
+    /**
+     * Get highest worksheet column
+     *
+     * @param   string     $row        Return the highest column for the specified row,
+     *                                     or the highest column of any row if no row number is passed
+     * @return  string     Highest column name
+     */
+    public function getHighestColumn($row = null)
+    {
+        if ($row == null) {
+            $colRow = $this->getHighestRowAndColumn();
+            return $colRow['column'];
+        }
+
+        $columnList = array(1);
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($r != $row) {
+                continue;
+            }
+            $columnList[] = PHPExcel_Cell::columnIndexFromString($c);
+        }
+        return PHPExcel_Cell::stringFromColumnIndex(max($columnList) - 1);
+    }
+
+    /**
+     * Get highest worksheet row
+     *
+     * @param   string     $column     Return the highest row for the specified column,
+     *                                     or the highest row of any column if no column letter is passed
+     * @return  int        Highest row number
+     */
+    public function getHighestRow($column = null)
+    {
+        if ($column == null) {
+            $colRow = $this->getHighestRowAndColumn();
+            return $colRow['row'];
+        }
+
+        $rowList = array(0);
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($c != $column) {
+                continue;
+            }
+            $rowList[] = $r;
+        }
+
+        return max($rowList);
+    }
+
+    /**
+     * Generate a unique ID for cache referencing
+     *
+     * @return string Unique Reference
+     */
+    protected function getUniqueID()
+    {
+        if (function_exists('posix_getpid')) {
+            $baseUnique = posix_getpid();
+        } else {
+            $baseUnique = mt_rand();
+        }
+        return uniqid($baseUnique, true);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
+
+        $this->parent = $parent;
+        if (($this->currentObject !== null) && (is_object($this->currentObject))) {
+            $this->currentObject->attach($this);
+        }
+    }    //    function copyCellCollection()
+
+    /**
+     * Remove a row, deleting all cells in that row
+     *
+     * @param string    $row    Row number to remove
+     * @return void
+     */
+    public function removeRow($row)
+    {
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($r == $row) {
+                $this->deleteCacheData($coord);
+            }
+        }
+    }
+
+    /**
+     * Remove a column, deleting all cells in that column
+     *
+     * @param string    $column    Column ID to remove
+     * @return void
+     */
+    public function removeColumn($column)
+    {
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($c == $column) {
+                $this->deleteCacheData($coord);
+            }
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/DiscISAM.php b/lib/PHPExcel/CachedObjectStorage/DiscISAM.php
new file mode 100644
index 000000000..13bc03375
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/DiscISAM.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_DiscISAM
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Name of the file for this cache
+     *
+     * @var string
+     */
+    private $fileName = null;
+
+    /**
+     * File handle for this cache file
+     *
+     * @var resource
+     */
+    private $fileHandle = null;
+
+    /**
+     * Directory/Folder where the cache file is located
+     *
+     * @var string
+     */
+    private $cacheDirectory = null;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            fseek($this->fileHandle, 0, SEEK_END);
+
+            $this->cellCache[$this->currentObjectID] = array(
+                'ptr' => ftell($this->fileHandle),
+                'sz'  => fwrite($this->fileHandle, serialize($this->currentObject))
+            );
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
+        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newFileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+        //    Copy the existing cell cache file
+        copy($this->fileName, $newFileName);
+        $this->fileName = $newFileName;
+        //    Open the copied cell cache file
+        $this->fileHandle = fopen($this->fileName, 'a+');
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $this->cacheDirectory    = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
+                                    ? $arguments['dir']
+                                    : PHPExcel_Shared_File::sys_get_temp_dir();
+
+        parent::__construct($parent);
+        if (is_null($this->fileHandle)) {
+            $baseUnique = $this->getUniqueID();
+            $this->fileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+            $this->fileHandle = fopen($this->fileName, 'a+');
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+            unlink($this->fileName);
+        }
+        $this->fileHandle = null;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/ICache.php b/lib/PHPExcel/CachedObjectStorage/ICache.php
new file mode 100644
index 000000000..aafef6e9c
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/ICache.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_ICache
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+interface PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell);
+
+    /**
+     * Add or Update a cell in cache
+     *
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function updateCacheData(PHPExcel_Cell $cell);
+
+    /**
+     * Fetch a cell from cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to retrieve
+     * @return PHPExcel_Cell     Cell that was found, or null if not found
+     * @throws    PHPExcel_Exception
+     */
+    public function getCacheData($pCoord);
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord);
+
+    /**
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord);
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    string[]
+     */
+    public function getCellList();
+
+    /**
+     * Get the list of all cell addresses currently held in cache sorted by column and row
+     *
+     * @return    string[]
+     */
+    public function getSortedCellList();
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent);
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable();
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/Igbinary.php b/lib/PHPExcel/CachedObjectStorage/Igbinary.php
new file mode 100644
index 000000000..5f3527b57
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/Igbinary.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_Igbinary
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            $this->cellCache[$this->currentObjectID] = igbinary_serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }    //    function _storeData()
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }    //    function addCacheData()
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = igbinary_unserialize($this->cellCache[$pCoord]);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }    //    function getCacheData()
+
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }    //    function unsetWorksheetCells()
+
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        if (!function_exists('igbinary_serialize')) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/Memcache.php b/lib/PHPExcel/CachedObjectStorage/Memcache.php
new file mode 100644
index 000000000..07942cc3f
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/Memcache.php
@@ -0,0 +1,308 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_Memcache
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Prefix used to uniquely identify cache data for this worksheet
+     *
+     * @var string
+     */
+    private $cachePrefix = null;
+
+    /**
+     * Cache timeout
+     *
+     * @var integer
+     */
+    private $cacheTime = 600;
+
+    /**
+     * Memcache interface
+     *
+     * @var resource
+     */
+    private $memcache = null;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            $obj = serialize($this->currentObject);
+            if (!$this->memcache->replace($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
+                if (!$this->memcache->add($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception("Failed to store cell {$this->currentObjectID} in MemCache");
+                }
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }    //    function _storeData()
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+        $this->cellCache[$pCoord] = true;
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }    //    function addCacheData()
+
+
+    /**
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        //    Check if the requested entry is the current object, or exists in the cache
+        if (parent::isDataSet($pCoord)) {
+            if ($this->currentObjectID == $pCoord) {
+                return true;
+            }
+            //    Check if the requested entry still exists in Memcache
+            $success = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
+            if ($success === false) {
+                //    Entry no longer exists in Memcache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+            }
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (parent::isDataSet($pCoord)) {
+            $obj = $this->memcache->get($this->cachePrefix . $pCoord . '.cache');
+            if ($obj === false) {
+                //    Entry no longer exists in Memcache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new PHPExcel_Exception("Cell entry {$pCoord} no longer exists in MemCache");
+            }
+        } else {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        //    Delete the entry from Memcache
+        $this->memcache->delete($this->cachePrefix . $pCoord . '.cache');
+
+        //    Delete the entry from our cell address array
+        parent::deleteCacheData($pCoord);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            if ($cellID != $this->currentObjectID) {
+                $obj = $this->memcache->get($this->cachePrefix.$cellID.'.cache');
+                if ($obj === false) {
+                    //    Entry no longer exists in Memcache, so clear it from the cache array
+                    parent::deleteCacheData($cellID);
+                    throw new PHPExcel_Exception("Cell entry {$cellID} no longer exists in MemCache");
+                }
+                if (!$this->memcache->add($newCachePrefix . $cellID . '.cache', $obj, null, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception("Failed to store cell {$cellID} in MemCache");
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+
+        //    Flush the Memcache cache
+        $this->__destruct();
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $memcacheServer = (isset($arguments['memcacheServer'])) ? $arguments['memcacheServer'] : 'localhost';
+        $memcachePort = (isset($arguments['memcachePort'])) ? $arguments['memcachePort'] : 11211;
+        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
+
+        if (is_null($this->cachePrefix)) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+
+            //    Set a new Memcache object and connect to the Memcache server
+            $this->memcache = new Memcache();
+            if (!$this->memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
+                throw new PHPExcel_Exception("Could not connect to MemCache server at {$memcacheServer}:{$memcachePort}");
+            }
+            $this->cacheTime = $cacheTime;
+
+            parent::__construct($parent);
+        }
+    }
+
+    /**
+     * Memcache error handler
+     *
+     * @param    string    $host        Memcache server
+     * @param    integer    $port        Memcache port
+     * @throws    PHPExcel_Exception
+     */
+    public function failureCallback($host, $port)
+    {
+        throw new PHPExcel_Exception("memcache {$host}:{$port} failed");
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            $this->memcache->delete($this->cachePrefix.$cellID . '.cache');
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        if (!function_exists('memcache_add')) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/Memory.php b/lib/PHPExcel/CachedObjectStorage/Memory.php
new file mode 100644
index 000000000..0e2ea0b07
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/Memory.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_Memory
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Dummy method callable from CacheBase, but unused by Memory cache
+     *
+     * @return    void
+     */
+    protected function storeData()
+    {
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        $this->cellCache[$pCoord] = $cell;
+
+        //    Set current entry to the new/updated entry
+        $this->currentObjectID = $pCoord;
+
+        return $cell;
+    }
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            $this->currentObjectID = null;
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+
+        //    Return requested entry
+        return $this->cellCache[$pCoord];
+    }
+
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+
+        $newCollection = array();
+        foreach ($this->cellCache as $k => &$cell) {
+            $newCollection[$k] = clone $cell;
+            $newCollection[$k]->attach($this);
+        }
+
+        $this->cellCache = $newCollection;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     */
+    public function unsetWorksheetCells()
+    {
+        // Because cells are all stored as intact objects in memory, we need to detach each one from the parent
+        foreach ($this->cellCache as $k => &$cell) {
+            $cell->detach();
+            $this->cellCache[$k] = null;
+        }
+        unset($cell);
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/MemoryGZip.php b/lib/PHPExcel/CachedObjectStorage/MemoryGZip.php
new file mode 100644
index 000000000..c06ec714f
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/MemoryGZip.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_MemoryGZip
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            $this->cellCache[$this->currentObjectID] = gzdeflate(serialize($this->currentObject));
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize(gzinflate($this->cellCache[$pCoord]));
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/MemorySerialized.php b/lib/PHPExcel/CachedObjectStorage/MemorySerialized.php
new file mode 100644
index 000000000..133251499
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/MemorySerialized.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_MemorySerialized
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            $this->cellCache[$this->currentObjectID] = serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($this->cellCache[$pCoord]);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/PHPTemp.php b/lib/PHPExcel/CachedObjectStorage/PHPTemp.php
new file mode 100644
index 000000000..43c781971
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/PHPTemp.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_PHPTemp
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Name of the file for this cache
+     *
+     * @var string
+     */
+    private $fileHandle = null;
+
+    /**
+     * Memory limit to use before reverting to file cache
+     *
+     * @var integer
+     */
+    private $memoryCacheSize = null;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            fseek($this->fileHandle, 0, SEEK_END);
+
+            $this->cellCache[$this->currentObjectID] = array(
+                'ptr' => ftell($this->fileHandle),
+                'sz'  => fwrite($this->fileHandle, serialize($this->currentObject))
+            );
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
+        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Open a new stream for the cell cache data
+        $newFileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
+        //    Copy the existing cell cache data to the new stream
+        fseek($this->fileHandle, 0);
+        while (!feof($this->fileHandle)) {
+            fwrite($newFileHandle, fread($this->fileHandle, 1024));
+        }
+        $this->fileHandle = $newFileHandle;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the php://temp file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $this->memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB';
+
+        parent::__construct($parent);
+        if (is_null($this->fileHandle)) {
+            $this->fileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+        }
+        $this->fileHandle = null;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/SQLite.php b/lib/PHPExcel/CachedObjectStorage/SQLite.php
new file mode 100644
index 000000000..e7b50c5bd
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/SQLite.php
@@ -0,0 +1,307 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_SQLite
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    private $TableName = null;
+
+    /**
+     * Database handle
+     *
+     * @var resource
+     */
+    private $DBHandle = null;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            if (!$this->DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES('".$this->currentObjectID."','".sqlite_escape_string(serialize($this->currentObject))."')")) {
+                throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        $query = "SELECT value FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
+        if ($cellResultSet === false) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        } elseif ($cellResultSet->numRows() == 0) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+
+        $cellResult = $cellResultSet->fetchSingle();
+        $this->currentObject = unserialize($cellResult);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Is a value set for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $query = "SELECT id FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
+        if ($cellResultSet === false) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        } elseif ($cellResultSet->numRows() == 0) {
+            //    Return null if requested entry doesn't exist in cache
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        if (!$this->DBHandle->queryExec($query)) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
+
+        $this->currentCellIsDirty = false;
+    }
+
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
+
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$toAddress."'";
+        $result = $this->DBHandle->exec($query);
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $query = "UPDATE kvp_".$this->TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
+        $result = $this->DBHandle->exec($query);
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        $query = "SELECT id FROM kvp_".$this->TableName;
+        $cellIdsResult = $this->DBHandle->unbufferedQuery($query, SQLITE_ASSOC);
+        if ($cellIdsResult === false) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
+
+        $cellKeys = array();
+        foreach ($cellIdsResult as $row) {
+            $cellKeys[] = $row['id'];
+        }
+
+        return $cellKeys;
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
+
+        //    Get a new id for the new table name
+        $tableName = str_replace('.', '_', $this->getUniqueID());
+        if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+            AS SELECT * FROM kvp_'.$this->TableName)
+        ) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
+
+        //    Copy the existing cell cache file
+        $this->TableName = $tableName;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
+        parent::__construct($parent);
+        if (is_null($this->DBHandle)) {
+            $this->TableName = str_replace('.', '_', $this->getUniqueID());
+            $_DBName = ':memory:';
+
+            $this->DBHandle = new SQLiteDatabase($_DBName);
+            if ($this->DBHandle === false) {
+                throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+            if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+                throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->queryExec('DROP TABLE kvp_'.$this->TableName);
+        }
+        $this->DBHandle = null;
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        if (!function_exists('sqlite_open')) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/SQLite3.php b/lib/PHPExcel/CachedObjectStorage/SQLite3.php
new file mode 100644
index 000000000..27473d6c3
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/SQLite3.php
@@ -0,0 +1,346 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_SQLite3
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    private $TableName = null;
+
+    /**
+     * Database handle
+     *
+     * @var resource
+     */
+    private $DBHandle = null;
+
+    /**
+     * Prepared statement for a SQLite3 select query
+     *
+     * @var SQLite3Stmt
+     */
+    private $selectQuery;
+
+    /**
+     * Prepared statement for a SQLite3 insert query
+     *
+     * @var SQLite3Stmt
+     */
+    private $insertQuery;
+
+    /**
+     * Prepared statement for a SQLite3 update query
+     *
+     * @var SQLite3Stmt
+     */
+    private $updateQuery;
+
+    /**
+     * Prepared statement for a SQLite3 delete query
+     *
+     * @var SQLite3Stmt
+     */
+    private $deleteQuery;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            $this->insertQuery->bindValue('id', $this->currentObjectID, SQLITE3_TEXT);
+            $this->insertQuery->bindValue('data', serialize($this->currentObject), SQLITE3_BLOB);
+            $result = $this->insertQuery->execute();
+            if ($result === false) {
+                throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel_Exception
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $cellResult = $this->selectQuery->execute();
+        if ($cellResult === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+        if ($cellData === false) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+
+        $this->currentObject = unserialize($cellData['value']);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     *    Is a value set for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $cellResult = $this->selectQuery->execute();
+        if ($cellResult === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+
+        return ($cellData === false) ? false : true;
+    }
+
+    /**
+     *    Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $this->deleteQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $result = $this->deleteQuery->execute();
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $this->currentCellIsDirty = false;
+    }
+
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
+
+        $this->deleteQuery->bindValue('id', $toAddress, SQLITE3_TEXT);
+        $result = $this->deleteQuery->execute();
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $this->updateQuery->bindValue('toid', $toAddress, SQLITE3_TEXT);
+        $this->updateQuery->bindValue('fromid', $fromAddress, SQLITE3_TEXT);
+        $result = $this->updateQuery->execute();
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        $query = "SELECT id FROM kvp_".$this->TableName;
+        $cellIdsResult = $this->DBHandle->query($query);
+        if ($cellIdsResult === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $cellKeys = array();
+        while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
+            $cellKeys[] = $row['id'];
+        }
+
+        return $cellKeys;
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
+
+        //    Get a new id for the new table name
+        $tableName = str_replace('.', '_', $this->getUniqueID());
+        if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+            AS SELECT * FROM kvp_'.$this->TableName)
+        ) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        //    Copy the existing cell cache file
+        $this->TableName = $tableName;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
+        parent::__construct($parent);
+        if (is_null($this->DBHandle)) {
+            $this->TableName = str_replace('.', '_', $this->getUniqueID());
+            $_DBName = ':memory:';
+
+            $this->DBHandle = new SQLite3($_DBName);
+            if ($this->DBHandle === false) {
+                throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+            }
+            if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+                throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+            }
+        }
+
+        $this->selectQuery = $this->DBHandle->prepare("SELECT value FROM kvp_".$this->TableName." WHERE id = :id");
+        $this->insertQuery = $this->DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES(:id,:data)");
+        $this->updateQuery = $this->DBHandle->prepare("UPDATE kvp_".$this->TableName." SET id=:toId WHERE id=:fromId");
+        $this->deleteQuery = $this->DBHandle->prepare("DELETE FROM kvp_".$this->TableName." WHERE id = :id");
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->exec('DROP TABLE kvp_'.$this->TableName);
+            $this->DBHandle->close();
+        }
+        $this->DBHandle = null;
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        if (!class_exists('SQLite3', false)) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorage/Wincache.php b/lib/PHPExcel/CachedObjectStorage/Wincache.php
new file mode 100644
index 000000000..1567874ff
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorage/Wincache.php
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorage_Wincache
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Prefix used to uniquely identify cache data for this worksheet
+     *
+     * @var string
+     */
+    private $cachePrefix = null;
+
+    /**
+     * Cache timeout
+     *
+     * @var integer
+     */
+    private $cacheTime = 600;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel_Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
+
+            $obj = serialize($this->currentObject);
+            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
+                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                }
+            } else {
+                if (!wincache_ucache_add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                }
+            }
+            $this->currentCellIsDirty = false;
+        }
+
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
+     * @return    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+        $this->cellCache[$pCoord] = true;
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        //    Check if the requested entry is the current object, or exists in the cache
+        if (parent::isDataSet($pCoord)) {
+            if ($this->currentObjectID == $pCoord) {
+                return true;
+            }
+            //    Check if the requested entry still exists in cache
+            $success = wincache_ucache_exists($this->cachePrefix.$pCoord.'.cache');
+            if ($success === false) {
+                //    Entry no longer exists in Wincache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+            }
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param    string            $pCoord        Coordinate of the cell
+     * @throws    PHPExcel_Exception
+     * @return    PHPExcel_Cell    Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        $obj = null;
+        if (parent::isDataSet($pCoord)) {
+            $success = false;
+            $obj = wincache_ucache_get($this->cachePrefix.$pCoord.'.cache', $success);
+            if ($success === false) {
+                //    Entry no longer exists in WinCache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+            }
+        } else {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel_Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        //    Delete the entry from Wincache
+        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
+
+        //    Delete the entry from our cell address array
+        parent::deleteCacheData($pCoord);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            if ($cellID != $this->currentObjectID) {
+                $success = false;
+                $obj = wincache_ucache_get($this->cachePrefix.$cellID.'.cache', $success);
+                if ($success === false) {
+                    //    Entry no longer exists in WinCache, so clear it from the cache array
+                    parent::deleteCacheData($cellID);
+                    throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in Wincache');
+                }
+                if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
+
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+
+        //    Flush the WinCache cache
+        $this->__destruct();
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $cacheTime    = (isset($arguments['cacheTime']))    ? $arguments['cacheTime']    : 600;
+
+        if (is_null($this->cachePrefix)) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+            $this->cacheTime = $cacheTime;
+
+            parent::__construct($parent);
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        if (!function_exists('wincache_ucache_add')) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/CachedObjectStorageFactory.php b/lib/PHPExcel/CachedObjectStorageFactory.php
new file mode 100644
index 000000000..0a969786e
--- /dev/null
+++ b/lib/PHPExcel/CachedObjectStorageFactory.php
@@ -0,0 +1,231 @@
+<?php
+
+/**
+ * PHPExcel_CachedObjectStorageFactory
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CachedObjectStorageFactory
+{
+    const cache_in_memory               = 'Memory';
+    const cache_in_memory_gzip          = 'MemoryGZip';
+    const cache_in_memory_serialized    = 'MemorySerialized';
+    const cache_igbinary                = 'Igbinary';
+    const cache_to_discISAM             = 'DiscISAM';
+    const cache_to_apc                  = 'APC';
+    const cache_to_memcache             = 'Memcache';
+    const cache_to_phpTemp              = 'PHPTemp';
+    const cache_to_wincache             = 'Wincache';
+    const cache_to_sqlite               = 'SQLite';
+    const cache_to_sqlite3              = 'SQLite3';
+
+    /**
+     * Name of the method used for cell cacheing
+     *
+     * @var string
+     */
+    private static $cacheStorageMethod = null;
+
+    /**
+     * Name of the class used for cell cacheing
+     *
+     * @var string
+     */
+    private static $cacheStorageClass = null;
+
+    /**
+     * List of all possible cache storage methods
+     *
+     * @var string[]
+     */
+    private static $storageMethods = array(
+        self::cache_in_memory,
+        self::cache_in_memory_gzip,
+        self::cache_in_memory_serialized,
+        self::cache_igbinary,
+        self::cache_to_phpTemp,
+        self::cache_to_discISAM,
+        self::cache_to_apc,
+        self::cache_to_memcache,
+        self::cache_to_wincache,
+        self::cache_to_sqlite,
+        self::cache_to_sqlite3,
+    );
+
+    /**
+     * Default arguments for each cache storage method
+     *
+     * @var array of mixed array
+     */
+    private static $storageMethodDefaultParameters = array(
+        self::cache_in_memory               => array(
+                                                    ),
+        self::cache_in_memory_gzip          => array(
+                                                    ),
+        self::cache_in_memory_serialized    => array(
+                                                    ),
+        self::cache_igbinary                => array(
+                                                    ),
+        self::cache_to_phpTemp              => array( 'memoryCacheSize' => '1MB'
+                                                    ),
+        self::cache_to_discISAM             => array( 'dir'             => null
+                                                    ),
+        self::cache_to_apc                  => array( 'cacheTime'       => 600
+                                                    ),
+        self::cache_to_memcache             => array( 'memcacheServer'  => 'localhost',
+                                                      'memcachePort'    => 11211,
+                                                      'cacheTime'       => 600
+                                                    ),
+        self::cache_to_wincache             => array( 'cacheTime'       => 600
+                                                    ),
+        self::cache_to_sqlite               => array(
+                                                    ),
+        self::cache_to_sqlite3              => array(
+                                                    ),
+    );
+
+    /**
+     * Arguments for the active cache storage method
+     *
+     * @var array of mixed array
+     */
+    private static $storageMethodParameters = array();
+
+    /**
+     * Return the current cache storage method
+     *
+     * @return string|null
+     **/
+    public static function getCacheStorageMethod()
+    {
+        return self::$cacheStorageMethod;
+    }
+
+    /**
+     * Return the current cache storage class
+     *
+     * @return PHPExcel_CachedObjectStorage_ICache|null
+     **/
+    public static function getCacheStorageClass()
+    {
+        return self::$cacheStorageClass;
+    }
+
+    /**
+     * Return the list of all possible cache storage methods
+     *
+     * @return string[]
+     **/
+    public static function getAllCacheStorageMethods()
+    {
+        return self::$storageMethods;
+    }
+
+    /**
+     * Return the list of all available cache storage methods
+     *
+     * @return string[]
+     **/
+    public static function getCacheStorageMethods()
+    {
+        $activeMethods = array();
+        foreach (self::$storageMethods as $storageMethod) {
+            $cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
+            if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
+                $activeMethods[] = $storageMethod;
+            }
+        }
+        return $activeMethods;
+    }
+
+    /**
+     * Identify the cache storage method to use
+     *
+     * @param    string            $method        Name of the method to use for cell cacheing
+     * @param    array of mixed    $arguments    Additional arguments to pass to the cell caching class
+     *                                        when instantiating
+     * @return boolean
+     **/
+    public static function initialize($method = self::cache_in_memory, $arguments = array())
+    {
+        if (!in_array($method, self::$storageMethods)) {
+            return false;
+        }
+
+        $cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
+        if (!call_user_func(array( $cacheStorageClass,
+                                   'cacheMethodIsAvailable'))) {
+            return false;
+        }
+
+        self::$storageMethodParameters[$method] = self::$storageMethodDefaultParameters[$method];
+        foreach ($arguments as $k => $v) {
+            if (array_key_exists($k, self::$storageMethodParameters[$method])) {
+                self::$storageMethodParameters[$method][$k] = $v;
+            }
+        }
+
+        if (self::$cacheStorageMethod === null) {
+            self::$cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
+            self::$cacheStorageMethod = $method;
+        }
+        return true;
+    }
+
+    /**
+     * Initialise the cache storage
+     *
+     * @param    PHPExcel_Worksheet     $parent        Enable cell caching for this worksheet
+     * @return    PHPExcel_CachedObjectStorage_ICache
+     **/
+    public static function getInstance(PHPExcel_Worksheet $parent)
+    {
+        $cacheMethodIsAvailable = true;
+        if (self::$cacheStorageMethod === null) {
+            $cacheMethodIsAvailable = self::initialize();
+        }
+
+        if ($cacheMethodIsAvailable) {
+            $instance = new self::$cacheStorageClass(
+                $parent,
+                self::$storageMethodParameters[self::$cacheStorageMethod]
+            );
+            if ($instance !== null) {
+                return $instance;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Clear the cache storage
+     *
+     **/
+    public static function finalize()
+    {
+        self::$cacheStorageMethod = null;
+        self::$cacheStorageClass = null;
+        self::$storageMethodParameters = array();
+    }
+}
diff --git a/lib/PHPExcel/CalcEngine/CyclicReferenceStack.php b/lib/PHPExcel/CalcEngine/CyclicReferenceStack.php
new file mode 100644
index 000000000..1072fc75f
--- /dev/null
+++ b/lib/PHPExcel/CalcEngine/CyclicReferenceStack.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * PHPExcel_CalcEngine_CyclicReferenceStack
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CalcEngine_CyclicReferenceStack
+{
+    /**
+     *  The call stack for calculated cells
+     *
+     *  @var mixed[]
+     */
+    private $stack = array();
+
+    /**
+     * Return the number of entries on the stack
+     *
+     * @return  integer
+     */
+    public function count()
+    {
+        return count($this->stack);
+    }
+
+    /**
+     * Push a new entry onto the stack
+     *
+     * @param  mixed  $value
+     */
+    public function push($value)
+    {
+        $this->stack[$value] = $value;
+    }
+
+    /**
+     * Pop the last entry from the stack
+     *
+     * @return  mixed
+     */
+    public function pop()
+    {
+        return array_pop($this->stack);
+    }
+
+    /**
+     * Test to see if a specified entry exists on the stack
+     *
+     * @param  mixed  $value  The value to test
+     */
+    public function onStack($value)
+    {
+        return isset($this->stack[$value]);
+    }
+
+    /**
+     * Clear the stack
+     */
+    public function clear()
+    {
+        $this->stack = array();
+    }
+
+    /**
+     * Return an array of all entries on the stack
+     *
+     * @return  mixed[]
+     */
+    public function showStack()
+    {
+        return $this->stack;
+    }
+}
diff --git a/lib/PHPExcel/CalcEngine/Logger.php b/lib/PHPExcel/CalcEngine/Logger.php
new file mode 100644
index 000000000..c5ffe73e9
--- /dev/null
+++ b/lib/PHPExcel/CalcEngine/Logger.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * PHPExcel_CalcEngine_Logger
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_CalcEngine_Logger
+{
+    /**
+     * Flag to determine whether a debug log should be generated by the calculation engine
+     *        If true, then a debug log will be generated
+     *        If false, then a debug log will not be generated
+     *
+     * @var boolean
+     */
+    private $writeDebugLog = false;
+
+    /**
+     * Flag to determine whether a debug log should be echoed by the calculation engine
+     *        If true, then a debug log will be echoed
+     *        If false, then a debug log will not be echoed
+     * A debug log can only be echoed if it is generated
+     *
+     * @var boolean
+     */
+    private $echoDebugLog = false;
+
+    /**
+     * The debug log generated by the calculation engine
+     *
+     * @var string[]
+     */
+    private $debugLog = array();
+
+    /**
+     * The calculation engine cell reference stack
+     *
+     * @var PHPExcel_CalcEngine_CyclicReferenceStack
+     */
+    private $cellStack;
+
+    /**
+     * Instantiate a Calculation engine logger
+     *
+     * @param  PHPExcel_CalcEngine_CyclicReferenceStack $stack
+     */
+    public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack)
+    {
+        $this->cellStack = $stack;
+    }
+
+    /**
+     * Enable/Disable Calculation engine logging
+     *
+     * @param  boolean $pValue
+     */
+    public function setWriteDebugLog($pValue = false)
+    {
+        $this->writeDebugLog = $pValue;
+    }
+
+    /**
+     * Return whether calculation engine logging is enabled or disabled
+     *
+     * @return  boolean
+     */
+    public function getWriteDebugLog()
+    {
+        return $this->writeDebugLog;
+    }
+
+    /**
+     * Enable/Disable echoing of debug log information
+     *
+     * @param  boolean $pValue
+     */
+    public function setEchoDebugLog($pValue = false)
+    {
+        $this->echoDebugLog = $pValue;
+    }
+
+    /**
+     * Return whether echoing of debug log information is enabled or disabled
+     *
+     * @return  boolean
+     */
+    public function getEchoDebugLog()
+    {
+        return $this->echoDebugLog;
+    }
+
+    /**
+     * Write an entry to the calculation engine debug log
+     */
+    public function writeDebugLog()
+    {
+        //    Only write the debug log if logging is enabled
+        if ($this->writeDebugLog) {
+            $message = implode(func_get_args());
+            $cellReference = implode(' -> ', $this->cellStack->showStack());
+            if ($this->echoDebugLog) {
+                echo $cellReference,
+                    ($this->cellStack->count() > 0 ? ' => ' : ''),
+                    $message,
+                    PHP_EOL;
+            }
+            $this->debugLog[] = $cellReference .
+                ($this->cellStack->count() > 0 ? ' => ' : '') .
+                $message;
+        }
+    }
+
+    /**
+     * Clear the calculation engine debug log
+     */
+    public function clearLog()
+    {
+        $this->debugLog = array();
+    }
+
+    /**
+     * Return the calculation engine debug log
+     *
+     * @return  string[]
+     */
+    public function getLog()
+    {
+        return $this->debugLog;
+    }
+}
diff --git a/lib/PHPExcel/Calculation.php b/lib/PHPExcel/Calculation.php
new file mode 100644
index 000000000..0c754daf7
--- /dev/null
+++ b/lib/PHPExcel/Calculation.php
@@ -0,0 +1,4391 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+if (!defined('CALCULATION_REGEXP_CELLREF')) {
+    //    Test for support of \P (multibyte options) in PCRE
+    if (defined('PREG_BAD_UTF8_ERROR')) {
+        //    Cell reference (cell or range of cells, with or without a sheet reference)
+        define('CALCULATION_REGEXP_CELLREF', '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d{1,7})');
+        //    Named Range of cells
+        define('CALCULATION_REGEXP_NAMEDRANGE', '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)');
+    } else {
+        //    Cell reference (cell or range of cells, with or without a sheet reference)
+        define('CALCULATION_REGEXP_CELLREF', '(((\w*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)');
+        //    Named Range of cells
+        define('CALCULATION_REGEXP_NAMEDRANGE', '(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9\.]*)');
+    }
+}
+
+/**
+ * PHPExcel_Calculation (Multiton)
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation
+{
+    /** Constants                */
+    /** Regular Expressions        */
+    //    Numeric operand
+    const CALCULATION_REGEXP_NUMBER        = '[-+]?\d*\.?\d+(e[-+]?\d+)?';
+    //    String operand
+    const CALCULATION_REGEXP_STRING        = '"(?:[^"]|"")*"';
+    //    Opening bracket
+    const CALCULATION_REGEXP_OPENBRACE    = '\(';
+    //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
+    const CALCULATION_REGEXP_FUNCTION    = '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
+    //    Cell reference (cell or range of cells, with or without a sheet reference)
+    const CALCULATION_REGEXP_CELLREF    = CALCULATION_REGEXP_CELLREF;
+    //    Named Range of cells
+    const CALCULATION_REGEXP_NAMEDRANGE    = CALCULATION_REGEXP_NAMEDRANGE;
+    //    Error
+    const CALCULATION_REGEXP_ERROR        = '\#[A-Z][A-Z0_\/]*[!\?]?';
+
+
+    /** constants */
+    const RETURN_ARRAY_AS_ERROR = 'error';
+    const RETURN_ARRAY_AS_VALUE = 'value';
+    const RETURN_ARRAY_AS_ARRAY = 'array';
+
+    private static $returnArrayAsType = self::RETURN_ARRAY_AS_VALUE;
+
+
+    /**
+     * Instance of this class
+     *
+     * @access    private
+     * @var PHPExcel_Calculation
+     */
+    private static $instance;
+
+
+    /**
+     * Instance of the workbook this Calculation Engine is using
+     *
+     * @access    private
+     * @var PHPExcel
+     */
+    private $workbook;
+
+    /**
+     * List of instances of the calculation engine that we've instantiated for individual workbooks
+     *
+     * @access    private
+     * @var PHPExcel_Calculation[]
+     */
+    private static $workbookSets;
+
+    /**
+     * Calculation cache
+     *
+     * @access    private
+     * @var array
+     */
+    private $calculationCache = array ();
+
+
+    /**
+     * Calculation cache enabled
+     *
+     * @access    private
+     * @var boolean
+     */
+    private $calculationCacheEnabled = true;
+
+
+    /**
+     * List of operators that can be used within formulae
+     * The true/false value indicates whether it is a binary operator or a unary operator
+     *
+     * @access    private
+     * @var array
+     */
+    private static $operators = array(
+        '+' => true,    '-' => true,    '*' => true,    '/' => true,
+        '^' => true,    '&' => true,    '%' => false,    '~' => false,
+        '>' => true,    '<' => true,    '=' => true,    '>=' => true,
+        '<=' => true,    '<>' => true,    '|' => true,    ':' => true
+    );
+
+    /**
+     * List of binary operators (those that expect two operands)
+     *
+     * @access    private
+     * @var array
+     */
+    private static $binaryOperators = array(
+        '+' => true,    '-' => true,    '*' => true,    '/' => true,
+        '^' => true,    '&' => true,    '>' => true,    '<' => true,
+        '=' => true,    '>=' => true,    '<=' => true,    '<>' => true,
+        '|' => true,    ':' => true
+    );
+
+    /**
+     * The debug log generated by the calculation engine
+     *
+     * @access    private
+     * @var PHPExcel_CalcEngine_Logger
+     *
+     */
+    private $debugLog;
+
+    /**
+     * Flag to determine how formula errors should be handled
+     *        If true, then a user error will be triggered
+     *        If false, then an exception will be thrown
+     *
+     * @access    public
+     * @var boolean
+     *
+     */
+    public $suppressFormulaErrors = false;
+
+    /**
+     * Error message for any error that was raised/thrown by the calculation engine
+     *
+     * @access    public
+     * @var string
+     *
+     */
+    public $formulaError = null;
+
+    /**
+     * An array of the nested cell references accessed by the calculation engine, used for the debug log
+     *
+     * @access    private
+     * @var array of string
+     *
+     */
+    private $cyclicReferenceStack;
+
+    private $cellStack = array();
+
+    /**
+     * Current iteration counter for cyclic formulae
+     * If the value is 0 (or less) then cyclic formulae will throw an exception,
+     *    otherwise they will iterate to the limit defined here before returning a result
+     *
+     * @var integer
+     *
+     */
+    private $cyclicFormulaCounter = 1;
+
+    private $cyclicFormulaCell = '';
+
+    /**
+     * Number of iterations for cyclic formulae
+     *
+     * @var integer
+     *
+     */
+    public $cyclicFormulaCount = 1;
+
+    /**
+     * Epsilon Precision used for comparisons in calculations
+     *
+     * @var float
+     *
+     */
+    private $delta    = 0.1e-12;
+
+
+    /**
+     * The current locale setting
+     *
+     * @var string
+     *
+     */
+    private static $localeLanguage = 'en_us';                    //    US English    (default locale)
+
+    /**
+     * List of available locale settings
+     * Note that this is read for the locale subdirectory only when requested
+     *
+     * @var string[]
+     *
+     */
+    private static $validLocaleLanguages = array(
+        'en'        //    English        (default language)
+    );
+
+    /**
+     * Locale-specific argument separator for function arguments
+     *
+     * @var string
+     *
+     */
+    private static $localeArgumentSeparator = ',';
+    private static $localeFunctions = array();
+
+    /**
+     * Locale-specific translations for Excel constants (True, False and Null)
+     *
+     * @var string[]
+     *
+     */
+    public static $localeBoolean = array(
+        'TRUE'  => 'TRUE',
+        'FALSE' => 'FALSE',
+        'NULL'  => 'NULL'
+    );
+
+    /**
+     * Excel constant string translations to their PHP equivalents
+     * Constant conversion from text name/value to actual (datatyped) value
+     *
+     * @var string[]
+     *
+     */
+    private static $excelConstants = array(
+        'TRUE'  => true,
+        'FALSE' => false,
+        'NULL'  => null
+    );
+
+     //    PHPExcel functions
+    private static $PHPExcelFunctions = array(
+        'ABS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'abs',
+            'argumentCount' => '1'
+        ),
+        'ACCRINT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::ACCRINT',
+            'argumentCount' => '4-7'
+        ),
+        'ACCRINTM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::ACCRINTM',
+            'argumentCount' => '3-5'
+        ),
+        'ACOS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'acos',
+            'argumentCount' => '1'
+        ),
+        'ACOSH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'acosh',
+            'argumentCount' => '1'
+        ),
+        'ADDRESS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::CELL_ADDRESS',
+            'argumentCount' => '2-5'
+        ),
+        'AMORDEGRC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::AMORDEGRC',
+            'argumentCount' => '6,7'
+        ),
+        'AMORLINC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::AMORLINC',
+            'argumentCount' => '6,7'
+        ),
+        'AND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::LOGICAL_AND',
+            'argumentCount' => '1+'
+        ),
+        'AREAS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'ASC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'ASIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'asin',
+            'argumentCount' => '1'
+        ),
+        'ASINH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'asinh',
+            'argumentCount' => '1'
+        ),
+        'ATAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'atan',
+            'argumentCount' => '1'
+        ),
+        'ATAN2' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::ATAN2',
+            'argumentCount' => '2'
+        ),
+        'ATANH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'atanh',
+            'argumentCount' => '1'
+        ),
+        'AVEDEV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::AVEDEV',
+            'argumentCount' => '1+'
+        ),
+        'AVERAGE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::AVERAGE',
+            'argumentCount' => '1+'
+        ),
+        'AVERAGEA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::AVERAGEA',
+            'argumentCount' => '1+'
+        ),
+        'AVERAGEIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::AVERAGEIF',
+            'argumentCount' => '2,3'
+        ),
+        'AVERAGEIFS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '3+'
+        ),
+        'BAHTTEXT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'BESSELI' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELI',
+            'argumentCount' => '2'
+        ),
+        'BESSELJ' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELJ',
+            'argumentCount' => '2'
+        ),
+        'BESSELK' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELK',
+            'argumentCount' => '2'
+        ),
+        'BESSELY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELY',
+            'argumentCount' => '2'
+        ),
+        'BETADIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::BETADIST',
+            'argumentCount' => '3-5'
+        ),
+        'BETAINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::BETAINV',
+            'argumentCount' => '3-5'
+        ),
+        'BIN2DEC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BINTODEC',
+            'argumentCount' => '1'
+        ),
+        'BIN2HEX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BINTOHEX',
+            'argumentCount' => '1,2'
+        ),
+        'BIN2OCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::BINTOOCT',
+            'argumentCount' => '1,2'
+        ),
+        'BINOMDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::BINOMDIST',
+            'argumentCount' => '4'
+        ),
+        'CEILING' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::CEILING',
+            'argumentCount' => '2'
+        ),
+        'CELL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1,2'
+        ),
+        'CHAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::CHARACTER',
+            'argumentCount' => '1'
+        ),
+        'CHIDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::CHIDIST',
+            'argumentCount' => '2'
+        ),
+        'CHIINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::CHIINV',
+            'argumentCount' => '2'
+        ),
+        'CHITEST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2'
+        ),
+        'CHOOSE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::CHOOSE',
+            'argumentCount' => '2+'
+        ),
+        'CLEAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::TRIMNONPRINTABLE',
+            'argumentCount' => '1'
+        ),
+        'CODE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::ASCIICODE',
+            'argumentCount' => '1'
+        ),
+        'COLUMN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::COLUMN',
+            'argumentCount' => '-1',
+            'passByReference' => array(true)
+        ),
+        'COLUMNS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::COLUMNS',
+            'argumentCount' => '1'
+        ),
+        'COMBIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::COMBIN',
+            'argumentCount' => '2'
+        ),
+        'COMPLEX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::COMPLEX',
+            'argumentCount' => '2,3'
+        ),
+        'CONCATENATE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::CONCATENATE',
+            'argumentCount' => '1+'
+        ),
+        'CONFIDENCE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::CONFIDENCE',
+            'argumentCount' => '3'
+        ),
+        'CONVERT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::CONVERTUOM',
+            'argumentCount' => '3'
+        ),
+        'CORREL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::CORREL',
+            'argumentCount' => '2'
+        ),
+        'COS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'cos',
+            'argumentCount' => '1'
+        ),
+        'COSH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'cosh',
+            'argumentCount' => '1'
+        ),
+        'COUNT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::COUNT',
+            'argumentCount' => '1+'
+        ),
+        'COUNTA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::COUNTA',
+            'argumentCount' => '1+'
+        ),
+        'COUNTBLANK' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::COUNTBLANK',
+            'argumentCount' => '1'
+        ),
+        'COUNTIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::COUNTIF',
+            'argumentCount' => '2'
+        ),
+        'COUNTIFS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2'
+        ),
+        'COUPDAYBS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::COUPDAYBS',
+            'argumentCount' => '3,4'
+        ),
+        'COUPDAYS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::COUPDAYS',
+            'argumentCount' => '3,4'
+        ),
+        'COUPDAYSNC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::COUPDAYSNC',
+            'argumentCount' => '3,4'
+        ),
+        'COUPNCD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::COUPNCD',
+            'argumentCount' => '3,4'
+        ),
+        'COUPNUM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::COUPNUM',
+            'argumentCount' => '3,4'
+        ),
+        'COUPPCD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::COUPPCD',
+            'argumentCount' => '3,4'
+        ),
+        'COVAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::COVAR',
+            'argumentCount' => '2'
+        ),
+        'CRITBINOM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::CRITBINOM',
+            'argumentCount' => '3'
+        ),
+        'CUBEKPIMEMBER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUBEMEMBER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUBEMEMBERPROPERTY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUBERANKEDMEMBER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUBESET' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUBESETCOUNT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUBEVALUE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_CUBE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '?'
+        ),
+        'CUMIPMT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::CUMIPMT',
+            'argumentCount' => '6'
+        ),
+        'CUMPRINC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::CUMPRINC',
+            'argumentCount' => '6'
+        ),
+        'DATE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DATE',
+            'argumentCount' => '3'
+        ),
+        'DATEDIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DATEDIF',
+            'argumentCount' => '2,3'
+        ),
+        'DATEVALUE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DATEVALUE',
+            'argumentCount' => '1'
+        ),
+        'DAVERAGE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DAVERAGE',
+            'argumentCount' => '3'
+        ),
+        'DAY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DAYOFMONTH',
+            'argumentCount' => '1'
+        ),
+        'DAYS360' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DAYS360',
+            'argumentCount' => '2,3'
+        ),
+        'DB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::DB',
+            'argumentCount' => '4,5'
+        ),
+        'DCOUNT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DCOUNT',
+            'argumentCount' => '3'
+        ),
+        'DCOUNTA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DCOUNTA',
+            'argumentCount' => '3'
+        ),
+        'DDB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::DDB',
+            'argumentCount' => '4,5'
+        ),
+        'DEC2BIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::DECTOBIN',
+            'argumentCount' => '1,2'
+        ),
+        'DEC2HEX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::DECTOHEX',
+            'argumentCount' => '1,2'
+        ),
+        'DEC2OCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::DECTOOCT',
+            'argumentCount' => '1,2'
+        ),
+        'DEGREES' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'rad2deg',
+            'argumentCount' => '1'
+        ),
+        'DELTA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::DELTA',
+            'argumentCount' => '1,2'
+        ),
+        'DEVSQ' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::DEVSQ',
+            'argumentCount' => '1+'
+        ),
+        'DGET' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DGET',
+            'argumentCount' => '3'
+        ),
+        'DISC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::DISC',
+            'argumentCount' => '4,5'
+        ),
+        'DMAX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DMAX',
+            'argumentCount' => '3'
+        ),
+        'DMIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DMIN',
+            'argumentCount' => '3'
+        ),
+        'DOLLAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::DOLLAR',
+            'argumentCount' => '1,2'
+        ),
+        'DOLLARDE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::DOLLARDE',
+            'argumentCount' => '2'
+        ),
+        'DOLLARFR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::DOLLARFR',
+            'argumentCount' => '2'
+        ),
+        'DPRODUCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DPRODUCT',
+            'argumentCount' => '3'
+        ),
+        'DSTDEV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DSTDEV',
+            'argumentCount' => '3'
+        ),
+        'DSTDEVP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DSTDEVP',
+            'argumentCount' => '3'
+        ),
+        'DSUM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DSUM',
+            'argumentCount' => '3'
+        ),
+        'DURATION' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '5,6'
+        ),
+        'DVAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DVAR',
+            'argumentCount' => '3'
+        ),
+        'DVARP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATABASE,
+            'functionCall' => 'PHPExcel_Calculation_Database::DVARP',
+            'argumentCount' => '3'
+        ),
+        'EDATE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::EDATE',
+            'argumentCount' => '2'
+        ),
+        'EFFECT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::EFFECT',
+            'argumentCount' => '2'
+        ),
+        'EOMONTH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::EOMONTH',
+            'argumentCount' => '2'
+        ),
+        'ERF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::ERF',
+            'argumentCount' => '1,2'
+        ),
+        'ERFC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::ERFC',
+            'argumentCount' => '1'
+        ),
+        'ERROR.TYPE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::ERROR_TYPE',
+            'argumentCount' => '1'
+        ),
+        'EVEN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::EVEN',
+            'argumentCount' => '1'
+        ),
+        'EXACT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2'
+        ),
+        'EXP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'exp',
+            'argumentCount' => '1'
+        ),
+        'EXPONDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::EXPONDIST',
+            'argumentCount' => '3'
+        ),
+        'FACT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::FACT',
+            'argumentCount' => '1'
+        ),
+        'FACTDOUBLE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::FACTDOUBLE',
+            'argumentCount' => '1'
+        ),
+        'FALSE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::FALSE',
+            'argumentCount' => '0'
+        ),
+        'FDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '3'
+        ),
+        'FIND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHSENSITIVE',
+            'argumentCount' => '2,3'
+        ),
+        'FINDB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHSENSITIVE',
+            'argumentCount' => '2,3'
+        ),
+        'FINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '3'
+        ),
+        'FISHER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::FISHER',
+            'argumentCount' => '1'
+        ),
+        'FISHERINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::FISHERINV',
+            'argumentCount' => '1'
+        ),
+        'FIXED' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::FIXEDFORMAT',
+            'argumentCount' => '1-3'
+        ),
+        'FLOOR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::FLOOR',
+            'argumentCount' => '2'
+        ),
+        'FORECAST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::FORECAST',
+            'argumentCount' => '3'
+        ),
+        'FREQUENCY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2'
+        ),
+        'FTEST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2'
+        ),
+        'FV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::FV',
+            'argumentCount' => '3-5'
+        ),
+        'FVSCHEDULE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::FVSCHEDULE',
+            'argumentCount' => '2'
+        ),
+        'GAMMADIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::GAMMADIST',
+            'argumentCount' => '4'
+        ),
+        'GAMMAINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::GAMMAINV',
+            'argumentCount' => '3'
+        ),
+        'GAMMALN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::GAMMALN',
+            'argumentCount' => '1'
+        ),
+        'GCD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::GCD',
+            'argumentCount' => '1+'
+        ),
+        'GEOMEAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::GEOMEAN',
+            'argumentCount' => '1+'
+        ),
+        'GESTEP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::GESTEP',
+            'argumentCount' => '1,2'
+        ),
+        'GETPIVOTDATA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2+'
+        ),
+        'GROWTH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::GROWTH',
+            'argumentCount' => '1-4'
+        ),
+        'HARMEAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::HARMEAN',
+            'argumentCount' => '1+'
+        ),
+        'HEX2BIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::HEXTOBIN',
+            'argumentCount' => '1,2'
+        ),
+        'HEX2DEC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::HEXTODEC',
+            'argumentCount' => '1'
+        ),
+        'HEX2OCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::HEXTOOCT',
+            'argumentCount' => '1,2'
+        ),
+        'HLOOKUP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::HLOOKUP',
+            'argumentCount' => '3,4'
+        ),
+        'HOUR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::HOUROFDAY',
+            'argumentCount' => '1'
+        ),
+        'HYPERLINK' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::HYPERLINK',
+            'argumentCount' => '1,2',
+            'passCellReference' => true
+        ),
+        'HYPGEOMDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::HYPGEOMDIST',
+            'argumentCount' => '4'
+        ),
+        'IF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::STATEMENT_IF',
+            'argumentCount' => '1-3'
+        ),
+        'IFERROR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::IFERROR',
+            'argumentCount' => '2'
+        ),
+        'IMABS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMABS',
+            'argumentCount' => '1'
+        ),
+        'IMAGINARY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMAGINARY',
+            'argumentCount' => '1'
+        ),
+        'IMARGUMENT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMARGUMENT',
+            'argumentCount' => '1'
+        ),
+        'IMCONJUGATE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMCONJUGATE',
+            'argumentCount' => '1'
+        ),
+        'IMCOS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMCOS',
+            'argumentCount' => '1'
+        ),
+        'IMDIV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMDIV',
+            'argumentCount' => '2'
+        ),
+        'IMEXP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMEXP',
+            'argumentCount' => '1'
+        ),
+        'IMLN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMLN',
+            'argumentCount' => '1'
+        ),
+        'IMLOG10' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMLOG10',
+            'argumentCount' => '1'
+        ),
+        'IMLOG2' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMLOG2',
+            'argumentCount' => '1'
+        ),
+        'IMPOWER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMPOWER',
+            'argumentCount' => '2'
+        ),
+        'IMPRODUCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMPRODUCT',
+            'argumentCount' => '1+'
+        ),
+        'IMREAL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMREAL',
+            'argumentCount' => '1'
+        ),
+        'IMSIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMSIN',
+            'argumentCount' => '1'
+        ),
+        'IMSQRT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMSQRT',
+            'argumentCount' => '1'
+        ),
+        'IMSUB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMSUB',
+            'argumentCount' => '2'
+        ),
+        'IMSUM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::IMSUM',
+            'argumentCount' => '1+'
+        ),
+        'INDEX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::INDEX',
+            'argumentCount' => '1-4'
+        ),
+        'INDIRECT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::INDIRECT',
+            'argumentCount' => '1,2',
+            'passCellReference' => true
+        ),
+        'INFO' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'INT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::INT',
+            'argumentCount' => '1'
+        ),
+        'INTERCEPT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::INTERCEPT',
+            'argumentCount' => '2'
+        ),
+        'INTRATE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::INTRATE',
+            'argumentCount' => '4,5'
+        ),
+        'IPMT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::IPMT',
+            'argumentCount' => '4-6'
+        ),
+        'IRR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::IRR',
+            'argumentCount' => '1,2'
+        ),
+        'ISBLANK' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_BLANK',
+            'argumentCount' => '1'
+        ),
+        'ISERR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_ERR',
+            'argumentCount' => '1'
+        ),
+        'ISERROR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_ERROR',
+            'argumentCount' => '1'
+        ),
+        'ISEVEN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_EVEN',
+            'argumentCount' => '1'
+        ),
+        'ISLOGICAL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_LOGICAL',
+            'argumentCount' => '1'
+        ),
+        'ISNA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_NA',
+            'argumentCount' => '1'
+        ),
+        'ISNONTEXT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_NONTEXT',
+            'argumentCount' => '1'
+        ),
+        'ISNUMBER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_NUMBER',
+            'argumentCount' => '1'
+        ),
+        'ISODD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_ODD',
+            'argumentCount' => '1'
+        ),
+        'ISPMT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::ISPMT',
+            'argumentCount' => '4'
+        ),
+        'ISREF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'ISTEXT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::IS_TEXT',
+            'argumentCount' => '1'
+        ),
+        'JIS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'KURT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::KURT',
+            'argumentCount' => '1+'
+        ),
+        'LARGE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::LARGE',
+            'argumentCount' => '2'
+        ),
+        'LCM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::LCM',
+            'argumentCount' => '1+'
+        ),
+        'LEFT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::LEFT',
+            'argumentCount' => '1,2'
+        ),
+        'LEFTB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::LEFT',
+            'argumentCount' => '1,2'
+        ),
+        'LEN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::STRINGLENGTH',
+            'argumentCount' => '1'
+        ),
+        'LENB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::STRINGLENGTH',
+            'argumentCount' => '1'
+        ),
+        'LINEST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::LINEST',
+            'argumentCount' => '1-4'
+        ),
+        'LN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'log',
+            'argumentCount' => '1'
+        ),
+        'LOG' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::LOG_BASE',
+            'argumentCount' => '1,2'
+        ),
+        'LOG10' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'log10',
+            'argumentCount' => '1'
+        ),
+        'LOGEST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::LOGEST',
+            'argumentCount' => '1-4'
+        ),
+        'LOGINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::LOGINV',
+            'argumentCount' => '3'
+        ),
+        'LOGNORMDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::LOGNORMDIST',
+            'argumentCount' => '3'
+        ),
+        'LOOKUP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::LOOKUP',
+            'argumentCount' => '2,3'
+        ),
+        'LOWER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::LOWERCASE',
+            'argumentCount' => '1'
+        ),
+        'MATCH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::MATCH',
+            'argumentCount' => '2,3'
+        ),
+        'MAX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MAX',
+            'argumentCount' => '1+'
+        ),
+        'MAXA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MAXA',
+            'argumentCount' => '1+'
+        ),
+        'MAXIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MAXIF',
+            'argumentCount' => '2+'
+        ),
+        'MDETERM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::MDETERM',
+            'argumentCount' => '1'
+        ),
+        'MDURATION' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '5,6'
+        ),
+        'MEDIAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MEDIAN',
+            'argumentCount' => '1+'
+        ),
+        'MEDIANIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2+'
+        ),
+        'MID' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::MID',
+            'argumentCount' => '3'
+        ),
+        'MIDB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::MID',
+            'argumentCount' => '3'
+        ),
+        'MIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MIN',
+            'argumentCount' => '1+'
+        ),
+        'MINA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MINA',
+            'argumentCount' => '1+'
+        ),
+        'MINIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MINIF',
+            'argumentCount' => '2+'
+        ),
+        'MINUTE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::MINUTEOFHOUR',
+            'argumentCount' => '1'
+        ),
+        'MINVERSE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::MINVERSE',
+            'argumentCount' => '1'
+        ),
+        'MIRR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::MIRR',
+            'argumentCount' => '3'
+        ),
+        'MMULT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::MMULT',
+            'argumentCount' => '2'
+        ),
+        'MOD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::MOD',
+            'argumentCount' => '2'
+        ),
+        'MODE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::MODE',
+            'argumentCount' => '1+'
+        ),
+        'MONTH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::MONTHOFYEAR',
+            'argumentCount' => '1'
+        ),
+        'MROUND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::MROUND',
+            'argumentCount' => '2'
+        ),
+        'MULTINOMIAL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::MULTINOMIAL',
+            'argumentCount' => '1+'
+        ),
+        'N' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::N',
+            'argumentCount' => '1'
+        ),
+        'NA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::NA',
+            'argumentCount' => '0'
+        ),
+        'NEGBINOMDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::NEGBINOMDIST',
+            'argumentCount' => '3'
+        ),
+        'NETWORKDAYS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::NETWORKDAYS',
+            'argumentCount' => '2+'
+        ),
+        'NOMINAL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::NOMINAL',
+            'argumentCount' => '2'
+        ),
+        'NORMDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::NORMDIST',
+            'argumentCount' => '4'
+        ),
+        'NORMINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::NORMINV',
+            'argumentCount' => '3'
+        ),
+        'NORMSDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::NORMSDIST',
+            'argumentCount' => '1'
+        ),
+        'NORMSINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::NORMSINV',
+            'argumentCount' => '1'
+        ),
+        'NOT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::NOT',
+            'argumentCount' => '1'
+        ),
+        'NOW' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DATETIMENOW',
+            'argumentCount' => '0'
+        ),
+        'NPER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::NPER',
+            'argumentCount' => '3-5'
+        ),
+        'NPV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::NPV',
+            'argumentCount' => '2+'
+        ),
+        'OCT2BIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::OCTTOBIN',
+            'argumentCount' => '1,2'
+        ),
+        'OCT2DEC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::OCTTODEC',
+            'argumentCount' => '1'
+        ),
+        'OCT2HEX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
+            'functionCall' => 'PHPExcel_Calculation_Engineering::OCTTOHEX',
+            'argumentCount' => '1,2'
+        ),
+        'ODD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::ODD',
+            'argumentCount' => '1'
+        ),
+        'ODDFPRICE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '8,9'
+        ),
+        'ODDFYIELD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '8,9'
+        ),
+        'ODDLPRICE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '7,8'
+        ),
+        'ODDLYIELD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '7,8'
+        ),
+        'OFFSET' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::OFFSET',
+            'argumentCount' => '3-5',
+            'passCellReference' => true,
+            'passByReference' => array(true)
+        ),
+        'OR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::LOGICAL_OR',
+            'argumentCount' => '1+'
+        ),
+        'PEARSON' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::CORREL',
+            'argumentCount' => '2'
+        ),
+        'PERCENTILE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::PERCENTILE',
+            'argumentCount' => '2'
+        ),
+        'PERCENTRANK' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::PERCENTRANK',
+            'argumentCount' => '2,3'
+        ),
+        'PERMUT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::PERMUT',
+            'argumentCount' => '2'
+        ),
+        'PHONETIC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1'
+        ),
+        'PI' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'pi',
+            'argumentCount' => '0'
+        ),
+        'PMT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::PMT',
+            'argumentCount' => '3-5'
+        ),
+        'POISSON' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::POISSON',
+            'argumentCount' => '3'
+        ),
+        'POWER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::POWER',
+            'argumentCount' => '2'
+        ),
+        'PPMT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::PPMT',
+            'argumentCount' => '4-6'
+        ),
+        'PRICE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::PRICE',
+            'argumentCount' => '6,7'
+        ),
+        'PRICEDISC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::PRICEDISC',
+            'argumentCount' => '4,5'
+        ),
+        'PRICEMAT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::PRICEMAT',
+            'argumentCount' => '5,6'
+        ),
+        'PROB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '3,4'
+        ),
+        'PRODUCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::PRODUCT',
+            'argumentCount' => '1+'
+        ),
+        'PROPER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::PROPERCASE',
+            'argumentCount' => '1'
+        ),
+        'PV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::PV',
+            'argumentCount' => '3-5'
+        ),
+        'QUARTILE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::QUARTILE',
+            'argumentCount' => '2'
+        ),
+        'QUOTIENT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::QUOTIENT',
+            'argumentCount' => '2'
+        ),
+        'RADIANS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'deg2rad',
+            'argumentCount' => '1'
+        ),
+        'RAND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::RAND',
+            'argumentCount' => '0'
+        ),
+        'RANDBETWEEN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::RAND',
+            'argumentCount' => '2'
+        ),
+        'RANK' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::RANK',
+            'argumentCount' => '2,3'
+        ),
+        'RATE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::RATE',
+            'argumentCount' => '3-6'
+        ),
+        'RECEIVED' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::RECEIVED',
+            'argumentCount' => '4-5'
+        ),
+        'REPLACE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::REPLACE',
+            'argumentCount' => '4'
+        ),
+        'REPLACEB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::REPLACE',
+            'argumentCount' => '4'
+        ),
+        'REPT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'str_repeat',
+            'argumentCount' => '2'
+        ),
+        'RIGHT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::RIGHT',
+            'argumentCount' => '1,2'
+        ),
+        'RIGHTB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::RIGHT',
+            'argumentCount' => '1,2'
+        ),
+        'ROMAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::ROMAN',
+            'argumentCount' => '1,2'
+        ),
+        'ROUND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'round',
+            'argumentCount' => '2'
+        ),
+        'ROUNDDOWN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::ROUNDDOWN',
+            'argumentCount' => '2'
+        ),
+        'ROUNDUP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::ROUNDUP',
+            'argumentCount' => '2'
+        ),
+        'ROW' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::ROW',
+            'argumentCount' => '-1',
+            'passByReference' => array(true)
+        ),
+        'ROWS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::ROWS',
+            'argumentCount' => '1'
+        ),
+        'RSQ' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::RSQ',
+            'argumentCount' => '2'
+        ),
+        'RTD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '1+'
+        ),
+        'SEARCH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE',
+            'argumentCount' => '2,3'
+        ),
+        'SEARCHB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE',
+            'argumentCount' => '2,3'
+        ),
+        'SECOND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::SECONDOFMINUTE',
+            'argumentCount' => '1'
+        ),
+        'SERIESSUM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SERIESSUM',
+            'argumentCount' => '4'
+        ),
+        'SIGN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SIGN',
+            'argumentCount' => '1'
+        ),
+        'SIN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'sin',
+            'argumentCount' => '1'
+        ),
+        'SINH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'sinh',
+            'argumentCount' => '1'
+        ),
+        'SKEW' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::SKEW',
+            'argumentCount' => '1+'
+        ),
+        'SLN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::SLN',
+            'argumentCount' => '3'
+        ),
+        'SLOPE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::SLOPE',
+            'argumentCount' => '2'
+        ),
+        'SMALL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::SMALL',
+            'argumentCount' => '2'
+        ),
+        'SQRT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'sqrt',
+            'argumentCount' => '1'
+        ),
+        'SQRTPI' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SQRTPI',
+            'argumentCount' => '1'
+        ),
+        'STANDARDIZE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::STANDARDIZE',
+            'argumentCount' => '3'
+        ),
+        'STDEV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::STDEV',
+            'argumentCount' => '1+'
+        ),
+        'STDEVA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::STDEVA',
+            'argumentCount' => '1+'
+        ),
+        'STDEVP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::STDEVP',
+            'argumentCount' => '1+'
+        ),
+        'STDEVPA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::STDEVPA',
+            'argumentCount' => '1+'
+        ),
+        'STEYX' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::STEYX',
+            'argumentCount' => '2'
+        ),
+        'SUBSTITUTE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::SUBSTITUTE',
+            'argumentCount' => '3,4'
+        ),
+        'SUBTOTAL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUBTOTAL',
+            'argumentCount' => '2+'
+        ),
+        'SUM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUM',
+            'argumentCount' => '1+'
+        ),
+        'SUMIF' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMIF',
+            'argumentCount' => '2,3'
+        ),
+        'SUMIFS' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMIFS',
+            'argumentCount' => '3+'
+        ),
+        'SUMPRODUCT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMPRODUCT',
+            'argumentCount' => '1+'
+        ),
+        'SUMSQ' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMSQ',
+            'argumentCount' => '1+'
+        ),
+        'SUMX2MY2' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMX2MY2',
+            'argumentCount' => '2'
+        ),
+        'SUMX2PY2' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMX2PY2',
+            'argumentCount' => '2'
+        ),
+        'SUMXMY2' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMXMY2',
+            'argumentCount' => '2'
+        ),
+        'SYD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::SYD',
+            'argumentCount' => '4'
+        ),
+        'T' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::RETURNSTRING',
+            'argumentCount' => '1'
+        ),
+        'TAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'tan',
+            'argumentCount' => '1'
+        ),
+        'TANH' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'tanh',
+            'argumentCount' => '1'
+        ),
+        'TBILLEQ' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::TBILLEQ',
+            'argumentCount' => '3'
+        ),
+        'TBILLPRICE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::TBILLPRICE',
+            'argumentCount' => '3'
+        ),
+        'TBILLYIELD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::TBILLYIELD',
+            'argumentCount' => '3'
+        ),
+        'TDIST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::TDIST',
+            'argumentCount' => '3'
+        ),
+        'TEXT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::TEXTFORMAT',
+            'argumentCount' => '2'
+        ),
+        'TIME' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::TIME',
+            'argumentCount' => '3'
+        ),
+        'TIMEVALUE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::TIMEVALUE',
+            'argumentCount' => '1'
+        ),
+        'TINV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::TINV',
+            'argumentCount' => '2'
+        ),
+        'TODAY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DATENOW',
+            'argumentCount' => '0'
+        ),
+        'TRANSPOSE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::TRANSPOSE',
+            'argumentCount' => '1'
+        ),
+        'TREND' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::TREND',
+            'argumentCount' => '1-4'
+        ),
+        'TRIM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::TRIMSPACES',
+            'argumentCount' => '1'
+        ),
+        'TRIMMEAN' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::TRIMMEAN',
+            'argumentCount' => '2'
+        ),
+        'TRUE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
+            'functionCall' => 'PHPExcel_Calculation_Logical::TRUE',
+            'argumentCount' => '0'
+        ),
+        'TRUNC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'PHPExcel_Calculation_MathTrig::TRUNC',
+            'argumentCount' => '1,2'
+        ),
+        'TTEST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '4'
+        ),
+        'TYPE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::TYPE',
+            'argumentCount' => '1'
+        ),
+        'UPPER' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::UPPERCASE',
+            'argumentCount' => '1'
+        ),
+        'USDOLLAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '2'
+        ),
+        'VALUE' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => 'PHPExcel_Calculation_TextData::VALUE',
+            'argumentCount' => '1'
+        ),
+        'VAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::VARFunc',
+            'argumentCount' => '1+'
+        ),
+        'VARA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::VARA',
+            'argumentCount' => '1+'
+        ),
+        'VARP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::VARP',
+            'argumentCount' => '1+'
+        ),
+        'VARPA' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::VARPA',
+            'argumentCount' => '1+'
+        ),
+        'VDB' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '5-7'
+        ),
+        'VERSION' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
+            'functionCall' => 'PHPExcel_Calculation_Functions::VERSION',
+            'argumentCount' => '0'
+        ),
+        'VLOOKUP' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => 'PHPExcel_Calculation_LookupRef::VLOOKUP',
+            'argumentCount' => '3,4'
+        ),
+        'WEEKDAY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::DAYOFWEEK',
+            'argumentCount' => '1,2'
+        ),
+        'WEEKNUM' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::WEEKOFYEAR',
+            'argumentCount' => '1,2'
+        ),
+        'WEIBULL' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::WEIBULL',
+            'argumentCount' => '4'
+        ),
+        'WORKDAY' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::WORKDAY',
+            'argumentCount' => '2+'
+        ),
+        'XIRR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::XIRR',
+            'argumentCount' => '2,3'
+        ),
+        'XNPV' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::XNPV',
+            'argumentCount' => '3'
+        ),
+        'YEAR' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::YEAR',
+            'argumentCount' => '1'
+        ),
+        'YEARFRAC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
+            'functionCall' => 'PHPExcel_Calculation_DateTime::YEARFRAC',
+            'argumentCount' => '2,3'
+        ),
+        'YIELD' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Functions::DUMMY',
+            'argumentCount' => '6,7'
+        ),
+        'YIELDDISC' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::YIELDDISC',
+            'argumentCount' => '4,5'
+        ),
+        'YIELDMAT' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
+            'functionCall' => 'PHPExcel_Calculation_Financial::YIELDMAT',
+            'argumentCount' => '5,6'
+        ),
+        'ZTEST' => array(
+            'category' => PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
+            'functionCall' => 'PHPExcel_Calculation_Statistical::ZTEST',
+            'argumentCount' => '2-3'
+        )
+    );
+
+    //    Internal functions used for special control purposes
+    private static $controlFunctions = array(
+        'MKMATRIX' => array(
+            'argumentCount' => '*',
+            'functionCall' => 'self::mkMatrix'
+        )
+    );
+
+
+    public function __construct(PHPExcel $workbook = null)
+    {
+        $this->delta = 1 * pow(10, 0 - ini_get('precision'));
+
+        $this->workbook = $workbook;
+        $this->cyclicReferenceStack = new PHPExcel_CalcEngine_CyclicReferenceStack();
+        $this->_debugLog = new PHPExcel_CalcEngine_Logger($this->cyclicReferenceStack);
+    }
+
+
+    private static function loadLocales()
+    {
+        $localeFileDirectory = PHPEXCEL_ROOT.'PHPExcel/locale/';
+        foreach (glob($localeFileDirectory.'/*', GLOB_ONLYDIR) as $filename) {
+            $filename = substr($filename, strlen($localeFileDirectory)+1);
+            if ($filename != 'en') {
+                self::$validLocaleLanguages[] = $filename;
+            }
+        }
+    }
+
+    /**
+     * Get an instance of this class
+     *
+     * @access    public
+     * @param   PHPExcel $workbook  Injected workbook for working with a PHPExcel object,
+     *                                    or NULL to create a standalone claculation engine
+     * @return PHPExcel_Calculation
+     */
+    public static function getInstance(PHPExcel $workbook = null)
+    {
+        if ($workbook !== null) {
+            $instance = $workbook->getCalculationEngine();
+            if (isset($instance)) {
+                return $instance;  
+            }
+        }
+
+        if (!isset(self::$instance) || (self::$instance === null)) {
+            self::$instance = new PHPExcel_Calculation();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * Unset an instance of this class
+     *
+     * @access    public
+     */
+    public function __destruct()
+    {
+        $this->workbook = null;
+    }
+
+    /**
+     * Flush the calculation cache for any existing instance of this class
+     *        but only if a PHPExcel_Calculation instance exists
+     *
+     * @access    public
+     * @return null
+     */
+    public function flushInstance()
+    {
+        $this->clearCalculationCache();
+    }
+
+
+    /**
+     * Get the debuglog for this claculation engine instance
+     *
+     * @access    public
+     * @return PHPExcel_CalcEngine_Logger
+     */
+    public function getDebugLog()
+    {
+        return $this->_debugLog;
+    }
+
+    /**
+     * __clone implementation. Cloning should not be allowed in a Singleton!
+     *
+     * @access    public
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    final public function __clone()
+    {
+        throw new PHPExcel_Calculation_Exception('Cloning the calculation engine is not allowed!');
+    }
+
+
+    /**
+     * Return the locale-specific translation of TRUE
+     *
+     * @access    public
+     * @return     string        locale-specific translation of TRUE
+     */
+    public static function getTRUE()
+    {
+        return self::$localeBoolean['TRUE'];
+    }
+
+    /**
+     * Return the locale-specific translation of FALSE
+     *
+     * @access    public
+     * @return     string        locale-specific translation of FALSE
+     */
+    public static function getFALSE()
+    {
+        return self::$localeBoolean['FALSE'];
+    }
+
+    /**
+     * Set the Array Return Type (Array or Value of first element in the array)
+     *
+     * @access    public
+     * @param     string    $returnType            Array return type
+     * @return     boolean                    Success or failure
+     */
+    public static function setArrayReturnType($returnType)
+    {
+        if (($returnType == self::RETURN_ARRAY_AS_VALUE) ||
+            ($returnType == self::RETURN_ARRAY_AS_ERROR) ||
+            ($returnType == self::RETURN_ARRAY_AS_ARRAY)) {
+            self::$returnArrayAsType = $returnType;
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Return the Array Return Type (Array or Value of first element in the array)
+     *
+     * @access    public
+     * @return     string        $returnType            Array return type
+     */
+    public static function getArrayReturnType()
+    {
+        return self::$returnArrayAsType;
+    }
+
+
+    /**
+     * Is calculation caching enabled?
+     *
+     * @access    public
+     * @return boolean
+     */
+    public function getCalculationCacheEnabled()
+    {
+        return $this->calculationCacheEnabled;
+    }
+
+    /**
+     * Enable/disable calculation cache
+     *
+     * @access    public
+     * @param boolean $pValue
+     */
+    public function setCalculationCacheEnabled($pValue = true)
+    {
+        $this->calculationCacheEnabled = $pValue;
+        $this->clearCalculationCache();
+    }
+
+
+    /**
+     * Enable calculation cache
+     */
+    public function enableCalculationCache()
+    {
+        $this->setCalculationCacheEnabled(true);
+    }
+
+
+    /**
+     * Disable calculation cache
+     */
+    public function disableCalculationCache()
+    {
+        $this->setCalculationCacheEnabled(false);
+    }
+
+
+    /**
+     * Clear calculation cache
+     */
+    public function clearCalculationCache()
+    {
+        $this->calculationCache = array();
+    }
+
+    /**
+     * Clear calculation cache for a specified worksheet
+     *
+     * @param string $worksheetName
+     */
+    public function clearCalculationCacheForWorksheet($worksheetName)
+    {
+        if (isset($this->calculationCache[$worksheetName])) {
+            unset($this->calculationCache[$worksheetName]);
+        }
+    }
+
+    /**
+     * Rename calculation cache for a specified worksheet
+     *
+     * @param string $fromWorksheetName
+     * @param string $toWorksheetName
+     */
+    public function renameCalculationCacheForWorksheet($fromWorksheetName, $toWorksheetName)
+    {
+        if (isset($this->calculationCache[$fromWorksheetName])) {
+            $this->calculationCache[$toWorksheetName] = &$this->calculationCache[$fromWorksheetName];
+            unset($this->calculationCache[$fromWorksheetName]);
+        }
+    }
+
+
+    /**
+     * Get the currently defined locale code
+     *
+     * @return string
+     */
+    public function getLocale()
+    {
+        return self::$localeLanguage;
+    }
+
+
+    /**
+     * Set the locale code
+     *
+     * @param string $locale  The locale to use for formula translation
+     * @return boolean
+     */
+    public function setLocale($locale = 'en_us')
+    {
+        //    Identify our locale and language
+        $language = $locale = strtolower($locale);
+        if (strpos($locale, '_') !== false) {
+            list($language) = explode('_', $locale);
+        }
+
+        if (count(self::$validLocaleLanguages) == 1) {
+            self::loadLocales();
+        }
+        //    Test whether we have any language data for this language (any locale)
+        if (in_array($language, self::$validLocaleLanguages)) {
+            //    initialise language/locale settings
+            self::$localeFunctions = array();
+            self::$localeArgumentSeparator = ',';
+            self::$localeBoolean = array('TRUE' => 'TRUE', 'FALSE' => 'FALSE', 'NULL' => 'NULL');
+            //    Default is English, if user isn't requesting english, then read the necessary data from the locale files
+            if ($locale != 'en_us') {
+                //    Search for a file with a list of function names for locale
+                $functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'functions';
+                if (!file_exists($functionNamesFile)) {
+                    //    If there isn't a locale specific function file, look for a language specific function file
+                    $functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
+                    if (!file_exists($functionNamesFile)) {
+                        return false;
+                    }
+                }
+                //    Retrieve the list of locale or language specific function names
+                $localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+                foreach ($localeFunctions as $localeFunction) {
+                    list($localeFunction) = explode('##', $localeFunction);    //    Strip out comments
+                    if (strpos($localeFunction, '=') !== false) {
+                        list($fName, $lfName) = explode('=', $localeFunction);
+                        $fName = trim($fName);
+                        $lfName = trim($lfName);
+                        if ((isset(self::$PHPExcelFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
+                            self::$localeFunctions[$fName] = $lfName;
+                        }
+                    }
+                }
+                //    Default the TRUE and FALSE constants to the locale names of the TRUE() and FALSE() functions
+                if (isset(self::$localeFunctions['TRUE'])) {
+                    self::$localeBoolean['TRUE'] = self::$localeFunctions['TRUE'];
+                }
+                if (isset(self::$localeFunctions['FALSE'])) {
+                    self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE'];
+                }
+
+                $configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'config';
+                if (!file_exists($configFile)) {
+                    $configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
+                }
+                if (file_exists($configFile)) {
+                    $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+                    foreach ($localeSettings as $localeSetting) {
+                        list($localeSetting) = explode('##', $localeSetting);    //    Strip out comments
+                        if (strpos($localeSetting, '=') !== false) {
+                            list($settingName, $settingValue) = explode('=', $localeSetting);
+                            $settingName = strtoupper(trim($settingName));
+                            switch ($settingName) {
+                                case 'ARGUMENTSEPARATOR':
+                                    self::$localeArgumentSeparator = trim($settingValue);
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            self::$functionReplaceFromExcel = self::$functionReplaceToExcel =
+            self::$functionReplaceFromLocale = self::$functionReplaceToLocale = null;
+            self::$localeLanguage = $locale;
+            return true;
+        }
+        return false;
+    }
+
+
+
+    public static function translateSeparator($fromSeparator, $toSeparator, $formula, &$inBraces)
+    {
+        $strlen = mb_strlen($formula);
+        for ($i = 0; $i < $strlen; ++$i) {
+            $chr = mb_substr($formula, $i, 1);
+            switch ($chr) {
+                case '{':
+                    $inBraces = true;
+                    break;
+                case '}':
+                    $inBraces = false;
+                    break;
+                case $fromSeparator:
+                    if (!$inBraces) {
+                        $formula = mb_substr($formula, 0, $i).$toSeparator.mb_substr($formula, $i+1);
+                    }
+            }
+        }
+        return $formula;
+    }
+
+    private static function translateFormula($from, $to, $formula, $fromSeparator, $toSeparator)
+    {
+        //    Convert any Excel function names to the required language
+        if (self::$localeLanguage !== 'en_us') {
+            $inBraces = false;
+            //    If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
+            if (strpos($formula, '"') !== false) {
+                //    So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
+                //        the formula
+                $temp = explode('"', $formula);
+                $i = false;
+                foreach ($temp as &$value) {
+                    //    Only count/replace in alternating array entries
+                    if ($i = !$i) {
+                        $value = preg_replace($from, $to, $value);
+                        $value = self::translateSeparator($fromSeparator, $toSeparator, $value, $inBraces);
+                    }
+                }
+                unset($value);
+                //    Then rebuild the formula string
+                $formula = implode('"', $temp);
+            } else {
+                //    If there's no quoted strings, then we do a simple count/replace
+                $formula = preg_replace($from, $to, $formula);
+                $formula = self::translateSeparator($fromSeparator, $toSeparator, $formula, $inBraces);
+            }
+        }
+
+        return $formula;
+    }
+
+    private static $functionReplaceFromExcel = null;
+    private static $functionReplaceToLocale  = null;
+
+    public function _translateFormulaToLocale($formula)
+    {
+        if (self::$functionReplaceFromExcel === null) {
+            self::$functionReplaceFromExcel = array();
+            foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName).'([\s]*\()/Ui';
+            }
+            foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
+            }
+
+        }
+
+        if (self::$functionReplaceToLocale === null) {
+            self::$functionReplaceToLocale = array();
+            foreach (array_values(self::$localeFunctions) as $localeFunctionName) {
+                self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
+            }
+            foreach (array_values(self::$localeBoolean) as $localeBoolean) {
+                self::$functionReplaceToLocale[] = '$1'.trim($localeBoolean).'$2';
+            }
+        }
+
+        return self::translateFormula(self::$functionReplaceFromExcel, self::$functionReplaceToLocale, $formula, ',', self::$localeArgumentSeparator);
+    }
+
+
+    private static $functionReplaceFromLocale = null;
+    private static $functionReplaceToExcel    = null;
+
+    public function _translateFormulaToEnglish($formula)
+    {
+        if (self::$functionReplaceFromLocale === null) {
+            self::$functionReplaceFromLocale = array();
+            foreach (array_values(self::$localeFunctions) as $localeFunctionName) {
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName).'([\s]*\()/Ui';
+            }
+            foreach (array_values(self::$localeBoolean) as $excelBoolean) {
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
+            }
+        }
+
+        if (self::$functionReplaceToExcel === null) {
+            self::$functionReplaceToExcel = array();
+            foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
+                self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
+            }
+            foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
+                self::$functionReplaceToExcel[] = '$1'.trim($excelBoolean).'$2';
+            }
+        }
+
+        return self::translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$localeArgumentSeparator, ',');
+    }
+
+
+    public static function localeFunc($function)
+    {
+        if (self::$localeLanguage !== 'en_us') {
+            $functionName = trim($function, '(');
+            if (isset(self::$localeFunctions[$functionName])) {
+                $brace = ($functionName != $function);
+                $function = self::$localeFunctions[$functionName];
+                if ($brace) {
+                    $function .= '(';
+                }
+            }
+        }
+        return $function;
+    }
+
+
+
+
+    /**
+     * Wrap string values in quotes
+     *
+     * @param mixed $value
+     * @return mixed
+     */
+    public static function wrapResult($value)
+    {
+        if (is_string($value)) {
+            //    Error values cannot be "wrapped"
+            if (preg_match('/^'.self::CALCULATION_REGEXP_ERROR.'$/i', $value, $match)) {
+                //    Return Excel errors "as is"
+                return $value;
+            }
+            //    Return strings wrapped in quotes
+            return '"'.$value.'"';
+        //    Convert numeric errors to NaN error
+        } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        return $value;
+    }
+
+
+    /**
+     * Remove quotes used as a wrapper to identify string values
+     *
+     * @param mixed $value
+     * @return mixed
+     */
+    public static function unwrapResult($value)
+    {
+        if (is_string($value)) {
+            if ((isset($value[0])) && ($value[0] == '"') && (substr($value, -1) == '"')) {
+                return substr($value, 1, -1);
+            }
+        //    Convert numeric errors to NaN error
+        } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return $value;
+    }
+
+
+
+
+    /**
+     * Calculate cell value (using formula from a cell ID)
+     * Retained for backward compatibility
+     *
+     * @access    public
+     * @param    PHPExcel_Cell    $pCell    Cell to calculate
+     * @return    mixed
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function calculate(PHPExcel_Cell $pCell = null)
+    {
+        try {
+            return $this->calculateCellValue($pCell);
+        } catch (PHPExcel_Exception $e) {
+            throw new PHPExcel_Calculation_Exception($e->getMessage());
+        }
+    }
+
+
+    /**
+     * Calculate the value of a cell formula
+     *
+     * @access    public
+     * @param    PHPExcel_Cell    $pCell        Cell to calculate
+     * @param    Boolean            $resetLog    Flag indicating whether the debug log should be reset or not
+     * @return    mixed
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function calculateCellValue(PHPExcel_Cell $pCell = null, $resetLog = true)
+    {
+        if ($pCell === null) {
+            return null;
+        }
+
+        $returnArrayAsType = self::$returnArrayAsType;
+        if ($resetLog) {
+            //    Initialise the logging settings if requested
+            $this->formulaError = null;
+            $this->_debugLog->clearLog();
+            $this->cyclicReferenceStack->clear();
+            $this->cyclicFormulaCounter = 1;
+
+            self::$returnArrayAsType = self::RETURN_ARRAY_AS_ARRAY;
+        }
+
+        //    Execute the calculation for the cell formula
+        $this->cellStack[] = array(
+            'sheet' => $pCell->getWorksheet()->getTitle(),
+            'cell' => $pCell->getCoordinate(),
+        );
+        try {
+            $result = self::unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
+            $cellAddress = array_pop($this->cellStack);
+            $this->workbook->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
+        } catch (PHPExcel_Exception $e) {
+            $cellAddress = array_pop($this->cellStack);
+            $this->workbook->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
+            throw new PHPExcel_Calculation_Exception($e->getMessage());
+        }
+
+        if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
+            self::$returnArrayAsType = $returnArrayAsType;
+            $testResult = PHPExcel_Calculation_Functions::flattenArray($result);
+            if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            //    If there's only a single cell in the array, then we allow it
+            if (count($testResult) != 1) {
+                //    If keys are numeric, then it's a matrix result rather than a cell range result, so we permit it
+                $r = array_keys($result);
+                $r = array_shift($r);
+                if (!is_numeric($r)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                if (is_array($result[$r])) {
+                    $c = array_keys($result[$r]);
+                    $c = array_shift($c);
+                    if (!is_numeric($c)) {
+                        return PHPExcel_Calculation_Functions::VALUE();
+                    }
+                }
+            }
+            $result = array_shift($testResult);
+        }
+        self::$returnArrayAsType = $returnArrayAsType;
+
+
+        if ($result === null) {
+            return 0;
+        } elseif ((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return $result;
+    }
+
+
+    /**
+     * Validate and parse a formula string
+     *
+     * @param    string        $formula        Formula to parse
+     * @return    array
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function parseFormula($formula)
+    {
+        //    Basic validation that this is indeed a formula
+        //    We return an empty array if not
+        $formula = trim($formula);
+        if ((!isset($formula[0])) || ($formula[0] != '=')) {
+            return array();
+        }
+        $formula = ltrim(substr($formula, 1));
+        if (!isset($formula[0])) {
+            return array();
+        }
+
+        //    Parse the formula and return the token stack
+        return $this->_parseFormula($formula);
+    }
+
+
+    /**
+     * Calculate the value of a formula
+     *
+     * @param    string            $formula    Formula to parse
+     * @param    string            $cellID        Address of the cell to calculate
+     * @param    PHPExcel_Cell    $pCell        Cell to calculate
+     * @return    mixed
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function calculateFormula($formula, $cellID = null, PHPExcel_Cell $pCell = null)
+    {
+        //    Initialise the logging settings
+        $this->formulaError = null;
+        $this->_debugLog->clearLog();
+        $this->cyclicReferenceStack->clear();
+
+        if ($this->workbook !== null && $cellID === null && $pCell === null) {
+            $cellID = 'A1';
+            $pCell = $this->workbook->getActiveSheet()->getCell($cellID);
+        } else {
+            //    Disable calculation cacheing because it only applies to cell calculations, not straight formulae
+            //    But don't actually flush any cache
+            $resetCache = $this->getCalculationCacheEnabled();
+            $this->calculationCacheEnabled = false;
+        }
+
+        //    Execute the calculation
+        try {
+            $result = self::unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
+        } catch (PHPExcel_Exception $e) {
+            throw new PHPExcel_Calculation_Exception($e->getMessage());
+        }
+
+        if ($this->workbook === null) {
+            //    Reset calculation cacheing to its previous state
+            $this->calculationCacheEnabled = $resetCache;
+        }
+
+        return $result;
+    }
+
+
+    public function getValueFromCache($cellReference, &$cellValue)
+    {
+        // Is calculation cacheing enabled?
+        // Is the value present in calculation cache?
+        $this->_debugLog->writeDebugLog('Testing cache value for cell ', $cellReference);
+        if (($this->calculationCacheEnabled) && (isset($this->calculationCache[$cellReference]))) {
+            $this->_debugLog->writeDebugLog('Retrieving value for cell ', $cellReference, ' from cache');
+            // Return the cached result
+            $cellValue = $this->calculationCache[$cellReference];
+            return true;
+        }
+        return false;
+    }
+
+    public function saveValueToCache($cellReference, $cellValue)
+    {
+        if ($this->calculationCacheEnabled) {
+            $this->calculationCache[$cellReference] = $cellValue;
+        }
+    }
+
+    /**
+     * Parse a cell formula and calculate its value
+     *
+     * @param    string            $formula    The formula to parse and calculate
+     * @param    string            $cellID        The ID (e.g. A3) of the cell that we are calculating
+     * @param    PHPExcel_Cell    $pCell        Cell to calculate
+     * @return    mixed
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function _calculateFormulaValue($formula, $cellID = null, PHPExcel_Cell $pCell = null)
+    {
+        $cellValue = null;
+
+        //    Basic validation that this is indeed a formula
+        //    We simply return the cell value if not
+        $formula = trim($formula);
+        if ($formula[0] != '=') {
+            return self::wrapResult($formula);
+        }
+        $formula = ltrim(substr($formula, 1));
+        if (!isset($formula[0])) {
+            return self::wrapResult($formula);
+        }
+
+        $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
+        $wsTitle = ($pCellParent !== null) ? $pCellParent->getTitle() : "\x00Wrk";
+        $wsCellReference = $wsTitle . '!' . $cellID;
+
+        if (($cellID !== null) && ($this->getValueFromCache($wsCellReference, $cellValue))) {
+            return $cellValue;
+        }
+
+        if (($wsTitle[0] !== "\x00") && ($this->cyclicReferenceStack->onStack($wsCellReference))) {
+            if ($this->cyclicFormulaCount <= 0) {
+                $this->cyclicFormulaCell = '';
+                return $this->raiseFormulaError('Cyclic Reference in Formula');
+            } elseif ($this->cyclicFormulaCell === $wsCellReference) {
+                ++$this->cyclicFormulaCounter;
+                if ($this->cyclicFormulaCounter >= $this->cyclicFormulaCount) {
+                    $this->cyclicFormulaCell = '';
+                    return $cellValue;
+                }
+            } elseif ($this->cyclicFormulaCell == '') {
+                if ($this->cyclicFormulaCounter >= $this->cyclicFormulaCount) {
+                    return $cellValue;
+                }
+                $this->cyclicFormulaCell = $wsCellReference;
+            }
+        }
+
+        //    Parse the formula onto the token stack and calculate the value
+        $this->cyclicReferenceStack->push($wsCellReference);
+        $cellValue = $this->processTokenStack($this->_parseFormula($formula, $pCell), $cellID, $pCell);
+        $this->cyclicReferenceStack->pop();
+
+        // Save to calculation cache
+        if ($cellID !== null) {
+            $this->saveValueToCache($wsCellReference, $cellValue);
+        }
+
+        //    Return the calculated value
+        return $cellValue;
+    }
+
+
+    /**
+     * Ensure that paired matrix operands are both matrices and of the same size
+     *
+     * @param    mixed        &$operand1    First matrix operand
+     * @param    mixed        &$operand2    Second matrix operand
+     * @param    integer        $resize        Flag indicating whether the matrices should be resized to match
+     *                                        and (if so), whether the smaller dimension should grow or the
+     *                                        larger should shrink.
+     *                                            0 = no resize
+     *                                            1 = shrink to fit
+     *                                            2 = extend to fit
+     */
+    private static function checkMatrixOperands(&$operand1, &$operand2, $resize = 1)
+    {
+        //    Examine each of the two operands, and turn them into an array if they aren't one already
+        //    Note that this function should only be called if one or both of the operand is already an array
+        if (!is_array($operand1)) {
+            list($matrixRows, $matrixColumns) = self::getMatrixDimensions($operand2);
+            $operand1 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand1));
+            $resize = 0;
+        } elseif (!is_array($operand2)) {
+            list($matrixRows, $matrixColumns) = self::getMatrixDimensions($operand1);
+            $operand2 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand2));
+            $resize = 0;
+        }
+
+        list($matrix1Rows, $matrix1Columns) = self::getMatrixDimensions($operand1);
+        list($matrix2Rows, $matrix2Columns) = self::getMatrixDimensions($operand2);
+        if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
+            $resize = 1;
+        }
+
+        if ($resize == 2) {
+            //    Given two matrices of (potentially) unequal size, convert the smaller in each dimension to match the larger
+            self::resizeMatricesExtend($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
+        } elseif ($resize == 1) {
+            //    Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
+            self::resizeMatricesShrink($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
+        }
+        return array( $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
+    }
+
+
+    /**
+     * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
+     *
+     * @param    mixed        &$matrix        matrix operand
+     * @return    array        An array comprising the number of rows, and number of columns
+     */
+    private static function getMatrixDimensions(&$matrix)
+    {
+        $matrixRows = count($matrix);
+        $matrixColumns = 0;
+        foreach ($matrix as $rowKey => $rowValue) {
+            $matrixColumns = max(count($rowValue), $matrixColumns);
+            if (!is_array($rowValue)) {
+                $matrix[$rowKey] = array($rowValue);
+            } else {
+                $matrix[$rowKey] = array_values($rowValue);
+            }
+        }
+        $matrix = array_values($matrix);
+        return array($matrixRows, $matrixColumns);
+    }
+
+
+    /**
+     * Ensure that paired matrix operands are both matrices of the same size
+     *
+     * @param    mixed        &$matrix1        First matrix operand
+     * @param    mixed        &$matrix2        Second matrix operand
+     * @param    integer        $matrix1Rows    Row size of first matrix operand
+     * @param    integer        $matrix1Columns    Column size of first matrix operand
+     * @param    integer        $matrix2Rows    Row size of second matrix operand
+     * @param    integer        $matrix2Columns    Column size of second matrix operand
+     */
+    private static function resizeMatricesShrink(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns)
+    {
+        if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
+            if ($matrix2Rows < $matrix1Rows) {
+                for ($i = $matrix2Rows; $i < $matrix1Rows; ++$i) {
+                    unset($matrix1[$i]);
+                }
+            }
+            if ($matrix2Columns < $matrix1Columns) {
+                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                    for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
+                        unset($matrix1[$i][$j]);
+                    }
+                }
+            }
+        }
+
+        if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
+            if ($matrix1Rows < $matrix2Rows) {
+                for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {
+                    unset($matrix2[$i]);
+                }
+            }
+            if ($matrix1Columns < $matrix2Columns) {
+                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                    for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
+                        unset($matrix2[$i][$j]);
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Ensure that paired matrix operands are both matrices of the same size
+     *
+     * @param    mixed        &$matrix1    First matrix operand
+     * @param    mixed        &$matrix2    Second matrix operand
+     * @param    integer        $matrix1Rows    Row size of first matrix operand
+     * @param    integer        $matrix1Columns    Column size of first matrix operand
+     * @param    integer        $matrix2Rows    Row size of second matrix operand
+     * @param    integer        $matrix2Columns    Column size of second matrix operand
+     */
+    private static function resizeMatricesExtend(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns)
+    {
+        if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
+            if ($matrix2Columns < $matrix1Columns) {
+                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                    $x = $matrix2[$i][$matrix2Columns-1];
+                    for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
+                        $matrix2[$i][$j] = $x;
+                    }
+                }
+            }
+            if ($matrix2Rows < $matrix1Rows) {
+                $x = $matrix2[$matrix2Rows-1];
+                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                    $matrix2[$i] = $x;
+                }
+            }
+        }
+
+        if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
+            if ($matrix1Columns < $matrix2Columns) {
+                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                    $x = $matrix1[$i][$matrix1Columns-1];
+                    for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
+                        $matrix1[$i][$j] = $x;
+                    }
+                }
+            }
+            if ($matrix1Rows < $matrix2Rows) {
+                $x = $matrix1[$matrix1Rows-1];
+                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                    $matrix1[$i] = $x;
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Format details of an operand for display in the log (based on operand type)
+     *
+     * @param    mixed        $value    First matrix operand
+     * @return    mixed
+     */
+    private function showValue($value)
+    {
+        if ($this->_debugLog->getWriteDebugLog()) {
+            $testArray = PHPExcel_Calculation_Functions::flattenArray($value);
+            if (count($testArray) == 1) {
+                $value = array_pop($testArray);
+            }
+
+            if (is_array($value)) {
+                $returnMatrix = array();
+                $pad = $rpad = ', ';
+                foreach ($value as $row) {
+                    if (is_array($row)) {
+                        $returnMatrix[] = implode($pad, array_map(array($this, 'showValue'), $row));
+                        $rpad = '; ';
+                    } else {
+                        $returnMatrix[] = $this->showValue($row);
+                    }
+                }
+                return '{ '.implode($rpad, $returnMatrix).' }';
+            } elseif (is_string($value) && (trim($value, '"') == $value)) {
+                return '"'.$value.'"';
+            } elseif (is_bool($value)) {
+                return ($value) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+            }
+        }
+        return PHPExcel_Calculation_Functions::flattenSingleValue($value);
+    }
+
+
+    /**
+     * Format type and details of an operand for display in the log (based on operand type)
+     *
+     * @param    mixed        $value    First matrix operand
+     * @return    mixed
+     */
+    private function showTypeDetails($value)
+    {
+        if ($this->_debugLog->getWriteDebugLog()) {
+            $testArray = PHPExcel_Calculation_Functions::flattenArray($value);
+            if (count($testArray) == 1) {
+                $value = array_pop($testArray);
+            }
+
+            if ($value === null) {
+                return 'a NULL value';
+            } elseif (is_float($value)) {
+                $typeString = 'a floating point number';
+            } elseif (is_int($value)) {
+                $typeString = 'an integer number';
+            } elseif (is_bool($value)) {
+                $typeString = 'a boolean';
+            } elseif (is_array($value)) {
+                $typeString = 'a matrix';
+            } else {
+                if ($value == '') {
+                    return 'an empty string';
+                } elseif ($value[0] == '#') {
+                    return 'a '.$value.' error';
+                } else {
+                    $typeString = 'a string';
+                }
+            }
+            return $typeString.' with a value of '.$this->showValue($value);
+        }
+    }
+
+
+    private function convertMatrixReferences($formula)
+    {
+        static $matrixReplaceFrom = array('{', ';', '}');
+        static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(', '),MKMATRIX(', '))');
+
+        //    Convert any Excel matrix references to the MKMATRIX() function
+        if (strpos($formula, '{') !== false) {
+            //    If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
+            if (strpos($formula, '"') !== false) {
+                //    So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
+                //        the formula
+                $temp = explode('"', $formula);
+                //    Open and Closed counts used for trapping mismatched braces in the formula
+                $openCount = $closeCount = 0;
+                $i = false;
+                foreach ($temp as &$value) {
+                    //    Only count/replace in alternating array entries
+                    if ($i = !$i) {
+                        $openCount += substr_count($value, '{');
+                        $closeCount += substr_count($value, '}');
+                        $value = str_replace($matrixReplaceFrom, $matrixReplaceTo, $value);
+                    }
+                }
+                unset($value);
+                //    Then rebuild the formula string
+                $formula = implode('"', $temp);
+            } else {
+                //    If there's no quoted strings, then we do a simple count/replace
+                $openCount = substr_count($formula, '{');
+                $closeCount = substr_count($formula, '}');
+                $formula = str_replace($matrixReplaceFrom, $matrixReplaceTo, $formula);
+            }
+            //    Trap for mismatched braces and trigger an appropriate error
+            if ($openCount < $closeCount) {
+                if ($openCount > 0) {
+                    return $this->raiseFormulaError("Formula Error: Mismatched matrix braces '}'");
+                } else {
+                    return $this->raiseFormulaError("Formula Error: Unexpected '}' encountered");
+                }
+            } elseif ($openCount > $closeCount) {
+                if ($closeCount > 0) {
+                    return $this->raiseFormulaError("Formula Error: Mismatched matrix braces '{'");
+                } else {
+                    return $this->raiseFormulaError("Formula Error: Unexpected '{' encountered");
+                }
+            }
+        }
+
+        return $formula;
+    }
+
+
+    private static function mkMatrix()
+    {
+        return func_get_args();
+    }
+
+
+    //    Binary Operators
+    //    These operators always work on two values
+    //    Array key is the operator, the value indicates whether this is a left or right associative operator
+    private static $operatorAssociativity    = array(
+        '^' => 0,                                                            //    Exponentiation
+        '*' => 0, '/' => 0,                                                 //    Multiplication and Division
+        '+' => 0, '-' => 0,                                                    //    Addition and Subtraction
+        '&' => 0,                                                            //    Concatenation
+        '|' => 0, ':' => 0,                                                    //    Intersect and Range
+        '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0        //    Comparison
+    );
+
+    //    Comparison (Boolean) Operators
+    //    These operators work on two values, but always return a boolean result
+    private static $comparisonOperators    = array('>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true);
+
+    //    Operator Precedence
+    //    This list includes all valid operators, whether binary (including boolean) or unary (such as %)
+    //    Array key is the operator, the value is its precedence
+    private static $operatorPrecedence    = array(
+        ':' => 8,                                                                //    Range
+        '|' => 7,                                                                //    Intersect
+        '~' => 6,                                                                //    Negation
+        '%' => 5,                                                                //    Percentage
+        '^' => 4,                                                                //    Exponentiation
+        '*' => 3, '/' => 3,                                                     //    Multiplication and Division
+        '+' => 2, '-' => 2,                                                        //    Addition and Subtraction
+        '&' => 1,                                                                //    Concatenation
+        '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0            //    Comparison
+    );
+
+    // Convert infix to postfix notation
+    private function _parseFormula($formula, PHPExcel_Cell $pCell = null)
+    {
+        if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
+            return false;
+        }
+
+        //    If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
+        //        so we store the parent worksheet so that we can re-attach it when necessary
+        $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
+
+        $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
+                               '|'.self::CALCULATION_REGEXP_CELLREF.
+                               '|'.self::CALCULATION_REGEXP_NUMBER.
+                               '|'.self::CALCULATION_REGEXP_STRING.
+                               '|'.self::CALCULATION_REGEXP_OPENBRACE.
+                               '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
+                               '|'.self::CALCULATION_REGEXP_ERROR.
+                             ')/si';
+
+        //    Start with initialisation
+        $index = 0;
+        $stack = new PHPExcel_Calculation_Token_Stack;
+        $output = array();
+        $expectingOperator = false;                    //    We use this test in syntax-checking the expression to determine when a
+                                                    //        - is a negation or + is a positive operator rather than an operation
+        $expectingOperand = false;                    //    We use this test in syntax-checking the expression to determine whether an operand
+                                                    //        should be null in a function call
+        //    The guts of the lexical parser
+        //    Loop through the formula extracting each operator and operand in turn
+        while (true) {
+//echo 'Assessing Expression '.substr($formula, $index), PHP_EOL;
+            $opCharacter = $formula[$index];    //    Get the first character of the value at the current index position
+//echo 'Initial character of expression block is '.$opCharacter, PHP_EOL;
+            if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula[$index+1]]))) {
+                $opCharacter .= $formula[++$index];
+//echo 'Initial character of expression block is comparison operator '.$opCharacter.PHP_EOL;
+            }
+
+            //    Find out if we're currently at the beginning of a number, variable, cell reference, function, parenthesis or operand
+            $isOperandOrFunction = preg_match($regexpMatchString, substr($formula, $index), $match);
+//echo '$isOperandOrFunction is '.(($isOperandOrFunction) ? 'True' : 'False').PHP_EOL;
+//var_dump($match);
+
+            if ($opCharacter == '-' && !$expectingOperator) {                //    Is it a negation instead of a minus?
+//echo 'Element is a Negation operator', PHP_EOL;
+                $stack->push('Unary Operator', '~');                            //    Put a negation on the stack
+                ++$index;                                                    //        and drop the negation symbol
+            } elseif ($opCharacter == '%' && $expectingOperator) {
+//echo 'Element is a Percentage operator', PHP_EOL;
+                $stack->push('Unary Operator', '%');                            //    Put a percentage on the stack
+                ++$index;
+            } elseif ($opCharacter == '+' && !$expectingOperator) {            //    Positive (unary plus rather than binary operator plus) can be discarded?
+//echo 'Element is a Positive number, not Plus operator', PHP_EOL;
+                ++$index;                                                    //    Drop the redundant plus symbol
+            } elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {    //    We have to explicitly deny a tilde or pipe, because they are legal
+                return $this->raiseFormulaError("Formula Error: Illegal character '~'");                //        on the stack but not in the input expression
+
+            } elseif ((isset(self::$operators[$opCharacter]) or $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
+//echo 'Element with value '.$opCharacter.' is an Operator', PHP_EOL;
+                while ($stack->count() > 0 &&
+                    ($o2 = $stack->last()) &&
+                    isset(self::$operators[$o2['value']]) &&
+                    @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])) {
+                    $output[] = $stack->pop();                                //    Swap operands and higher precedence operators from the stack to the output
+                }
+                $stack->push('Binary Operator', $opCharacter);    //    Finally put our current operator onto the stack
+                ++$index;
+                $expectingOperator = false;
+
+            } elseif ($opCharacter == ')' && $expectingOperator) {            //    Are we expecting to close a parenthesis?
+//echo 'Element is a Closing bracket', PHP_EOL;
+                $expectingOperand = false;
+                while (($o2 = $stack->pop()) && $o2['value'] != '(') {        //    Pop off the stack back to the last (
+                    if ($o2 === null) {
+                        return $this->raiseFormulaError('Formula Error: Unexpected closing brace ")"');
+                    } else {
+                        $output[] = $o2;
+                    }
+                }
+                $d = $stack->last(2);
+                if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
+                    $functionName = $matches[1];                                        //    Get the function name
+//echo 'Closed Function is '.$functionName, PHP_EOL;
+                    $d = $stack->pop();
+                    $argumentCount = $d['value'];        //    See how many arguments there were (argument count is the next value stored on the stack)
+//if ($argumentCount == 0) {
+//    echo 'With no arguments', PHP_EOL;
+//} elseif ($argumentCount == 1) {
+//    echo 'With 1 argument', PHP_EOL;
+//} else {
+//    echo 'With '.$argumentCount.' arguments', PHP_EOL;
+//}
+                    $output[] = $d;                        //    Dump the argument count on the output
+                    $output[] = $stack->pop();            //    Pop the function and push onto the output
+                    if (isset(self::$controlFunctions[$functionName])) {
+//echo 'Built-in function '.$functionName, PHP_EOL;
+                        $expectedArgumentCount = self::$controlFunctions[$functionName]['argumentCount'];
+                        $functionCall = self::$controlFunctions[$functionName]['functionCall'];
+                    } elseif (isset(self::$PHPExcelFunctions[$functionName])) {
+//echo 'PHPExcel function '.$functionName, PHP_EOL;
+                        $expectedArgumentCount = self::$PHPExcelFunctions[$functionName]['argumentCount'];
+                        $functionCall = self::$PHPExcelFunctions[$functionName]['functionCall'];
+                    } else {    // did we somehow push a non-function on the stack? this should never happen
+                        return $this->raiseFormulaError("Formula Error: Internal error, non-function on stack");
+                    }
+                    //    Check the argument count
+                    $argumentCountError = false;
+                    if (is_numeric($expectedArgumentCount)) {
+                        if ($expectedArgumentCount < 0) {
+//echo '$expectedArgumentCount is between 0 and '.abs($expectedArgumentCount), PHP_EOL;
+                            if ($argumentCount > abs($expectedArgumentCount)) {
+                                $argumentCountError = true;
+                                $expectedArgumentCountString = 'no more than '.abs($expectedArgumentCount);
+                            }
+                        } else {
+//echo '$expectedArgumentCount is numeric '.$expectedArgumentCount, PHP_EOL;
+                            if ($argumentCount != $expectedArgumentCount) {
+                                $argumentCountError = true;
+                                $expectedArgumentCountString = $expectedArgumentCount;
+                            }
+                        }
+                    } elseif ($expectedArgumentCount != '*') {
+                        $isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
+//print_r($argMatch);
+//echo PHP_EOL;
+                        switch ($argMatch[2]) {
+                            case '+':
+                                if ($argumentCount < $argMatch[1]) {
+                                    $argumentCountError = true;
+                                    $expectedArgumentCountString = $argMatch[1].' or more ';
+                                }
+                                break;
+                            case '-':
+                                if (($argumentCount < $argMatch[1]) || ($argumentCount > $argMatch[3])) {
+                                    $argumentCountError = true;
+                                    $expectedArgumentCountString = 'between '.$argMatch[1].' and '.$argMatch[3];
+                                }
+                                break;
+                            case ',':
+                                if (($argumentCount != $argMatch[1]) && ($argumentCount != $argMatch[3])) {
+                                    $argumentCountError = true;
+                                    $expectedArgumentCountString = 'either '.$argMatch[1].' or '.$argMatch[3];
+                                }
+                                break;
+                        }
+                    }
+                    if ($argumentCountError) {
+                        return $this->raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, ".$expectedArgumentCountString." expected");
+                    }
+                }
+                ++$index;
+
+            } elseif ($opCharacter == ',') {            //    Is this the separator for function arguments?
+//echo 'Element is a Function argument separator', PHP_EOL;
+                while (($o2 = $stack->pop()) && $o2['value'] != '(') {        //    Pop off the stack back to the last (
+                    if ($o2 === null) {
+                        return $this->raiseFormulaError("Formula Error: Unexpected ,");
+                    } else {
+                        $output[] = $o2;    // pop the argument expression stuff and push onto the output
+                    }
+                }
+                //    If we've a comma when we're expecting an operand, then what we actually have is a null operand;
+                //        so push a null onto the stack
+                if (($expectingOperand) || (!$expectingOperator)) {
+                    $output[] = array('type' => 'NULL Value', 'value' => self::$excelConstants['NULL'], 'reference' => null);
+                }
+                // make sure there was a function
+                $d = $stack->last(2);
+                if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {
+                    return $this->raiseFormulaError("Formula Error: Unexpected ,");
+                }
+                $d = $stack->pop();
+                $stack->push($d['type'], ++$d['value'], $d['reference']);    // increment the argument count
+                $stack->push('Brace', '(');    // put the ( back on, we'll need to pop back to it again
+                $expectingOperator = false;
+                $expectingOperand = true;
+                ++$index;
+
+            } elseif ($opCharacter == '(' && !$expectingOperator) {
+//                echo 'Element is an Opening Bracket<br />';
+                $stack->push('Brace', '(');
+                ++$index;
+
+            } elseif ($isOperandOrFunction && !$expectingOperator) {    // do we now have a function/variable/number?
+                $expectingOperator = true;
+                $expectingOperand = false;
+                $val = $match[1];
+                $length = strlen($val);
+//                echo 'Element with value '.$val.' is an Operand, Variable, Constant, String, Number, Cell Reference or Function<br />';
+
+                if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $val, $matches)) {
+                    $val = preg_replace('/\s/u', '', $val);
+//                    echo 'Element '.$val.' is a Function<br />';
+                    if (isset(self::$PHPExcelFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
+                        $stack->push('Function', strtoupper($val));
+                        $ax = preg_match('/^\s*(\s*\))/ui', substr($formula, $index+$length), $amatch);
+                        if ($ax) {
+                            $stack->push('Operand Count for Function '.strtoupper($val).')', 0);
+                            $expectingOperator = true;
+                        } else {
+                            $stack->push('Operand Count for Function '.strtoupper($val).')', 1);
+                            $expectingOperator = false;
+                        }
+                        $stack->push('Brace', '(');
+                    } else {    // it's a var w/ implicit multiplication
+                        $output[] = array('type' => 'Value', 'value' => $matches[1], 'reference' => null);
+                    }
+                } elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $val, $matches)) {
+//                    echo 'Element '.$val.' is a Cell reference<br />';
+                    //    Watch for this case-change when modifying to allow cell references in different worksheets...
+                    //    Should only be applied to the actual cell column, not the worksheet name
+
+                    //    If the last entry on the stack was a : operator, then we have a cell range reference
+                    $testPrevOp = $stack->last(1);
+                    if ($testPrevOp['value'] == ':') {
+                        //    If we have a worksheet reference, then we're playing with a 3D reference
+                        if ($matches[2] == '') {
+                            //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
+                            //    The start of the cell range reference should be the last entry in $output
+                            $startCellRef = $output[count($output)-1]['value'];
+                            preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches);
+                            if ($startMatches[2] > '') {
+                                $val = $startMatches[2].'!'.$val;
+                            }
+                        } else {
+                            return $this->raiseFormulaError("3D Range references are not yet supported");
+                        }
+                    }
+
+                    $output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $val);
+//                    $expectingOperator = FALSE;
+                } else {    // it's a variable, constant, string, number or boolean
+//                    echo 'Element is a Variable, Constant, String, Number or Boolean<br />';
+                    //    If the last entry on the stack was a : operator, then we may have a row or column range reference
+                    $testPrevOp = $stack->last(1);
+                    if ($testPrevOp['value'] == ':') {
+                        $startRowColRef = $output[count($output)-1]['value'];
+                        $rangeWS1 = '';
+                        if (strpos('!', $startRowColRef) !== false) {
+                            list($rangeWS1, $startRowColRef) = explode('!', $startRowColRef);
+                        }
+                        if ($rangeWS1 != '') {
+                            $rangeWS1 .= '!';
+                        }
+                        $rangeWS2 = $rangeWS1;
+                        if (strpos('!', $val) !== false) {
+                            list($rangeWS2, $val) = explode('!', $val);
+                        }
+                        if ($rangeWS2 != '') {
+                            $rangeWS2 .= '!';
+                        }
+                        if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
+                            ($startRowColRef <= 1048576) && ($val <= 1048576)) {
+                            //    Row range
+                            $endRowColRef = ($pCellParent !== null) ? $pCellParent->getHighestColumn() : 'XFD';    //    Max 16,384 columns for Excel2007
+                            $output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef;
+                            $val = $rangeWS2.$endRowColRef.$val;
+                        } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
+                            (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
+                            //    Column range
+                            $endRowColRef = ($pCellParent !== null) ? $pCellParent->getHighestRow() : 1048576;        //    Max 1,048,576 rows for Excel2007
+                            $output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
+                            $val = $rangeWS2.$val.$endRowColRef;
+                        }
+                    }
+
+                    $localeConstant = false;
+                    if ($opCharacter == '"') {
+//                        echo 'Element is a String<br />';
+                        //    UnEscape any quotes within the string
+                        $val = self::wrapResult(str_replace('""', '"', self::unwrapResult($val)));
+                    } elseif (is_numeric($val)) {
+//                        echo 'Element is a Number<br />';
+                        if ((strpos($val, '.') !== false) || (stripos($val, 'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
+//                            echo 'Casting '.$val.' to float<br />';
+                            $val = (float) $val;
+                        } else {
+//                            echo 'Casting '.$val.' to integer<br />';
+                            $val = (integer) $val;
+                        }
+                    } elseif (isset(self::$excelConstants[trim(strtoupper($val))])) {
+                        $excelConstant = trim(strtoupper($val));
+//                        echo 'Element '.$excelConstant.' is an Excel Constant<br />';
+                        $val = self::$excelConstants[$excelConstant];
+                    } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
+//                        echo 'Element '.$localeConstant.' is an Excel Constant<br />';
+                        $val = self::$excelConstants[$localeConstant];
+                    }
+                    $details = array('type' => 'Value', 'value' => $val, 'reference' => null);
+                    if ($localeConstant) {
+                        $details['localeValue'] = $localeConstant;
+                    }
+                    $output[] = $details;
+                }
+                $index += $length;
+
+            } elseif ($opCharacter == '$') {    // absolute row or column range
+                ++$index;
+            } elseif ($opCharacter == ')') {    // miscellaneous error checking
+                if ($expectingOperand) {
+                    $output[] = array('type' => 'NULL Value', 'value' => self::$excelConstants['NULL'], 'reference' => null);
+                    $expectingOperand = false;
+                    $expectingOperator = true;
+                } else {
+                    return $this->raiseFormulaError("Formula Error: Unexpected ')'");
+                }
+            } elseif (isset(self::$operators[$opCharacter]) && !$expectingOperator) {
+                return $this->raiseFormulaError("Formula Error: Unexpected operator '$opCharacter'");
+            } else {    // I don't even want to know what you did to get here
+                return $this->raiseFormulaError("Formula Error: An unexpected error occured");
+            }
+            //    Test for end of formula string
+            if ($index == strlen($formula)) {
+                //    Did we end with an operator?.
+                //    Only valid for the % unary operator
+                if ((isset(self::$operators[$opCharacter])) && ($opCharacter != '%')) {
+                    return $this->raiseFormulaError("Formula Error: Operator '$opCharacter' has no operands");
+                } else {
+                    break;
+                }
+            }
+            //    Ignore white space
+            while (($formula[$index] == "\n") || ($formula[$index] == "\r")) {
+                ++$index;
+            }
+            if ($formula[$index] == ' ') {
+                while ($formula[$index] == ' ') {
+                    ++$index;
+                }
+                //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
+                //        Cell References) then we have an INTERSECTION operator
+//                echo 'Possible Intersect Operator<br />';
+                if (($expectingOperator) && (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'.*/Ui', substr($formula, $index), $match)) &&
+                    ($output[count($output)-1]['type'] == 'Cell Reference')) {
+//                    echo 'Element is an Intersect Operator<br />';
+                    while ($stack->count() > 0 &&
+                        ($o2 = $stack->last()) &&
+                        isset(self::$operators[$o2['value']]) &&
+                        @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])) {
+                        $output[] = $stack->pop();                                //    Swap operands and higher precedence operators from the stack to the output
+                    }
+                    $stack->push('Binary Operator', '|');    //    Put an Intersect Operator on the stack
+                    $expectingOperator = false;
+                }
+            }
+        }
+
+        while (($op = $stack->pop()) !== null) {    // pop everything off the stack and push onto output
+            if ((is_array($op) && $op['value'] == '(') || ($op === '(')) {
+                return $this->raiseFormulaError("Formula Error: Expecting ')'");    // if there are any opening braces on the stack, then braces were unbalanced
+            }
+            $output[] = $op;
+        }
+        return $output;
+    }
+
+
+    private static function dataTestReference(&$operandData)
+    {
+        $operand = $operandData['value'];
+        if (($operandData['reference'] === null) && (is_array($operand))) {
+            $rKeys = array_keys($operand);
+            $rowKey = array_shift($rKeys);
+            $cKeys = array_keys(array_keys($operand[$rowKey]));
+            $colKey = array_shift($cKeys);
+            if (ctype_upper($colKey)) {
+                $operandData['reference'] = $colKey.$rowKey;
+            }
+        }
+        return $operand;
+    }
+
+    // evaluate postfix notation
+    private function processTokenStack($tokens, $cellID = null, PHPExcel_Cell $pCell = null)
+    {
+        if ($tokens == false) {
+            return false;
+        }
+
+        //    If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent cell collection),
+        //        so we store the parent cell collection so that we can re-attach it when necessary
+        $pCellWorksheet = ($pCell !== null) ? $pCell->getWorksheet() : null;
+        $pCellParent = ($pCell !== null) ? $pCell->getParent() : null;
+        $stack = new PHPExcel_Calculation_Token_Stack;
+
+        //    Loop through each token in turn
+        foreach ($tokens as $tokenData) {
+//            print_r($tokenData);
+//            echo '<br />';
+            $token = $tokenData['value'];
+//            echo '<b>Token is '.$token.'</b><br />';
+            // if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
+            if (isset(self::$binaryOperators[$token])) {
+//                echo 'Token is a binary operator<br />';
+                //    We must have two operands, error if we don't
+                if (($operand2Data = $stack->pop()) === null) {
+                    return $this->raiseFormulaError('Internal error - Operand value missing from stack');
+                }
+                if (($operand1Data = $stack->pop()) === null) {
+                    return $this->raiseFormulaError('Internal error - Operand value missing from stack');
+                }
+
+                $operand1 = self::dataTestReference($operand1Data);
+                $operand2 = self::dataTestReference($operand2Data);
+
+                //    Log what we're doing
+                if ($token == ':') {
+                    $this->_debugLog->writeDebugLog('Evaluating Range ', $this->showValue($operand1Data['reference']), ' ', $token, ' ', $this->showValue($operand2Data['reference']));
+                } else {
+                    $this->_debugLog->writeDebugLog('Evaluating ', $this->showValue($operand1), ' ', $token, ' ', $this->showValue($operand2));
+                }
+
+                //    Process the operation in the appropriate manner
+                switch ($token) {
+                    //    Comparison (Boolean) Operators
+                    case '>':            //    Greater than
+                    case '<':            //    Less than
+                    case '>=':            //    Greater than or Equal to
+                    case '<=':            //    Less than or Equal to
+                    case '=':            //    Equality
+                    case '<>':            //    Inequality
+                        $this->executeBinaryComparisonOperation($cellID, $operand1, $operand2, $token, $stack);
+                        break;
+                    //    Binary Operators
+                    case ':':            //    Range
+                        $sheet1 = $sheet2 = '';
+                        if (strpos($operand1Data['reference'], '!') !== false) {
+                            list($sheet1, $operand1Data['reference']) = explode('!', $operand1Data['reference']);
+                        } else {
+                            $sheet1 = ($pCellParent !== null) ? $pCellWorksheet->getTitle() : '';
+                        }
+                        if (strpos($operand2Data['reference'], '!') !== false) {
+                            list($sheet2, $operand2Data['reference']) = explode('!', $operand2Data['reference']);
+                        } else {
+                            $sheet2 = $sheet1;
+                        }
+                        if ($sheet1 == $sheet2) {
+                            if ($operand1Data['reference'] === null) {
+                                if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
+                                    $operand1Data['reference'] = $pCell->getColumn().$operand1Data['value'];
+                                } elseif (trim($operand1Data['reference']) == '') {
+                                    $operand1Data['reference'] = $pCell->getCoordinate();
+                                } else {
+                                    $operand1Data['reference'] = $operand1Data['value'].$pCell->getRow();
+                                }
+                            }
+                            if ($operand2Data['reference'] === null) {
+                                if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
+                                    $operand2Data['reference'] = $pCell->getColumn().$operand2Data['value'];
+                                } elseif (trim($operand2Data['reference']) == '') {
+                                    $operand2Data['reference'] = $pCell->getCoordinate();
+                                } else {
+                                    $operand2Data['reference'] = $operand2Data['value'].$pCell->getRow();
+                                }
+                            }
+
+                            $oData = array_merge(explode(':', $operand1Data['reference']), explode(':', $operand2Data['reference']));
+                            $oCol = $oRow = array();
+                            foreach ($oData as $oDatum) {
+                                $oCR = PHPExcel_Cell::coordinateFromString($oDatum);
+                                $oCol[] = PHPExcel_Cell::columnIndexFromString($oCR[0]) - 1;
+                                $oRow[] = $oCR[1];
+                            }
+                            $cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
+                            if ($pCellParent !== null) {
+                                $cellValue = $this->extractCellRange($cellRef, $this->workbook->getSheetByName($sheet1), false);
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $stack->push('Cell Reference', $cellValue, $cellRef);
+                        } else {
+                            $stack->push('Error', PHPExcel_Calculation_Functions::REF(), null);
+                        }
+                        break;
+                    case '+':            //    Addition
+                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'plusEquals', $stack);
+                        break;
+                    case '-':            //    Subtraction
+                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'minusEquals', $stack);
+                        break;
+                    case '*':            //    Multiplication
+                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'arrayTimesEquals', $stack);
+                        break;
+                    case '/':            //    Division
+                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'arrayRightDivide', $stack);
+                        break;
+                    case '^':            //    Exponential
+                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'power', $stack);
+                        break;
+                    case '&':            //    Concatenation
+                        //    If either of the operands is a matrix, we need to treat them both as matrices
+                        //        (converting the other operand to a matrix if need be); then perform the required
+                        //        matrix operation
+                        if (is_bool($operand1)) {
+                            $operand1 = ($operand1) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+                        }
+                        if (is_bool($operand2)) {
+                            $operand2 = ($operand2) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+                        }
+                        if ((is_array($operand1)) || (is_array($operand2))) {
+                            //    Ensure that both operands are arrays/matrices
+                            self::checkMatrixOperands($operand1, $operand2, 2);
+                            try {
+                                //    Convert operand 1 from a PHP array to a matrix
+                                $matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
+                                //    Perform the required operation against the operand 1 matrix, passing in operand 2
+                                $matrixResult = $matrix->concat($operand2);
+                                $result = $matrixResult->getArray();
+                            } catch (PHPExcel_Exception $ex) {
+                                $this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
+                                $result = '#VALUE!';
+                            }
+                        } else {
+                            $result = '"'.str_replace('""', '"', self::unwrapResult($operand1, '"').self::unwrapResult($operand2, '"')).'"';
+                        }
+                        $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+                        $stack->push('Value', $result);
+                        break;
+                    case '|':            //    Intersect
+                        $rowIntersect = array_intersect_key($operand1, $operand2);
+                        $cellIntersect = $oCol = $oRow = array();
+                        foreach (array_keys($rowIntersect) as $row) {
+                            $oRow[] = $row;
+                            foreach ($rowIntersect[$row] as $col => $data) {
+                                $oCol[] = PHPExcel_Cell::columnIndexFromString($col) - 1;
+                                $cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]);
+                            }
+                        }
+                        $cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
+                        $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect));
+                        $stack->push('Value', $cellIntersect, $cellRef);
+                        break;
+                }
+
+            // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
+            } elseif (($token === '~') || ($token === '%')) {
+//                echo 'Token is a unary operator<br />';
+                if (($arg = $stack->pop()) === null) {
+                    return $this->raiseFormulaError('Internal error - Operand value missing from stack');
+                }
+                $arg = $arg['value'];
+                if ($token === '~') {
+//                    echo 'Token is a negation operator<br />';
+                    $this->_debugLog->writeDebugLog('Evaluating Negation of ', $this->showValue($arg));
+                    $multiplier = -1;
+                } else {
+//                    echo 'Token is a percentile operator<br />';
+                    $this->_debugLog->writeDebugLog('Evaluating Percentile of ', $this->showValue($arg));
+                    $multiplier = 0.01;
+                }
+                if (is_array($arg)) {
+                    self::checkMatrixOperands($arg, $multiplier, 2);
+                    try {
+                        $matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg);
+                        $matrixResult = $matrix1->arrayTimesEquals($multiplier);
+                        $result = $matrixResult->getArray();
+                    } catch (PHPExcel_Exception $ex) {
+                        $this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
+                        $result = '#VALUE!';
+                    }
+                    $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+                    $stack->push('Value', $result);
+                } else {
+                    $this->executeNumericBinaryOperation($cellID, $multiplier, $arg, '*', 'arrayTimesEquals', $stack);
+                }
+
+            } elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) {
+                $cellRef = null;
+//                echo 'Element '.$token.' is a Cell reference<br />';
+                if (isset($matches[8])) {
+//                    echo 'Reference is a Range of cells<br />';
+                    if ($pCell === null) {
+//                        We can't access the range, so return a REF error
+                        $cellValue = PHPExcel_Calculation_Functions::REF();
+                    } else {
+                        $cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
+                        if ($matches[2] > '') {
+                            $matches[2] = trim($matches[2], "\"'");
+                            if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
+                                //    It's a Reference to an external workbook (not currently supported)
+                                return $this->raiseFormulaError('Unable to access External Workbook');
+                            }
+                            $matches[2] = trim($matches[2], "\"'");
+//                            echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
+                            $this->_debugLog->writeDebugLog('Evaluating Cell Range ', $cellRef, ' in worksheet ', $matches[2]);
+                            if ($pCellParent !== null) {
+                                $cellValue = $this->extractCellRange($cellRef, $this->workbook->getSheetByName($matches[2]), false);
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $this->_debugLog->writeDebugLog('Evaluation Result for cells ', $cellRef, ' in worksheet ', $matches[2], ' is ', $this->showTypeDetails($cellValue));
+//                            $cellRef = $matches[2].'!'.$cellRef;
+                        } else {
+//                            echo '$cellRef='.$cellRef.' in current worksheet<br />';
+                            $this->_debugLog->writeDebugLog('Evaluating Cell Range ', $cellRef, ' in current worksheet');
+                            if ($pCellParent !== null) {
+                                $cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, false);
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $this->_debugLog->writeDebugLog('Evaluation Result for cells ', $cellRef, ' is ', $this->showTypeDetails($cellValue));
+                        }
+                    }
+                } else {
+//                    echo 'Reference is a single Cell<br />';
+                    if ($pCell === null) {
+//                        We can't access the cell, so return a REF error
+                        $cellValue = PHPExcel_Calculation_Functions::REF();
+                    } else {
+                        $cellRef = $matches[6].$matches[7];
+                        if ($matches[2] > '') {
+                            $matches[2] = trim($matches[2], "\"'");
+                            if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
+                                //    It's a Reference to an external workbook (not currently supported)
+                                return $this->raiseFormulaError('Unable to access External Workbook');
+                            }
+//                            echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
+                            $this->_debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in worksheet ', $matches[2]);
+                            if ($pCellParent !== null) {
+                                $cellSheet = $this->workbook->getSheetByName($matches[2]);
+                                if ($cellSheet && $cellSheet->cellExists($cellRef)) {
+                                    $cellValue = $this->extractCellRange($cellRef, $this->workbook->getSheetByName($matches[2]), false);
+                                    $pCell->attach($pCellParent);
+                                } else {
+                                    $cellValue = null;
+                                }
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $this->_debugLog->writeDebugLog('Evaluation Result for cell ', $cellRef, ' in worksheet ', $matches[2], ' is ', $this->showTypeDetails($cellValue));
+//                            $cellRef = $matches[2].'!'.$cellRef;
+                        } else {
+//                            echo '$cellRef='.$cellRef.' in current worksheet<br />';
+                            $this->_debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in current worksheet');
+                            if ($pCellParent->isDataSet($cellRef)) {
+                                $cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, false);
+                                $pCell->attach($pCellParent);
+                            } else {
+                                $cellValue = null;
+                            }
+                            $this->_debugLog->writeDebugLog('Evaluation Result for cell ', $cellRef, ' is ', $this->showTypeDetails($cellValue));
+                        }
+                    }
+                }
+                $stack->push('Value', $cellValue, $cellRef);
+
+            // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+            } elseif (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $token, $matches)) {
+//                echo 'Token is a function<br />';
+                $functionName = $matches[1];
+                $argCount = $stack->pop();
+                $argCount = $argCount['value'];
+                if ($functionName != 'MKMATRIX') {
+                    $this->_debugLog->writeDebugLog('Evaluating Function ', self::localeFunc($functionName), '() with ', (($argCount == 0) ? 'no' : $argCount), ' argument', (($argCount == 1) ? '' : 's'));
+                }
+                if ((isset(self::$PHPExcelFunctions[$functionName])) || (isset(self::$controlFunctions[$functionName]))) {    // function
+                    if (isset(self::$PHPExcelFunctions[$functionName])) {
+                        $functionCall = self::$PHPExcelFunctions[$functionName]['functionCall'];
+                        $passByReference = isset(self::$PHPExcelFunctions[$functionName]['passByReference']);
+                        $passCellReference = isset(self::$PHPExcelFunctions[$functionName]['passCellReference']);
+                    } elseif (isset(self::$controlFunctions[$functionName])) {
+                        $functionCall = self::$controlFunctions[$functionName]['functionCall'];
+                        $passByReference = isset(self::$controlFunctions[$functionName]['passByReference']);
+                        $passCellReference = isset(self::$controlFunctions[$functionName]['passCellReference']);
+                    }
+                    // get the arguments for this function
+//                    echo 'Function '.$functionName.' expects '.$argCount.' arguments<br />';
+                    $args = $argArrayVals = array();
+                    for ($i = 0; $i < $argCount; ++$i) {
+                        $arg = $stack->pop();
+                        $a = $argCount - $i - 1;
+                        if (($passByReference) &&
+                            (isset(self::$PHPExcelFunctions[$functionName]['passByReference'][$a])) &&
+                            (self::$PHPExcelFunctions[$functionName]['passByReference'][$a])) {
+                            if ($arg['reference'] === null) {
+                                $args[] = $cellID;
+                                if ($functionName != 'MKMATRIX') {
+                                    $argArrayVals[] = $this->showValue($cellID);
+                                }
+                            } else {
+                                $args[] = $arg['reference'];
+                                if ($functionName != 'MKMATRIX') {
+                                    $argArrayVals[] = $this->showValue($arg['reference']);
+                                }
+                            }
+                        } else {
+                            $args[] = self::unwrapResult($arg['value']);
+                            if ($functionName != 'MKMATRIX') {
+                                $argArrayVals[] = $this->showValue($arg['value']);
+                            }
+                        }
+                    }
+                    //    Reverse the order of the arguments
+                    krsort($args);
+                    if (($passByReference) && ($argCount == 0)) {
+                        $args[] = $cellID;
+                        $argArrayVals[] = $this->showValue($cellID);
+                    }
+//                    echo 'Arguments are: ';
+//                    print_r($args);
+//                    echo '<br />';
+                    if ($functionName != 'MKMATRIX') {
+                        if ($this->_debugLog->getWriteDebugLog()) {
+                            krsort($argArrayVals);
+                            $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator.' ', PHPExcel_Calculation_Functions::flattenArray($argArrayVals)), ' )');
+                        }
+                    }
+                    //    Process each argument in turn, building the return value as an array
+//                    if (($argCount == 1) && (is_array($args[1])) && ($functionName != 'MKMATRIX')) {
+//                        $operand1 = $args[1];
+//                        $this->_debugLog->writeDebugLog('Argument is a matrix: ', $this->showValue($operand1));
+//                        $result = array();
+//                        $row = 0;
+//                        foreach($operand1 as $args) {
+//                            if (is_array($args)) {
+//                                foreach($args as $arg) {
+//                                    $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', $this->showValue($arg), ' )');
+//                                    $r = call_user_func_array($functionCall, $arg);
+//                                    $this->_debugLog->writeDebugLog('Evaluation Result for ', self::localeFunc($functionName), '() function call is ', $this->showTypeDetails($r));
+//                                    $result[$row][] = $r;
+//                                }
+//                                ++$row;
+//                            } else {
+//                                $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', $this->showValue($args), ' )');
+//                                $r = call_user_func_array($functionCall, $args);
+//                                $this->_debugLog->writeDebugLog('Evaluation Result for ', self::localeFunc($functionName), '() function call is ', $this->showTypeDetails($r));
+//                                $result[] = $r;
+//                            }
+//                        }
+//                    } else {
+                    //    Process the argument with the appropriate function call
+                    if ($passCellReference) {
+                        $args[] = $pCell;
+                    }
+                    if (strpos($functionCall, '::') !== false) {
+                        $result = call_user_func_array(explode('::', $functionCall), $args);
+                    } else {
+                        foreach ($args as &$arg) {
+                            $arg = PHPExcel_Calculation_Functions::flattenSingleValue($arg);
+                        }
+                        unset($arg);
+                        $result = call_user_func_array($functionCall, $args);
+                    }
+                    if ($functionName != 'MKMATRIX') {
+                        $this->_debugLog->writeDebugLog('Evaluation Result for ', self::localeFunc($functionName), '() function call is ', $this->showTypeDetails($result));
+                    }
+                    $stack->push('Value', self::wrapResult($result));
+                }
+
+            } else {
+                // if the token is a number, boolean, string or an Excel error, push it onto the stack
+                if (isset(self::$excelConstants[strtoupper($token)])) {
+                    $excelConstant = strtoupper($token);
+//                    echo 'Token is a PHPExcel constant: '.$excelConstant.'<br />';
+                    $stack->push('Constant Value', self::$excelConstants[$excelConstant]);
+                    $this->_debugLog->writeDebugLog('Evaluating Constant ', $excelConstant, ' as ', $this->showTypeDetails(self::$excelConstants[$excelConstant]));
+                } elseif ((is_numeric($token)) || ($token === null) || (is_bool($token)) || ($token == '') || ($token[0] == '"') || ($token[0] == '#')) {
+//                    echo 'Token is a number, boolean, string, null or an Excel error<br />';
+                    $stack->push('Value', $token);
+                // if the token is a named range, push the named range name onto the stack
+                } elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
+//                    echo 'Token is a named range<br />';
+                    $namedRange = $matches[6];
+//                    echo 'Named Range is '.$namedRange.'<br />';
+                    $this->_debugLog->writeDebugLog('Evaluating Named Range ', $namedRange);
+                    $cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellWorksheet : null), false);
+                    $pCell->attach($pCellParent);
+                    $this->_debugLog->writeDebugLog('Evaluation Result for named range ', $namedRange, ' is ', $this->showTypeDetails($cellValue));
+                    $stack->push('Named Range', $cellValue, $namedRange);
+                } else {
+                    return $this->raiseFormulaError("undefined variable '$token'");
+                }
+            }
+        }
+        // when we're out of tokens, the stack should have a single element, the final result
+        if ($stack->count() != 1) {
+            return $this->raiseFormulaError("internal error");
+        }
+        $output = $stack->pop();
+        $output = $output['value'];
+
+//        if ((is_array($output)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
+//            return array_shift(PHPExcel_Calculation_Functions::flattenArray($output));
+//        }
+        return $output;
+    }
+
+
+    private function validateBinaryOperand($cellID, &$operand, &$stack)
+    {
+        if (is_array($operand)) {
+            if ((count($operand, COUNT_RECURSIVE) - count($operand)) == 1) {
+                do {
+                    $operand = array_pop($operand);
+                } while (is_array($operand));
+            }
+        }
+        //    Numbers, matrices and booleans can pass straight through, as they're already valid
+        if (is_string($operand)) {
+            //    We only need special validations for the operand if it is a string
+            //    Start by stripping off the quotation marks we use to identify true excel string values internally
+            if ($operand > '' && $operand[0] == '"') {
+                $operand = self::unwrapResult($operand);
+            }
+            //    If the string is a numeric value, we treat it as a numeric, so no further testing
+            if (!is_numeric($operand)) {
+                //    If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations
+                if ($operand > '' && $operand[0] == '#') {
+                    $stack->push('Value', $operand);
+                    $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($operand));
+                    return false;
+                } elseif (!PHPExcel_Shared_String::convertToNumberIfFraction($operand)) {
+                    //    If not a numeric or a fraction, then it's a text string, and so can't be used in mathematical binary operations
+                    $stack->push('Value', '#VALUE!');
+                    $this->_debugLog->writeDebugLog('Evaluation Result is a ', $this->showTypeDetails('#VALUE!'));
+                    return false;
+                }
+            }
+        }
+
+        //    return a true if the value of the operand is one that we can use in normal binary operations
+        return true;
+    }
+
+
+    private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, &$stack, $recursingArrays = false)
+    {
+        //    If we're dealing with matrix operations, we want a matrix result
+        if ((is_array($operand1)) || (is_array($operand2))) {
+            $result = array();
+            if ((is_array($operand1)) && (!is_array($operand2))) {
+                foreach ($operand1 as $x => $operandData) {
+                    $this->_debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operandData), ' ', $operation, ' ', $this->showValue($operand2));
+                    $this->executeBinaryComparisonOperation($cellID, $operandData, $operand2, $operation, $stack);
+                    $r = $stack->pop();
+                    $result[$x] = $r['value'];
+                }
+            } elseif ((!is_array($operand1)) && (is_array($operand2))) {
+                foreach ($operand2 as $x => $operandData) {
+                    $this->_debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operand1), ' ', $operation, ' ', $this->showValue($operandData));
+                    $this->executeBinaryComparisonOperation($cellID, $operand1, $operandData, $operation, $stack);
+                    $r = $stack->pop();
+                    $result[$x] = $r['value'];
+                }
+            } else {
+                if (!$recursingArrays) {
+                    self::checkMatrixOperands($operand1, $operand2, 2);
+                }
+                foreach ($operand1 as $x => $operandData) {
+                    $this->_debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operandData), ' ', $operation, ' ', $this->showValue($operand2[$x]));
+                    $this->executeBinaryComparisonOperation($cellID, $operandData, $operand2[$x], $operation, $stack, true);
+                    $r = $stack->pop();
+                    $result[$x] = $r['value'];
+                }
+            }
+            //    Log the result details
+            $this->_debugLog->writeDebugLog('Comparison Evaluation Result is ', $this->showTypeDetails($result));
+            //    And push the result onto the stack
+            $stack->push('Array', $result);
+            return true;
+        }
+
+        //    Simple validate the two operands if they are string values
+        if (is_string($operand1) && $operand1 > '' && $operand1[0] == '"') {
+            $operand1 = self::unwrapResult($operand1);
+        }
+        if (is_string($operand2) && $operand2 > '' && $operand2[0] == '"') {
+            $operand2 = self::unwrapResult($operand2);
+        }
+
+        // Use case insensitive comparaison if not OpenOffice mode
+        if (PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+            if (is_string($operand1)) {
+                $operand1 = strtoupper($operand1);
+            }
+            if (is_string($operand2)) {
+                $operand2 = strtoupper($operand2);
+            }
+        }
+
+        $useLowercaseFirstComparison = is_string($operand1) && is_string($operand2) && PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE;
+
+        //    execute the necessary operation
+        switch ($operation) {
+            //    Greater than
+            case '>':
+                if ($useLowercaseFirstComparison) {
+                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) > 0;
+                } else {
+                    $result = ($operand1 > $operand2);
+                }
+                break;
+            //    Less than
+            case '<':
+                if ($useLowercaseFirstComparison) {
+                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) < 0;
+                } else {
+                    $result = ($operand1 < $operand2);
+                }
+                break;
+            //    Equality
+            case '=':
+                if (is_numeric($operand1) && is_numeric($operand2)) {
+                    $result = (abs($operand1 - $operand2) < $this->delta);
+                } else {
+                    $result = strcmp($operand1, $operand2) == 0;
+                }
+                break;
+            //    Greater than or equal
+            case '>=':
+                if (is_numeric($operand1) && is_numeric($operand2)) {
+                    $result = ((abs($operand1 - $operand2) < $this->delta) || ($operand1 > $operand2));
+                } elseif ($useLowercaseFirstComparison) {
+                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) >= 0;
+                } else {
+                    $result = strcmp($operand1, $operand2) >= 0;
+                }
+                break;
+            //    Less than or equal
+            case '<=':
+                if (is_numeric($operand1) && is_numeric($operand2)) {
+                    $result = ((abs($operand1 - $operand2) < $this->delta) || ($operand1 < $operand2));
+                } elseif ($useLowercaseFirstComparison) {
+                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) <= 0;
+                } else {
+                    $result = strcmp($operand1, $operand2) <= 0;
+                }
+                break;
+            //    Inequality
+            case '<>':
+                if (is_numeric($operand1) && is_numeric($operand2)) {
+                    $result = (abs($operand1 - $operand2) > 1E-14);
+                } else {
+                    $result = strcmp($operand1, $operand2) != 0;
+                }
+                break;
+        }
+
+        //    Log the result details
+        $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+        //    And push the result onto the stack
+        $stack->push('Value', $result);
+        return true;
+    }
+
+    /**
+     * Compare two strings in the same way as strcmp() except that lowercase come before uppercase letters
+     * @param    string    $str1    First string value for the comparison
+     * @param    string    $str2    Second string value for the comparison
+     * @return   integer
+     */
+    private function strcmpLowercaseFirst($str1, $str2)
+    {
+        $inversedStr1 = PHPExcel_Shared_String::StrCaseReverse($str1);
+        $inversedStr2 = PHPExcel_Shared_String::StrCaseReverse($str2);
+
+        return strcmp($inversedStr1, $inversedStr2);
+    }
+
+    private function executeNumericBinaryOperation($cellID, $operand1, $operand2, $operation, $matrixFunction, &$stack)
+    {
+        //    Validate the two operands
+        if (!$this->validateBinaryOperand($cellID, $operand1, $stack)) {
+            return false;
+        }
+        if (!$this->validateBinaryOperand($cellID, $operand2, $stack)) {
+            return false;
+        }
+
+        //    If either of the operands is a matrix, we need to treat them both as matrices
+        //        (converting the other operand to a matrix if need be); then perform the required
+        //        matrix operation
+        if ((is_array($operand1)) || (is_array($operand2))) {
+            //    Ensure that both operands are arrays/matrices of the same size
+            self::checkMatrixOperands($operand1, $operand2, 2);
+
+            try {
+                //    Convert operand 1 from a PHP array to a matrix
+                $matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
+                //    Perform the required operation against the operand 1 matrix, passing in operand 2
+                $matrixResult = $matrix->$matrixFunction($operand2);
+                $result = $matrixResult->getArray();
+            } catch (PHPExcel_Exception $ex) {
+                $this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
+                $result = '#VALUE!';
+            }
+        } else {
+            if ((PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) &&
+                ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1)>0) ||
+                 (is_string($operand2) && !is_numeric($operand2) && strlen($operand2)>0))) {
+                $result = PHPExcel_Calculation_Functions::VALUE();
+            } else {
+                //    If we're dealing with non-matrix operations, execute the necessary operation
+                switch ($operation) {
+                    //    Addition
+                    case '+':
+                        $result = $operand1 + $operand2;
+                        break;
+                    //    Subtraction
+                    case '-':
+                        $result = $operand1 - $operand2;
+                        break;
+                    //    Multiplication
+                    case '*':
+                        $result = $operand1 * $operand2;
+                        break;
+                    //    Division
+                    case '/':
+                        if ($operand2 == 0) {
+                            //    Trap for Divide by Zero error
+                            $stack->push('Value', '#DIV/0!');
+                            $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails('#DIV/0!'));
+                            return false;
+                        } else {
+                            $result = $operand1 / $operand2;
+                        }
+                        break;
+                    //    Power
+                    case '^':
+                        $result = pow($operand1, $operand2);
+                        break;
+                }
+            }
+        }
+
+        //    Log the result details
+        $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+        //    And push the result onto the stack
+        $stack->push('Value', $result);
+        return true;
+    }
+
+
+    // trigger an error, but nicely, if need be
+    protected function raiseFormulaError($errorMessage)
+    {
+        $this->formulaError = $errorMessage;
+        $this->cyclicReferenceStack->clear();
+        if (!$this->suppressFormulaErrors) {
+            throw new PHPExcel_Calculation_Exception($errorMessage);
+        }
+        trigger_error($errorMessage, E_USER_ERROR);
+    }
+
+
+    /**
+     * Extract range values
+     *
+     * @param    string                &$pRange    String based range representation
+     * @param    PHPExcel_Worksheet    $pSheet        Worksheet
+     * @param    boolean                $resetLog    Flag indicating whether calculation log should be reset or not
+     * @return  mixed                Array of values in range if range contains more than one element. Otherwise, a single value is returned.
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog = true)
+    {
+        // Return value
+        $returnValue = array ();
+
+//        echo 'extractCellRange('.$pRange.')', PHP_EOL;
+        if ($pSheet !== null) {
+            $pSheetName = $pSheet->getTitle();
+//            echo 'Passed sheet name is '.$pSheetName.PHP_EOL;
+//            echo 'Range reference is '.$pRange.PHP_EOL;
+            if (strpos($pRange, '!') !== false) {
+//                echo '$pRange reference includes sheet reference', PHP_EOL;
+                list($pSheetName, $pRange) = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
+//                echo 'New sheet name is '.$pSheetName, PHP_EOL;
+//                echo 'Adjusted Range reference is '.$pRange, PHP_EOL;
+                $pSheet = $this->workbook->getSheetByName($pSheetName);
+            }
+
+            // Extract range
+            $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
+            $pRange = $pSheetName.'!'.$pRange;
+            if (!isset($aReferences[1])) {
+                //    Single cell in range
+                sscanf($aReferences[0], '%[A-Z]%d', $currentCol, $currentRow);
+                $cellValue = null;
+                if ($pSheet->cellExists($aReferences[0])) {
+                    $returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                } else {
+                    $returnValue[$currentRow][$currentCol] = null;
+                }
+            } else {
+                // Extract cell data for all cells in the range
+                foreach ($aReferences as $reference) {
+                    // Extract range
+                    sscanf($reference, '%[A-Z]%d', $currentCol, $currentRow);
+                    $cellValue = null;
+                    if ($pSheet->cellExists($reference)) {
+                        $returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
+                    } else {
+                        $returnValue[$currentRow][$currentCol] = null;
+                    }
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * Extract range values
+     *
+     * @param    string                &$pRange    String based range representation
+     * @param    PHPExcel_Worksheet    $pSheet        Worksheet
+     * @return  mixed                Array of values in range if range contains more than one element. Otherwise, a single value is returned.
+     * @param    boolean                $resetLog    Flag indicating whether calculation log should be reset or not
+     * @throws    PHPExcel_Calculation_Exception
+     */
+    public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog = true)
+    {
+        // Return value
+        $returnValue = array ();
+
+//        echo 'extractNamedRange('.$pRange.')<br />';
+        if ($pSheet !== null) {
+            $pSheetName = $pSheet->getTitle();
+//            echo 'Current sheet name is '.$pSheetName.'<br />';
+//            echo 'Range reference is '.$pRange.'<br />';
+            if (strpos($pRange, '!') !== false) {
+//                echo '$pRange reference includes sheet reference', PHP_EOL;
+                list($pSheetName, $pRange) = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
+//                echo 'New sheet name is '.$pSheetName, PHP_EOL;
+//                echo 'Adjusted Range reference is '.$pRange, PHP_EOL;
+                $pSheet = $this->workbook->getSheetByName($pSheetName);
+            }
+
+            // Named range?
+            $namedRange = PHPExcel_NamedRange::resolveRange($pRange, $pSheet);
+            if ($namedRange !== null) {
+                $pSheet = $namedRange->getWorksheet();
+//                echo 'Named Range '.$pRange.' (';
+                $pRange = $namedRange->getRange();
+                $splitRange = PHPExcel_Cell::splitRange($pRange);
+                //    Convert row and column references
+                if (ctype_alpha($splitRange[0][0])) {
+                    $pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
+                } elseif (ctype_digit($splitRange[0][0])) {
+                    $pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
+                }
+//                echo $pRange.') is in sheet '.$namedRange->getWorksheet()->getTitle().'<br />';
+
+//                if ($pSheet->getTitle() != $namedRange->getWorksheet()->getTitle()) {
+//                    if (!$namedRange->getLocalOnly()) {
+//                        $pSheet = $namedRange->getWorksheet();
+//                    } else {
+//                        return $returnValue;
+//                    }
+//                }
+            } else {
+                return PHPExcel_Calculation_Functions::REF();
+            }
+
+            // Extract range
+            $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
+//            var_dump($aReferences);
+            if (!isset($aReferences[1])) {
+                //    Single cell (or single column or row) in range
+                list($currentCol, $currentRow) = PHPExcel_Cell::coordinateFromString($aReferences[0]);
+                $cellValue = null;
+                if ($pSheet->cellExists($aReferences[0])) {
+                    $returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                } else {
+                    $returnValue[$currentRow][$currentCol] = null;
+                }
+            } else {
+                // Extract cell data for all cells in the range
+                foreach ($aReferences as $reference) {
+                    // Extract range
+                    list($currentCol, $currentRow) = PHPExcel_Cell::coordinateFromString($reference);
+//                    echo 'NAMED RANGE: $currentCol='.$currentCol.' $currentRow='.$currentRow.'<br />';
+                    $cellValue = null;
+                    if ($pSheet->cellExists($reference)) {
+                        $returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
+                    } else {
+                        $returnValue[$currentRow][$currentCol] = null;
+                    }
+                }
+            }
+//                print_r($returnValue);
+//            echo '<br />';
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * Is a specific function implemented?
+     *
+     * @param    string    $pFunction    Function Name
+     * @return    boolean
+     */
+    public function isImplemented($pFunction = '')
+    {
+        $pFunction = strtoupper($pFunction);
+        if (isset(self::$PHPExcelFunctions[$pFunction])) {
+            return (self::$PHPExcelFunctions[$pFunction]['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY');
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Get a list of all implemented functions as an array of function objects
+     *
+     * @return    array of PHPExcel_Calculation_Function
+     */
+    public function listFunctions()
+    {
+        $returnValue = array();
+
+        foreach (self::$PHPExcelFunctions as $functionName => $function) {
+            if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
+                $returnValue[$functionName] = new PHPExcel_Calculation_Function(
+                    $function['category'],
+                    $functionName,
+                    $function['functionCall']
+                );
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * Get a list of all Excel function names
+     *
+     * @return    array
+     */
+    public function listAllFunctionNames()
+    {
+        return array_keys(self::$PHPExcelFunctions);
+    }
+
+    /**
+     * Get a list of implemented Excel function names
+     *
+     * @return    array
+     */
+    public function listFunctionNames()
+    {
+        $returnValue = array();
+        foreach (self::$PHPExcelFunctions as $functionName => $function) {
+            if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
+                $returnValue[] = $functionName;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Database.php b/lib/PHPExcel/Calculation/Database.php
new file mode 100644
index 000000000..b8d91cb6e
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Database.php
@@ -0,0 +1,676 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_Database
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Database
+{
+    /**
+     * fieldExtract
+     *
+     * Extracts the column ID to use for the data field.
+     *
+     * @access    private
+     * @param    mixed[]        $database        The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    mixed        $field            Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @return    string|NULL
+     *
+     */
+    private static function fieldExtract($database, $field)
+    {
+        $field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
+        $fieldNames = array_map('strtoupper', array_shift($database));
+
+        if (is_numeric($field)) {
+            $keys = array_keys($fieldNames);
+            return $keys[$field-1];
+        }
+        $key = array_search($field, $fieldNames);
+        return ($key) ? $key : null;
+    }
+
+    /**
+     * filter
+     *
+     * Parses the selection criteria, extracts the database rows that match those criteria, and
+     * returns that subset of rows.
+     *
+     * @access    private
+     * @param    mixed[]        $database        The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    mixed[]        $criteria        The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    array of mixed
+     *
+     */
+    private static function filter($database, $criteria)
+    {
+        $fieldNames = array_shift($database);
+        $criteriaNames = array_shift($criteria);
+
+        //    Convert the criteria into a set of AND/OR conditions with [:placeholders]
+        $testConditions = $testValues = array();
+        $testConditionsCount = 0;
+        foreach ($criteriaNames as $key => $criteriaName) {
+            $testCondition = array();
+            $testConditionCount = 0;
+            foreach ($criteria as $row => $criterion) {
+                if ($criterion[$key] > '') {
+                    $testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::ifCondition($criterion[$key]);
+                    $testConditionCount++;
+                }
+            }
+            if ($testConditionCount > 1) {
+                $testConditions[] = 'OR(' . implode(',', $testCondition) . ')';
+                $testConditionsCount++;
+            } elseif ($testConditionCount == 1) {
+                $testConditions[] = $testCondition[0];
+                $testConditionsCount++;
+            }
+        }
+
+        if ($testConditionsCount > 1) {
+            $testConditionSet = 'AND(' . implode(',', $testConditions) . ')';
+        } elseif ($testConditionsCount == 1) {
+            $testConditionSet = $testConditions[0];
+        }
+
+        //    Loop through each row of the database
+        foreach ($database as $dataRow => $dataValues) {
+            //    Substitute actual values from the database row for our [:placeholders]
+            $testConditionList = $testConditionSet;
+            foreach ($criteriaNames as $key => $criteriaName) {
+                $k = array_search($criteriaName, $fieldNames);
+                if (isset($dataValues[$k])) {
+                    $dataValue = $dataValues[$k];
+                    $dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
+                    $testConditionList = str_replace('[:' . $criteriaName . ']', $dataValue, $testConditionList);
+                }
+            }
+            //    evaluate the criteria against the row data
+            $result = PHPExcel_Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
+            //    If the row failed to meet the criteria, remove it from the database
+            if (!$result) {
+                unset($database[$dataRow]);
+            }
+        }
+
+        return $database;
+    }
+
+
+    private static function getFilteredColumn($database, $field, $criteria)
+    {
+        //    reduce the database to a set of rows that match all the criteria
+        $database = self::filter($database, $criteria);
+        //    extract an array of values for the requested column
+        $colData = array();
+        foreach ($database as $row) {
+            $colData[] = $row[$field];
+        }
+        
+        return $colData;
+    }
+
+    /**
+     * DAVERAGE
+     *
+     * Averages the values in a column of a list or database that match conditions you specify.
+     *
+     * Excel Function:
+     *        DAVERAGE(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DAVERAGE($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::AVERAGE(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DCOUNT
+     *
+     * Counts the cells that contain numbers in a column of a list or database that match conditions
+     * that you specify.
+     *
+     * Excel Function:
+     *        DCOUNT(database,[field],criteria)
+     *
+     * Excel Function:
+     *        DAVERAGE(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    integer
+     *
+     * @TODO    The field argument is optional. If field is omitted, DCOUNT counts all records in the
+     *            database that match the criteria.
+     *
+     */
+    public static function DCOUNT($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::COUNT(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DCOUNTA
+     *
+     * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DCOUNTA(database,[field],criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    integer
+     *
+     * @TODO    The field argument is optional. If field is omitted, DCOUNTA counts all records in the
+     *            database that match the criteria.
+     *
+     */
+    public static function DCOUNTA($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        //    reduce the database to a set of rows that match all the criteria
+        $database = self::filter($database, $criteria);
+        //    extract an array of values for the requested column
+        $colData = array();
+        foreach ($database as $row) {
+            $colData[] = $row[$field];
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::COUNTA(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DGET
+     *
+     * Extracts a single value from a column of a list or database that matches conditions that you
+     * specify.
+     *
+     * Excel Function:
+     *        DGET(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    mixed
+     *
+     */
+    public static function DGET($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        $colData = self::getFilteredColumn($database, $field, $criteria);
+        if (count($colData) > 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        return $colData[0];
+    }
+
+
+    /**
+     * DMAX
+     *
+     * Returns the largest number in a column of a list or database that matches conditions you that
+     * specify.
+     *
+     * Excel Function:
+     *        DMAX(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DMAX($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::MAX(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DMIN
+     *
+     * Returns the smallest number in a column of a list or database that matches conditions you that
+     * specify.
+     *
+     * Excel Function:
+     *        DMIN(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DMIN($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::MIN(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DPRODUCT
+     *
+     * Multiplies the values in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DPRODUCT(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DPRODUCT($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_MathTrig::PRODUCT(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DSTDEV
+     *
+     * Estimates the standard deviation of a population based on a sample by using the numbers in a
+     * column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSTDEV(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DSTDEV($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::STDEV(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DSTDEVP
+     *
+     * Calculates the standard deviation of a population based on the entire population by using the
+     * numbers in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSTDEVP(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DSTDEVP($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::STDEVP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DSUM
+     *
+     * Adds the numbers in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSUM(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DSUM($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_MathTrig::SUM(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DVAR
+     *
+     * Estimates the variance of a population based on a sample by using the numbers in a column
+     * of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DVAR(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DVAR($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::VARFunc(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+
+
+    /**
+     * DVARP
+     *
+     * Calculates the variance of a population based on the entire population by using the numbers
+     * in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DVARP(database,field,criteria)
+     *
+     * @access    public
+     * @category Database Functions
+     * @param    mixed[]            $database    The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param    string|integer    $field        Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param    mixed[]            $criteria    The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     * @return    float
+     *
+     */
+    public static function DVARP($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if (is_null($field)) {
+            return null;
+        }
+
+        // Return
+        return PHPExcel_Calculation_Statistical::VARP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/lib/PHPExcel/Calculation/DateTime.php b/lib/PHPExcel/Calculation/DateTime.php
new file mode 100644
index 000000000..72f4c7a23
--- /dev/null
+++ b/lib/PHPExcel/Calculation/DateTime.php
@@ -0,0 +1,1553 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_DateTime
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_DateTime
+{
+    /**
+     * Identify if a year is a leap year or not
+     *
+     * @param    integer    $year    The year to test
+     * @return    boolean            TRUE if the year is a leap year, otherwise FALSE
+     */
+    public static function isLeapYear($year)
+    {
+        return ((($year % 4) == 0) && (($year % 100) != 0) || (($year % 400) == 0));
+    }
+
+
+    /**
+     * Return the number of days between two dates based on a 360 day calendar
+     *
+     * @param    integer    $startDay        Day of month of the start date
+     * @param    integer    $startMonth        Month of the start date
+     * @param    integer    $startYear        Year of the start date
+     * @param    integer    $endDay            Day of month of the start date
+     * @param    integer    $endMonth        Month of the start date
+     * @param    integer    $endYear        Year of the start date
+     * @param    boolean $methodUS        Whether to use the US method or the European method of calculation
+     * @return    integer    Number of days between the start date and the end date
+     */
+    private static function dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, $methodUS)
+    {
+        if ($startDay == 31) {
+            --$startDay;
+        } elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !self::isLeapYear($startYear))))) {
+            $startDay = 30;
+        }
+        if ($endDay == 31) {
+            if ($methodUS && $startDay != 30) {
+                $endDay = 1;
+                if ($endMonth == 12) {
+                    ++$endYear;
+                    $endMonth = 1;
+                } else {
+                    ++$endMonth;
+                }
+            } else {
+                $endDay = 30;
+            }
+        }
+
+        return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
+    }
+
+
+    /**
+     * getDateValue
+     *
+     * @param    string    $dateValue
+     * @return    mixed    Excel date/time serial value, or string if error
+     */
+    public static function getDateValue($dateValue)
+    {
+        if (!is_numeric($dateValue)) {
+            if ((is_string($dateValue)) &&
+                (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
+                $dateValue = PHPExcel_Shared_Date::PHPToExcel($dateValue);
+            } else {
+                $saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
+                PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+                $dateValue = self::DATEVALUE($dateValue);
+                PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
+            }
+        }
+        return $dateValue;
+    }
+
+
+    /**
+     * getTimeValue
+     *
+     * @param    string    $timeValue
+     * @return    mixed    Excel date/time serial value, or string if error
+     */
+    private static function getTimeValue($timeValue)
+    {
+        $saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
+        PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+        $timeValue = self::TIMEVALUE($timeValue);
+        PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
+        return $timeValue;
+    }
+
+
+    private static function adjustDateByMonths($dateValue = 0, $adjustmentMonths = 0)
+    {
+        // Execute function
+        $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
+        $oMonth = (int) $PHPDateObject->format('m');
+        $oYear = (int) $PHPDateObject->format('Y');
+
+        $adjustmentMonthsString = (string) $adjustmentMonths;
+        if ($adjustmentMonths > 0) {
+            $adjustmentMonthsString = '+'.$adjustmentMonths;
+        }
+        if ($adjustmentMonths != 0) {
+            $PHPDateObject->modify($adjustmentMonthsString.' months');
+        }
+        $nMonth = (int) $PHPDateObject->format('m');
+        $nYear = (int) $PHPDateObject->format('Y');
+
+        $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
+        if ($monthDiff != $adjustmentMonths) {
+            $adjustDays = (int) $PHPDateObject->format('d');
+            $adjustDaysString = '-'.$adjustDays.' days';
+            $PHPDateObject->modify($adjustDaysString);
+        }
+        return $PHPDateObject;
+    }
+
+
+    /**
+     * DATETIMENOW
+     *
+     * Returns the current date and time.
+     * The NOW function is useful when you need to display the current date and time on a worksheet or
+     * calculate a value based on the current date and time, and have that value updated each time you
+     * open the worksheet.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        NOW()
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function DATETIMENOW()
+    {
+        $saveTimeZone = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+        $retValue = false;
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                $retValue = (float) PHPExcel_Shared_Date::PHPToExcel(time());
+                break;
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                $retValue = (integer) time();
+                break;
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                $retValue = new DateTime();
+                break;
+        }
+        date_default_timezone_set($saveTimeZone);
+
+        return $retValue;
+    }
+
+
+    /**
+     * DATENOW
+     *
+     * Returns the current date.
+     * The NOW function is useful when you need to display the current date and time on a worksheet or
+     * calculate a value based on the current date and time, and have that value updated each time you
+     * open the worksheet.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        TODAY()
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function DATENOW()
+    {
+        $saveTimeZone = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+        $retValue = false;
+        $excelDateTime = floor(PHPExcel_Shared_Date::PHPToExcel(time()));
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                $retValue = (float) $excelDateTime;
+                break;
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                $retValue = (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateTime);
+                break;
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                $retValue = PHPExcel_Shared_Date::ExcelToPHPObject($excelDateTime);
+                break;
+        }
+        date_default_timezone_set($saveTimeZone);
+
+        return $retValue;
+    }
+
+
+    /**
+     * DATE
+     *
+     * The DATE function returns a value that represents a particular date.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * format of your regional settings. PHPExcel does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        DATE(year,month,day)
+     *
+     * PHPExcel is a lot more forgiving than MS Excel when passing non numeric values to this function.
+     * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
+     *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    integer        $year    The value of the year argument can include one to four digits.
+     *                                Excel interprets the year argument according to the configured
+     *                                date system: 1900 or 1904.
+     *                                If year is between 0 (zero) and 1899 (inclusive), Excel adds that
+     *                                value to 1900 to calculate the year. For example, DATE(108,1,2)
+     *                                returns January 2, 2008 (1900+108).
+     *                                If year is between 1900 and 9999 (inclusive), Excel uses that
+     *                                value as the year. For example, DATE(2008,1,2) returns January 2,
+     *                                2008.
+     *                                If year is less than 0 or is 10000 or greater, Excel returns the
+     *                                #NUM! error value.
+     * @param    integer        $month    A positive or negative integer representing the month of the year
+     *                                from 1 to 12 (January to December).
+     *                                If month is greater than 12, month adds that number of months to
+     *                                the first month in the year specified. For example, DATE(2008,14,2)
+     *                                returns the serial number representing February 2, 2009.
+     *                                If month is less than 1, month subtracts the magnitude of that
+     *                                number of months, plus 1, from the first month in the year
+     *                                specified. For example, DATE(2008,-3,2) returns the serial number
+     *                                representing September 2, 2007.
+     * @param    integer        $day    A positive or negative integer representing the day of the month
+     *                                from 1 to 31.
+     *                                If day is greater than the number of days in the month specified,
+     *                                day adds that number of days to the first day in the month. For
+     *                                example, DATE(2008,1,35) returns the serial number representing
+     *                                February 4, 2008.
+     *                                If day is less than 1, day subtracts the magnitude that number of
+     *                                days, plus one, from the first day of the month specified. For
+     *                                example, DATE(2008,1,-15) returns the serial number representing
+     *                                December 16, 2007.
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function DATE($year = 0, $month = 1, $day = 1)
+    {
+        $year  = PHPExcel_Calculation_Functions::flattenSingleValue($year);
+        $month = PHPExcel_Calculation_Functions::flattenSingleValue($month);
+        $day   = PHPExcel_Calculation_Functions::flattenSingleValue($day);
+
+        if (($month !== null) && (!is_numeric($month))) {
+            $month = PHPExcel_Shared_Date::monthStringToNumber($month);
+        }
+
+        if (($day !== null) && (!is_numeric($day))) {
+            $day = PHPExcel_Shared_Date::dayStringToNumber($day);
+        }
+
+        $year = ($year !== null) ? PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
+        $month = ($month !== null) ? PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
+        $day = ($day !== null) ? PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
+        if ((!is_numeric($year)) ||
+            (!is_numeric($month)) ||
+            (!is_numeric($day))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $year    = (integer) $year;
+        $month    = (integer) $month;
+        $day    = (integer) $day;
+
+        $baseYear = PHPExcel_Shared_Date::getExcelCalendar();
+        // Validate parameters
+        if ($year < ($baseYear-1900)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ((($baseYear-1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        if (($year < $baseYear) && ($year >= ($baseYear-1900))) {
+            $year += 1900;
+        }
+
+        if ($month < 1) {
+            //    Handle year/month adjustment if month < 1
+            --$month;
+            $year += ceil($month / 12) - 1;
+            $month = 13 - abs($month % 12);
+        } elseif ($month > 12) {
+            //    Handle year/month adjustment if month > 12
+            $year += floor($month / 12);
+            $month = ($month % 12);
+        }
+
+        // Re-validate the year parameter after adjustments
+        if (($year < $baseYear) || ($year >= 10000)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year, $month, $day);
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                return (float) $excelDateValue;
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                return PHPExcel_Shared_Date::ExcelToPHPObject($excelDateValue);
+        }
+    }
+
+
+    /**
+     * TIME
+     *
+     * The TIME function returns a value that represents a particular time.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
+     * format of your regional settings. PHPExcel does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        TIME(hour,minute,second)
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    integer        $hour        A number from 0 (zero) to 32767 representing the hour.
+     *                                    Any value greater than 23 will be divided by 24 and the remainder
+     *                                    will be treated as the hour value. For example, TIME(27,0,0) =
+     *                                    TIME(3,0,0) = .125 or 3:00 AM.
+     * @param    integer        $minute        A number from 0 to 32767 representing the minute.
+     *                                    Any value greater than 59 will be converted to hours and minutes.
+     *                                    For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
+     * @param    integer        $second        A number from 0 to 32767 representing the second.
+     *                                    Any value greater than 59 will be converted to hours, minutes,
+     *                                    and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
+     *                                    or 12:33:20 AM
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function TIME($hour = 0, $minute = 0, $second = 0)
+    {
+        $hour = PHPExcel_Calculation_Functions::flattenSingleValue($hour);
+        $minute = PHPExcel_Calculation_Functions::flattenSingleValue($minute);
+        $second = PHPExcel_Calculation_Functions::flattenSingleValue($second);
+
+        if ($hour == '') {
+            $hour = 0;
+        }
+        if ($minute == '') {
+            $minute = 0;
+        }
+        if ($second == '') {
+            $second = 0;
+        }
+
+        if ((!is_numeric($hour)) || (!is_numeric($minute)) || (!is_numeric($second))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $hour = (integer) $hour;
+        $minute = (integer) $minute;
+        $second = (integer) $second;
+
+        if ($second < 0) {
+            $minute += floor($second / 60);
+            $second = 60 - abs($second % 60);
+            if ($second == 60) {
+                $second = 0;
+            }
+        } elseif ($second >= 60) {
+            $minute += floor($second / 60);
+            $second = $second % 60;
+        }
+        if ($minute < 0) {
+            $hour += floor($minute / 60);
+            $minute = 60 - abs($minute % 60);
+            if ($minute == 60) {
+                $minute = 0;
+            }
+        } elseif ($minute >= 60) {
+            $hour += floor($minute / 60);
+            $minute = $minute % 60;
+        }
+
+        if ($hour > 23) {
+            $hour = $hour % 24;
+        } elseif ($hour < 0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                $date = 0;
+                $calendar = PHPExcel_Shared_Date::getExcelCalendar();
+                if ($calendar != PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900) {
+                    $date = 1;
+                }
+                return (float) PHPExcel_Shared_Date::FormattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::FormattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));    // -2147468400; //    -2147472000 + 3600
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                $dayAdjust = 0;
+                if ($hour < 0) {
+                    $dayAdjust = floor($hour / 24);
+                    $hour = 24 - abs($hour % 24);
+                    if ($hour == 24) {
+                        $hour = 0;
+                    }
+                } elseif ($hour >= 24) {
+                    $dayAdjust = floor($hour / 24);
+                    $hour = $hour % 24;
+                }
+                $phpDateObject = new DateTime('1900-01-01 '.$hour.':'.$minute.':'.$second);
+                if ($dayAdjust != 0) {
+                    $phpDateObject->modify($dayAdjust.' days');
+                }
+                return $phpDateObject;
+        }
+    }
+
+
+    /**
+     * DATEVALUE
+     *
+     * Returns a value that represents a particular date.
+     * Use DATEVALUE to convert a date represented by a text string to an Excel or PHP date/time stamp
+     * value.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * format of your regional settings. PHPExcel does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        DATEVALUE(dateValue)
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    string    $dateValue        Text that represents a date in a Microsoft Excel date format.
+     *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
+     *                                    quotation marks that represent dates. Using the default date
+     *                                    system in Excel for Windows, date_text must represent a date from
+     *                                    January 1, 1900, to December 31, 9999. Using the default date
+     *                                    system in Excel for the Macintosh, date_text must represent a date
+     *                                    from January 1, 1904, to December 31, 9999. DATEVALUE returns the
+     *                                    #VALUE! error value if date_text is out of this range.
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function DATEVALUE($dateValue = 1)
+    {
+        $dateValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($dateValue), '"');
+        //    Strip any ordinals because they're allowed in Excel (English only)
+        $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
+        //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
+        $dateValue    = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
+
+        $yearFound = false;
+        $t1 = explode(' ', $dateValue);
+        foreach ($t1 as &$t) {
+            if ((is_numeric($t)) && ($t > 31)) {
+                if ($yearFound) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                } else {
+                    if ($t < 100) {
+                        $t += 1900;
+                    }
+                    $yearFound = true;
+                }
+            }
+        }
+        if ((count($t1) == 1) && (strpos($t, ':') != false)) {
+            //    We've been fed a time value without any date
+            return 0.0;
+        } elseif (count($t1) == 2) {
+            //    We only have two parts of the date: either day/month or month/year
+            if ($yearFound) {
+                array_unshift($t1, 1);
+            } else {
+                array_push($t1, date('Y'));
+            }
+        }
+        unset($t);
+        $dateValue = implode(' ', $t1);
+
+        $PHPDateArray = date_parse($dateValue);
+        if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
+            $testVal1 = strtok($dateValue, '- ');
+            if ($testVal1 !== false) {
+                $testVal2 = strtok('- ');
+                if ($testVal2 !== false) {
+                    $testVal3 = strtok('- ');
+                    if ($testVal3 === false) {
+                        $testVal3 = strftime('%Y');
+                    }
+                } else {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            $PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
+            if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
+                $PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
+                if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+            }
+        }
+
+        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
+            // Execute function
+            if ($PHPDateArray['year'] == '') {
+                $PHPDateArray['year'] = strftime('%Y');
+            }
+            if ($PHPDateArray['year'] < 1900) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            if ($PHPDateArray['month'] == '') {
+                $PHPDateArray['month'] = strftime('%m');
+            }
+            if ($PHPDateArray['day'] == '') {
+                $PHPDateArray['day'] = strftime('%d');
+            }
+            $excelDateValue = floor(
+                PHPExcel_Shared_Date::FormattedPHPToExcel(
+                    $PHPDateArray['year'],
+                    $PHPDateArray['month'],
+                    $PHPDateArray['day'],
+                    $PHPDateArray['hour'],
+                    $PHPDateArray['minute'],
+                    $PHPDateArray['second']
+                )
+            );
+
+            switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+                case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                    return (float) $excelDateValue;
+                case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                    return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
+                case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                    return new DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * TIMEVALUE
+     *
+     * Returns a value that represents a particular time.
+     * Use TIMEVALUE to convert a time represented by a text string to an Excel or PHP date/time stamp
+     * value.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
+     * format of your regional settings. PHPExcel does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        TIMEVALUE(timeValue)
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    string    $timeValue        A text string that represents a time in any one of the Microsoft
+     *                                    Excel time formats; for example, "6:45 PM" and "18:45" text strings
+     *                                    within quotation marks that represent time.
+     *                                    Date information in time_text is ignored.
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function TIMEVALUE($timeValue)
+    {
+        $timeValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($timeValue), '"');
+        $timeValue = str_replace(array('/', '.'), array('-', '-'), $timeValue);
+
+        $PHPDateArray = date_parse($timeValue);
+        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel(
+                    $PHPDateArray['year'],
+                    $PHPDateArray['month'],
+                    $PHPDateArray['day'],
+                    $PHPDateArray['hour'],
+                    $PHPDateArray['minute'],
+                    $PHPDateArray['second']
+                );
+            } else {
+                $excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel(1900, 1, 1, $PHPDateArray['hour'], $PHPDateArray['minute'], $PHPDateArray['second']) - 1;
+            }
+
+            switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+                case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                    return (float) $excelDateValue;
+                case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                    return (integer) $phpDateValue = PHPExcel_Shared_Date::ExcelToPHP($excelDateValue+25569) - 3600;
+                case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                    return new DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * DATEDIF
+     *
+     * @param    mixed    $startDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
+     *                                    or a standard date string
+     * @param    mixed    $endDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
+     *                                    or a standard date string
+     * @param    string    $unit
+     * @return    integer    Interval between the dates
+     */
+    public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D')
+    {
+        $startDate = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
+        $endDate   = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
+        $unit      = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($unit));
+
+        if (is_string($startDate = self::getDateValue($startDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($endDate = self::getDateValue($endDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Validate parameters
+        if ($startDate >= $endDate) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $difference = $endDate - $startDate;
+
+        $PHPStartDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
+        $startDays = $PHPStartDateObject->format('j');
+        $startMonths = $PHPStartDateObject->format('n');
+        $startYears = $PHPStartDateObject->format('Y');
+
+        $PHPEndDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
+        $endDays = $PHPEndDateObject->format('j');
+        $endMonths = $PHPEndDateObject->format('n');
+        $endYears = $PHPEndDateObject->format('Y');
+
+        $retVal = PHPExcel_Calculation_Functions::NaN();
+        switch ($unit) {
+            case 'D':
+                $retVal = intval($difference);
+                break;
+            case 'M':
+                $retVal = intval($endMonths - $startMonths) + (intval($endYears - $startYears) * 12);
+                //    We're only interested in full months
+                if ($endDays < $startDays) {
+                    --$retVal;
+                }
+                break;
+            case 'Y':
+                $retVal = intval($endYears - $startYears);
+                //    We're only interested in full months
+                if ($endMonths < $startMonths) {
+                    --$retVal;
+                } elseif (($endMonths == $startMonths) && ($endDays < $startDays)) {
+                    --$retVal;
+                }
+                break;
+            case 'MD':
+                if ($endDays < $startDays) {
+                    $retVal = $endDays;
+                    $PHPEndDateObject->modify('-'.$endDays.' days');
+                    $adjustDays = $PHPEndDateObject->format('j');
+                    if ($adjustDays > $startDays) {
+                        $retVal += ($adjustDays - $startDays);
+                    }
+                } else {
+                    $retVal = $endDays - $startDays;
+                }
+                break;
+            case 'YM':
+                $retVal = intval($endMonths - $startMonths);
+                if ($retVal < 0) {
+                    $retVal += 12;
+                }
+                //    We're only interested in full months
+                if ($endDays < $startDays) {
+                    --$retVal;
+                }
+                break;
+            case 'YD':
+                $retVal = intval($difference);
+                if ($endYears > $startYears) {
+                    while ($endYears > $startYears) {
+                        $PHPEndDateObject->modify('-1 year');
+                        $endYears = $PHPEndDateObject->format('Y');
+                    }
+                    $retVal = $PHPEndDateObject->format('z') - $PHPStartDateObject->format('z');
+                    if ($retVal < 0) {
+                        $retVal += 365;
+                    }
+                }
+                break;
+            default:
+                $retVal = PHPExcel_Calculation_Functions::NaN();
+        }
+        return $retVal;
+    }
+
+
+    /**
+     * DAYS360
+     *
+     * Returns the number of days between two dates based on a 360-day year (twelve 30-day months),
+     * which is used in some accounting calculations. Use this function to help compute payments if
+     * your accounting system is based on twelve 30-day months.
+     *
+     * Excel Function:
+     *        DAYS360(startDate,endDate[,method])
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    mixed        $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     * @param    mixed        $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     * @param    boolean        $method            US or European Method
+     *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
+     *                                        the last day of a month, it becomes equal to the 30th of the
+     *                                        same month. If the ending date is the last day of a month and
+     *                                        the starting date is earlier than the 30th of a month, the
+     *                                        ending date becomes equal to the 1st of the next month;
+     *                                        otherwise the ending date becomes equal to the 30th of the
+     *                                        same month.
+     *                                        TRUE: European method. Starting dates and ending dates that
+     *                                        occur on the 31st of a month become equal to the 30th of the
+     *                                        same month.
+     * @return    integer        Number of days between start date and end date
+     */
+    public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
+    {
+        $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
+        $endDate    = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
+
+        if (is_string($startDate = self::getDateValue($startDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($endDate = self::getDateValue($endDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (!is_bool($method)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Execute function
+        $PHPStartDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
+        $startDay = $PHPStartDateObject->format('j');
+        $startMonth = $PHPStartDateObject->format('n');
+        $startYear = $PHPStartDateObject->format('Y');
+
+        $PHPEndDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
+        $endDay = $PHPEndDateObject->format('j');
+        $endMonth = $PHPEndDateObject->format('n');
+        $endYear = $PHPEndDateObject->format('Y');
+
+        return self::dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, !$method);
+    }
+
+
+    /**
+     * YEARFRAC
+     *
+     * Calculates the fraction of the year represented by the number of whole days between two dates
+     * (the start_date and the end_date).
+     * Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or
+     * obligations to assign to a specific term.
+     *
+     * Excel Function:
+     *        YEARFRAC(startDate,endDate[,method])
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    mixed    $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @param    mixed    $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @param    integer    $method            Method used for the calculation
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float    fraction of the year
+     */
+    public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
+    {
+        $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
+        $endDate    = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
+        $method        = PHPExcel_Calculation_Functions::flattenSingleValue($method);
+
+        if (is_string($startDate = self::getDateValue($startDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($endDate = self::getDateValue($endDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (((is_numeric($method)) && (!is_string($method))) || ($method == '')) {
+            switch ($method) {
+                case 0:
+                    return self::DAYS360($startDate, $endDate) / 360;
+                case 1:
+                    $days = self::DATEDIF($startDate, $endDate);
+                    $startYear = self::YEAR($startDate);
+                    $endYear = self::YEAR($endDate);
+                    $years = $endYear - $startYear + 1;
+                    $leapDays = 0;
+                    if ($years == 1) {
+                        if (self::isLeapYear($endYear)) {
+                            $startMonth = self::MONTHOFYEAR($startDate);
+                            $endMonth = self::MONTHOFYEAR($endDate);
+                            $endDay = self::DAYOFMONTH($endDate);
+                            if (($startMonth < 3) ||
+                                (($endMonth * 100 + $endDay) >= (2 * 100 + 29))) {
+                                 $leapDays += 1;
+                            }
+                        }
+                    } else {
+                        for ($year = $startYear; $year <= $endYear; ++$year) {
+                            if ($year == $startYear) {
+                                $startMonth = self::MONTHOFYEAR($startDate);
+                                $startDay = self::DAYOFMONTH($startDate);
+                                if ($startMonth < 3) {
+                                    $leapDays += (self::isLeapYear($year)) ? 1 : 0;
+                                }
+                            } elseif ($year == $endYear) {
+                                $endMonth = self::MONTHOFYEAR($endDate);
+                                $endDay = self::DAYOFMONTH($endDate);
+                                if (($endMonth * 100 + $endDay) >= (2 * 100 + 29)) {
+                                    $leapDays += (self::isLeapYear($year)) ? 1 : 0;
+                                }
+                            } else {
+                                $leapDays += (self::isLeapYear($year)) ? 1 : 0;
+                            }
+                        }
+                        if ($years == 2) {
+                            if (($leapDays == 0) && (self::isLeapYear($startYear)) && ($days > 365)) {
+                                $leapDays = 1;
+                            } elseif ($days < 366) {
+                                $years = 1;
+                            }
+                        }
+                        $leapDays /= $years;
+                    }
+                    return $days / (365 + $leapDays);
+                case 2:
+                    return self::DATEDIF($startDate, $endDate) / 360;
+                case 3:
+                    return self::DATEDIF($startDate, $endDate) / 365;
+                case 4:
+                    return self::DAYS360($startDate, $endDate, true) / 360;
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * NETWORKDAYS
+     *
+     * Returns the number of whole working days between start_date and end_date. Working days
+     * exclude weekends and any dates identified in holidays.
+     * Use NETWORKDAYS to calculate employee benefits that accrue based on the number of days
+     * worked during a specific term.
+     *
+     * Excel Function:
+     *        NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    mixed            $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                            PHP DateTime object, or a standard date string
+     * @param    mixed            $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                            PHP DateTime object, or a standard date string
+     * @param    mixed            $holidays,...    Optional series of Excel date serial value (float), PHP date
+     *                                            timestamp (integer), PHP DateTime object, or a standard date
+     *                                            strings that will be excluded from the working calendar, such
+     *                                            as state and federal holidays and floating holidays.
+     * @return    integer            Interval between the dates
+     */
+    public static function NETWORKDAYS($startDate, $endDate)
+    {
+        //    Retrieve the mandatory start and end date that are referenced in the function definition
+        $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
+        $endDate    = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
+        //    Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
+        $dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        array_shift($dateArgs);
+        array_shift($dateArgs);
+
+        //    Validate the start and end dates
+        if (is_string($startDate = $sDate = self::getDateValue($startDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $startDate = (float) floor($startDate);
+        if (is_string($endDate = $eDate = self::getDateValue($endDate))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $endDate = (float) floor($endDate);
+
+        if ($sDate > $eDate) {
+            $startDate = $eDate;
+            $endDate = $sDate;
+        }
+
+        // Execute function
+        $startDoW = 6 - self::DAYOFWEEK($startDate, 2);
+        if ($startDoW < 0) {
+            $startDoW = 0;
+        }
+        $endDoW = self::DAYOFWEEK($endDate, 2);
+        if ($endDoW >= 6) {
+            $endDoW = 0;
+        }
+
+        $wholeWeekDays = floor(($endDate - $startDate) / 7) * 5;
+        $partWeekDays = $endDoW + $startDoW;
+        if ($partWeekDays > 5) {
+            $partWeekDays -= 5;
+        }
+
+        //    Test any extra holiday parameters
+        $holidayCountedArray = array();
+        foreach ($dateArgs as $holidayDate) {
+            if (is_string($holidayDate = self::getDateValue($holidayDate))) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
+                if ((self::DAYOFWEEK($holidayDate, 2) < 6) && (!in_array($holidayDate, $holidayCountedArray))) {
+                    --$partWeekDays;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+        }
+
+        if ($sDate > $eDate) {
+            return 0 - ($wholeWeekDays + $partWeekDays);
+        }
+        return $wholeWeekDays + $partWeekDays;
+    }
+
+
+    /**
+     * WORKDAY
+     *
+     * Returns the date that is the indicated number of working days before or after a date (the
+     * starting date). Working days exclude weekends and any dates identified as holidays.
+     * Use WORKDAY to exclude weekends or holidays when you calculate invoice due dates, expected
+     * delivery times, or the number of days of work performed.
+     *
+     * Excel Function:
+     *        WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
+     *
+     * @access    public
+     * @category Date/Time Functions
+     * @param    mixed        $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     * @param    integer        $endDays        The number of nonweekend and nonholiday days before or after
+     *                                        startDate. A positive value for days yields a future date; a
+     *                                        negative value yields a past date.
+     * @param    mixed        $holidays,...    Optional series of Excel date serial value (float), PHP date
+     *                                        timestamp (integer), PHP DateTime object, or a standard date
+     *                                        strings that will be excluded from the working calendar, such
+     *                                        as state and federal holidays and floating holidays.
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function WORKDAY($startDate, $endDays)
+    {
+        //    Retrieve the mandatory start date and days that are referenced in the function definition
+        $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
+        $endDays    = PHPExcel_Calculation_Functions::flattenSingleValue($endDays);
+        //    Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
+        $dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        array_shift($dateArgs);
+        array_shift($dateArgs);
+
+        if ((is_string($startDate = self::getDateValue($startDate))) || (!is_numeric($endDays))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $startDate = (float) floor($startDate);
+        $endDays = (int) floor($endDays);
+        //    If endDays is 0, we always return startDate
+        if ($endDays == 0) {
+            return $startDate;
+        }
+
+        $decrementing = ($endDays < 0) ? true : false;
+
+        //    Adjust the start date if it falls over a weekend
+
+        $startDoW = self::DAYOFWEEK($startDate, 3);
+        if (self::DAYOFWEEK($startDate, 3) >= 5) {
+            $startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
+            ($decrementing) ? $endDays++ : $endDays--;
+        }
+
+        //    Add endDays
+        $endDate = (float) $startDate + (intval($endDays / 5) * 7) + ($endDays % 5);
+
+        //    Adjust the calculated end date if it falls over a weekend
+        $endDoW = self::DAYOFWEEK($endDate, 3);
+        if ($endDoW >= 5) {
+            $endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
+        }
+
+        //    Test any extra holiday parameters
+        if (!empty($dateArgs)) {
+            $holidayCountedArray = $holidayDates = array();
+            foreach ($dateArgs as $holidayDate) {
+                if (($holidayDate !== null) && (trim($holidayDate) > '')) {
+                    if (is_string($holidayDate = self::getDateValue($holidayDate))) {
+                        return PHPExcel_Calculation_Functions::VALUE();
+                    }
+                    if (self::DAYOFWEEK($holidayDate, 3) < 5) {
+                        $holidayDates[] = $holidayDate;
+                    }
+                }
+            }
+            if ($decrementing) {
+                rsort($holidayDates, SORT_NUMERIC);
+            } else {
+                sort($holidayDates, SORT_NUMERIC);
+            }
+            foreach ($holidayDates as $holidayDate) {
+                if ($decrementing) {
+                    if (($holidayDate <= $startDate) && ($holidayDate >= $endDate)) {
+                        if (!in_array($holidayDate, $holidayCountedArray)) {
+                            --$endDate;
+                            $holidayCountedArray[] = $holidayDate;
+                        }
+                    }
+                } else {
+                    if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
+                        if (!in_array($holidayDate, $holidayCountedArray)) {
+                            ++$endDate;
+                            $holidayCountedArray[] = $holidayDate;
+                        }
+                    }
+                }
+                //    Adjust the calculated end date if it falls over a weekend
+                $endDoW = self::DAYOFWEEK($endDate, 3);
+                if ($endDoW >= 5) {
+                    $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
+                }
+            }
+        }
+
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                return (float) $endDate;
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                return (integer) PHPExcel_Shared_Date::ExcelToPHP($endDate);
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                return PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
+        }
+    }
+
+
+    /**
+     * DAYOFMONTH
+     *
+     * Returns the day of the month, for a specified date. The day is given as an integer
+     * ranging from 1 to 31.
+     *
+     * Excel Function:
+     *        DAY(dateValue)
+     *
+     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @return    int        Day of the month
+     */
+    public static function DAYOFMONTH($dateValue = 1)
+    {
+        $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($dateValue == 0.0) {
+            return 0;
+        } elseif ($dateValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
+
+        return (int) $PHPDateObject->format('j');
+    }
+
+
+    /**
+     * DAYOFWEEK
+     *
+     * Returns the day of the week for a specified date. The day is given as an integer
+     * ranging from 0 to 7 (dependent on the requested style).
+     *
+     * Excel Function:
+     *        WEEKDAY(dateValue[,style])
+     *
+     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @param    int        $style            A number that determines the type of return value
+     *                                        1 or omitted    Numbers 1 (Sunday) through 7 (Saturday).
+     *                                        2                Numbers 1 (Monday) through 7 (Sunday).
+     *                                        3                Numbers 0 (Monday) through 6 (Sunday).
+     * @return    int        Day of the week value
+     */
+    public static function DAYOFWEEK($dateValue = 1, $style = 1)
+    {
+        $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+        $style        = PHPExcel_Calculation_Functions::flattenSingleValue($style);
+
+        if (!is_numeric($style)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif (($style < 1) || ($style > 3)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $style = floor($style);
+
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($dateValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
+        $DoW = $PHPDateObject->format('w');
+
+        $firstDay = 1;
+        switch ($style) {
+            case 1:
+                ++$DoW;
+                break;
+            case 2:
+                if ($DoW == 0) {
+                    $DoW = 7;
+                }
+                break;
+            case 3:
+                if ($DoW == 0) {
+                    $DoW = 7;
+                }
+                $firstDay = 0;
+                --$DoW;
+                break;
+        }
+        if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL) {
+            //    Test for Excel's 1900 leap year, and introduce the error as required
+            if (($PHPDateObject->format('Y') == 1900) && ($PHPDateObject->format('n') <= 2)) {
+                --$DoW;
+                if ($DoW < $firstDay) {
+                    $DoW += 7;
+                }
+            }
+        }
+
+        return (int) $DoW;
+    }
+
+
+    /**
+     * WEEKOFYEAR
+     *
+     * Returns the week of the year for a specified date.
+     * The WEEKNUM function considers the week containing January 1 to be the first week of the year.
+     * However, there is a European standard that defines the first week as the one with the majority
+     * of days (four or more) falling in the new year. This means that for years in which there are
+     * three days or less in the first week of January, the WEEKNUM function returns week numbers
+     * that are incorrect according to the European standard.
+     *
+     * Excel Function:
+     *        WEEKNUM(dateValue[,style])
+     *
+     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @param    boolean    $method            Week begins on Sunday or Monday
+     *                                        1 or omitted    Week begins on Sunday.
+     *                                        2                Week begins on Monday.
+     * @return    int        Week Number
+     */
+    public static function WEEKOFYEAR($dateValue = 1, $method = 1)
+    {
+        $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+        $method        = PHPExcel_Calculation_Functions::flattenSingleValue($method);
+
+        if (!is_numeric($method)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif (($method < 1) || ($method > 2)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $method = floor($method);
+
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($dateValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
+        $dayOfYear = $PHPDateObject->format('z');
+        $dow = $PHPDateObject->format('w');
+        $PHPDateObject->modify('-' . $dayOfYear . ' days');
+        $dow = $PHPDateObject->format('w');
+        $daysInFirstWeek = 7 - (($dow + (2 - $method)) % 7);
+        $dayOfYear -= $daysInFirstWeek;
+        $weekOfYear = ceil($dayOfYear / 7) + 1;
+
+        return (int) $weekOfYear;
+    }
+
+
+    /**
+     * MONTHOFYEAR
+     *
+     * Returns the month of a date represented by a serial number.
+     * The month is given as an integer, ranging from 1 (January) to 12 (December).
+     *
+     * Excel Function:
+     *        MONTH(dateValue)
+     *
+     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @return    int        Month of the year
+     */
+    public static function MONTHOFYEAR($dateValue = 1)
+    {
+        $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($dateValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
+
+        return (int) $PHPDateObject->format('n');
+    }
+
+
+    /**
+     * YEAR
+     *
+     * Returns the year corresponding to a date.
+     * The year is returned as an integer in the range 1900-9999.
+     *
+     * Excel Function:
+     *        YEAR(dateValue)
+     *
+     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     * @return    int        Year
+     */
+    public static function YEAR($dateValue = 1)
+    {
+        $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($dateValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Execute function
+        $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
+
+        return (int) $PHPDateObject->format('Y');
+    }
+
+
+    /**
+     * HOUROFDAY
+     *
+     * Returns the hour of a time value.
+     * The hour is given as an integer, ranging from 0 (12:00 A.M.) to 23 (11:00 P.M.).
+     *
+     * Excel Function:
+     *        HOUR(timeValue)
+     *
+     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard time string
+     * @return    int        Hour
+     */
+    public static function HOUROFDAY($timeValue = 0)
+    {
+        $timeValue    = PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
+
+        if (!is_numeric($timeValue)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                $testVal = strtok($timeValue, '/-: ');
+                if (strlen($testVal) < strlen($timeValue)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+            }
+            $timeValue = self::getTimeValue($timeValue);
+            if (is_string($timeValue)) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        // Execute function
+        if ($timeValue >= 1) {
+            $timeValue = fmod($timeValue, 1);
+        } elseif ($timeValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
+
+        return (int) gmdate('G', $timeValue);
+    }
+
+
+    /**
+     * MINUTEOFHOUR
+     *
+     * Returns the minutes of a time value.
+     * The minute is given as an integer, ranging from 0 to 59.
+     *
+     * Excel Function:
+     *        MINUTE(timeValue)
+     *
+     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard time string
+     * @return    int        Minute
+     */
+    public static function MINUTEOFHOUR($timeValue = 0)
+    {
+        $timeValue = $timeTester    = PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
+
+        if (!is_numeric($timeValue)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                $testVal = strtok($timeValue, '/-: ');
+                if (strlen($testVal) < strlen($timeValue)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+            }
+            $timeValue = self::getTimeValue($timeValue);
+            if (is_string($timeValue)) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        // Execute function
+        if ($timeValue >= 1) {
+            $timeValue = fmod($timeValue, 1);
+        } elseif ($timeValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
+
+        return (int) gmdate('i', $timeValue);
+    }
+
+
+    /**
+     * SECONDOFMINUTE
+     *
+     * Returns the seconds of a time value.
+     * The second is given as an integer in the range 0 (zero) to 59.
+     *
+     * Excel Function:
+     *        SECOND(timeValue)
+     *
+     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard time string
+     * @return    int        Second
+     */
+    public static function SECONDOFMINUTE($timeValue = 0)
+    {
+        $timeValue    = PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
+
+        if (!is_numeric($timeValue)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                $testVal = strtok($timeValue, '/-: ');
+                if (strlen($testVal) < strlen($timeValue)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+            }
+            $timeValue = self::getTimeValue($timeValue);
+            if (is_string($timeValue)) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        // Execute function
+        if ($timeValue >= 1) {
+            $timeValue = fmod($timeValue, 1);
+        } elseif ($timeValue < 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
+
+        return (int) gmdate('s', $timeValue);
+    }
+
+
+    /**
+     * EDATE
+     *
+     * Returns the serial number that represents the date that is the indicated number of months
+     * before or after a specified date (the start_date).
+     * Use EDATE to calculate maturity dates or due dates that fall on the same day of the month
+     * as the date of issue.
+     *
+     * Excel Function:
+     *        EDATE(dateValue,adjustmentMonths)
+     *
+     * @param    mixed    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     * @param    int        $adjustmentMonths    The number of months before or after start_date.
+     *                                        A positive value for months yields a future date;
+     *                                        a negative value yields a past date.
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
+    {
+        $dateValue            = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths    = PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
+
+        if (!is_numeric($adjustmentMonths)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $adjustmentMonths = floor($adjustmentMonths);
+
+        if (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Execute function
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths);
+
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                return $PHPDateObject;
+        }
+    }
+
+
+    /**
+     * EOMONTH
+     *
+     * Returns the date value for the last day of the month that is the indicated number of months
+     * before or after start_date.
+     * Use EOMONTH to calculate maturity dates or due dates that fall on the last day of the month.
+     *
+     * Excel Function:
+     *        EOMONTH(dateValue,adjustmentMonths)
+     *
+     * @param    mixed    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     * @param    int        $adjustmentMonths    The number of months before or after start_date.
+     *                                        A positive value for months yields a future date;
+     *                                        a negative value yields a past date.
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
+    {
+        $dateValue            = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths    = PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
+
+        if (!is_numeric($adjustmentMonths)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $adjustmentMonths = floor($adjustmentMonths);
+
+        if (is_string($dateValue = self::getDateValue($dateValue))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Execute function
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths+1);
+        $adjustDays = (int) $PHPDateObject->format('d');
+        $adjustDaysString = '-' . $adjustDays . ' days';
+        $PHPDateObject->modify($adjustDaysString);
+
+        switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
+            case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
+                return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
+                return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
+            case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
+                return $PHPDateObject;
+        }
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Engineering.php b/lib/PHPExcel/Calculation/Engineering.php
new file mode 100644
index 000000000..4e8d53064
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Engineering.php
@@ -0,0 +1,2650 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/** EULER */
+define('EULER', 2.71828182845904523536);
+
+/**
+ * PHPExcel_Calculation_Engineering
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Engineering
+{
+    /**
+     * Details of the Units of measure that can be used in CONVERTUOM()
+     *
+     * @var mixed[]
+     */
+    private static $conversionUnits = array(
+        'g'     => array('Group' => 'Mass',        'Unit Name' => 'Gram',                     'AllowPrefix' => true),
+        'sg'    => array('Group' => 'Mass',        'Unit Name' => 'Slug',                     'AllowPrefix' => false),
+        'lbm'   => array('Group' => 'Mass',        'Unit Name' => 'Pound mass (avoirdupois)', 'AllowPrefix' => false),
+        'u'     => array('Group' => 'Mass',        'Unit Name' => 'U (atomic mass unit)',     'AllowPrefix' => true),
+        'ozm'   => array('Group' => 'Mass',        'Unit Name' => 'Ounce mass (avoirdupois)', 'AllowPrefix' => false),
+        'm'     => array('Group' => 'Distance',    'Unit Name' => 'Meter',                    'AllowPrefix' => true),
+        'mi'    => array('Group' => 'Distance',    'Unit Name' => 'Statute mile',             'AllowPrefix' => false),
+        'Nmi'   => array('Group' => 'Distance',    'Unit Name' => 'Nautical mile',            'AllowPrefix' => false),
+        'in'    => array('Group' => 'Distance',    'Unit Name' => 'Inch',                     'AllowPrefix' => false),
+        'ft'    => array('Group' => 'Distance',    'Unit Name' => 'Foot',                     'AllowPrefix' => false),
+        'yd'    => array('Group' => 'Distance',    'Unit Name' => 'Yard',                     'AllowPrefix' => false),
+        'ang'   => array('Group' => 'Distance',    'Unit Name' => 'Angstrom',                 'AllowPrefix' => true),
+        'Pica'  => array('Group' => 'Distance',    'Unit Name' => 'Pica (1/72 in)',           'AllowPrefix' => false),
+        'yr'    => array('Group' => 'Time',        'Unit Name' => 'Year',                     'AllowPrefix' => false),
+        'day'   => array('Group' => 'Time',        'Unit Name' => 'Day',                      'AllowPrefix' => false),
+        'hr'    => array('Group' => 'Time',        'Unit Name' => 'Hour',                     'AllowPrefix' => false),
+        'mn'    => array('Group' => 'Time',        'Unit Name' => 'Minute',                   'AllowPrefix' => false),
+        'sec'   => array('Group' => 'Time',        'Unit Name' => 'Second',                   'AllowPrefix' => true),
+        'Pa'    => array('Group' => 'Pressure',    'Unit Name' => 'Pascal',                   'AllowPrefix' => true),
+        'p'     => array('Group' => 'Pressure',    'Unit Name' => 'Pascal',                   'AllowPrefix' => true),
+        'atm'   => array('Group' => 'Pressure',    'Unit Name' => 'Atmosphere',               'AllowPrefix' => true),
+        'at'    => array('Group' => 'Pressure',    'Unit Name' => 'Atmosphere',               'AllowPrefix' => true),
+        'mmHg'  => array('Group' => 'Pressure',    'Unit Name' => 'mm of Mercury',            'AllowPrefix' => true),
+        'N'     => array('Group' => 'Force',       'Unit Name' => 'Newton',                   'AllowPrefix' => true),
+        'dyn'   => array('Group' => 'Force',       'Unit Name' => 'Dyne',                     'AllowPrefix' => true),
+        'dy'    => array('Group' => 'Force',       'Unit Name' => 'Dyne',                     'AllowPrefix' => true),
+        'lbf'   => array('Group' => 'Force',       'Unit Name' => 'Pound force',              'AllowPrefix' => false),
+        'J'     => array('Group' => 'Energy',      'Unit Name' => 'Joule',                    'AllowPrefix' => true),
+        'e'     => array('Group' => 'Energy',      'Unit Name' => 'Erg',                      'AllowPrefix' => true),
+        'c'     => array('Group' => 'Energy',      'Unit Name' => 'Thermodynamic calorie',    'AllowPrefix' => true),
+        'cal'   => array('Group' => 'Energy',      'Unit Name' => 'IT calorie',               'AllowPrefix' => true),
+        'eV'    => array('Group' => 'Energy',      'Unit Name' => 'Electron volt',            'AllowPrefix' => true),
+        'ev'    => array('Group' => 'Energy',      'Unit Name' => 'Electron volt',            'AllowPrefix' => true),
+        'HPh'   => array('Group' => 'Energy',      'Unit Name' => 'Horsepower-hour',          'AllowPrefix' => false),
+        'hh'    => array('Group' => 'Energy',      'Unit Name' => 'Horsepower-hour',          'AllowPrefix' => false),
+        'Wh'    => array('Group' => 'Energy',      'Unit Name' => 'Watt-hour',                'AllowPrefix' => true),
+        'wh'    => array('Group' => 'Energy',      'Unit Name' => 'Watt-hour',                'AllowPrefix' => true),
+        'flb'   => array('Group' => 'Energy',      'Unit Name' => 'Foot-pound',               'AllowPrefix' => false),
+        'BTU'   => array('Group' => 'Energy',      'Unit Name' => 'BTU',                      'AllowPrefix' => false),
+        'btu'   => array('Group' => 'Energy',      'Unit Name' => 'BTU',                      'AllowPrefix' => false),
+        'HP'    => array('Group' => 'Power',       'Unit Name' => 'Horsepower',               'AllowPrefix' => false),
+        'h'     => array('Group' => 'Power',       'Unit Name' => 'Horsepower',               'AllowPrefix' => false),
+        'W'     => array('Group' => 'Power',       'Unit Name' => 'Watt',                     'AllowPrefix' => true),
+        'w'     => array('Group' => 'Power',       'Unit Name' => 'Watt',                     'AllowPrefix' => true),
+        'T'     => array('Group' => 'Magnetism',   'Unit Name' => 'Tesla',                    'AllowPrefix' => true),
+        'ga'    => array('Group' => 'Magnetism',   'Unit Name' => 'Gauss',                    'AllowPrefix' => true),
+        'C'     => array('Group' => 'Temperature', 'Unit Name' => 'Celsius',                  'AllowPrefix' => false),
+        'cel'   => array('Group' => 'Temperature', 'Unit Name' => 'Celsius',                  'AllowPrefix' => false),
+        'F'     => array('Group' => 'Temperature', 'Unit Name' => 'Fahrenheit',               'AllowPrefix' => false),
+        'fah'   => array('Group' => 'Temperature', 'Unit Name' => 'Fahrenheit',               'AllowPrefix' => false),
+        'K'     => array('Group' => 'Temperature', 'Unit Name' => 'Kelvin',                   'AllowPrefix' => false),
+        'kel'   => array('Group' => 'Temperature', 'Unit Name' => 'Kelvin',                   'AllowPrefix' => false),
+        'tsp'   => array('Group' => 'Liquid',      'Unit Name' => 'Teaspoon',                 'AllowPrefix' => false),
+        'tbs'   => array('Group' => 'Liquid',      'Unit Name' => 'Tablespoon',               'AllowPrefix' => false),
+        'oz'    => array('Group' => 'Liquid',      'Unit Name' => 'Fluid Ounce',              'AllowPrefix' => false),
+        'cup'   => array('Group' => 'Liquid',      'Unit Name' => 'Cup',                      'AllowPrefix' => false),
+        'pt'    => array('Group' => 'Liquid',      'Unit Name' => 'U.S. Pint',                'AllowPrefix' => false),
+        'us_pt' => array('Group' => 'Liquid',      'Unit Name' => 'U.S. Pint',                'AllowPrefix' => false),
+        'uk_pt' => array('Group' => 'Liquid',      'Unit Name' => 'U.K. Pint',                'AllowPrefix' => false),
+        'qt'    => array('Group' => 'Liquid',      'Unit Name' => 'Quart',                    'AllowPrefix' => false),
+        'gal'   => array('Group' => 'Liquid',      'Unit Name' => 'Gallon',                   'AllowPrefix' => false),
+        'l'     => array('Group' => 'Liquid',      'Unit Name' => 'Litre',                    'AllowPrefix' => true),
+        'lt'    => array('Group' => 'Liquid',      'Unit Name' => 'Litre',                    'AllowPrefix' => true),
+    );
+
+    /**
+     * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
+     *
+     * @var mixed[]
+     */
+    private static $conversionMultipliers = array(
+        'Y' => array('multiplier' => 1E24,  'name' => 'yotta'),
+        'Z' => array('multiplier' => 1E21,  'name' => 'zetta'),
+        'E' => array('multiplier' => 1E18,  'name' => 'exa'),
+        'P' => array('multiplier' => 1E15,  'name' => 'peta'),
+        'T' => array('multiplier' => 1E12,  'name' => 'tera'),
+        'G' => array('multiplier' => 1E9,   'name' => 'giga'),
+        'M' => array('multiplier' => 1E6,   'name' => 'mega'),
+        'k' => array('multiplier' => 1E3,   'name' => 'kilo'),
+        'h' => array('multiplier' => 1E2,   'name' => 'hecto'),
+        'e' => array('multiplier' => 1E1,   'name' => 'deka'),
+        'd' => array('multiplier' => 1E-1,  'name' => 'deci'),
+        'c' => array('multiplier' => 1E-2,  'name' => 'centi'),
+        'm' => array('multiplier' => 1E-3,  'name' => 'milli'),
+        'u' => array('multiplier' => 1E-6,  'name' => 'micro'),
+        'n' => array('multiplier' => 1E-9,  'name' => 'nano'),
+        'p' => array('multiplier' => 1E-12, 'name' => 'pico'),
+        'f' => array('multiplier' => 1E-15, 'name' => 'femto'),
+        'a' => array('multiplier' => 1E-18, 'name' => 'atto'),
+        'z' => array('multiplier' => 1E-21, 'name' => 'zepto'),
+        'y' => array('multiplier' => 1E-24, 'name' => 'yocto'),
+    );
+
+    /**
+     * Details of the Units of measure conversion factors, organised by group
+     *
+     * @var mixed[]
+     */
+    private static $unitConversions = array(
+        'Mass' => array(
+            'g' => array(
+                'g'   => 1.0,
+                'sg'  => 6.85220500053478E-05,
+                'lbm' => 2.20462291469134E-03,
+                'u'   => 6.02217000000000E+23,
+                'ozm' => 3.52739718003627E-02,
+            ),
+            'sg' => array(
+                'g'   => 1.45938424189287E+04,
+                'sg'  => 1.0,
+                'lbm' => 3.21739194101647E+01,
+                'u'   => 8.78866000000000E+27,
+                'ozm' => 5.14782785944229E+02,
+            ),
+            'lbm' => array(
+                'g'   => 4.5359230974881148E+02,
+                'sg'  => 3.10810749306493E-02,
+                'lbm' => 1.0,
+                'u'   => 2.73161000000000E+26,
+                'ozm' => 1.60000023429410E+01,
+            ),
+            'u' => array(
+                'g'   => 1.66053100460465E-24,
+                'sg'  => 1.13782988532950E-28,
+                'lbm' => 3.66084470330684E-27,
+                'u'   => 1.0,
+                'ozm' => 5.85735238300524E-26,
+            ),
+            'ozm' => array(
+                'g'   => 2.83495152079732E+01,
+                'sg'  => 1.94256689870811E-03,
+                'lbm' => 6.24999908478882E-02,
+                'u'   => 1.70725600000000E+25,
+                'ozm' => 1.0,
+            ),
+        ),
+        'Distance' => array(
+            'm' => array(
+                'm'    => 1.0,
+                'mi'   => 6.21371192237334E-04,
+                'Nmi'  => 5.39956803455724E-04,
+                'in'   => 3.93700787401575E+01,
+                'ft'   => 3.28083989501312E+00,
+                'yd'   => 1.09361329797891E+00,
+                'ang'  => 1.00000000000000E+10,
+                'Pica' => 2.83464566929116E+03,
+            ),
+            'mi' => array(
+                'm'    => 1.60934400000000E+03,
+                'mi'   => 1.0,
+                'Nmi'  => 8.68976241900648E-01,
+                'in'   => 6.33600000000000E+04,
+                'ft'   => 5.28000000000000E+03,
+                'yd'   => 1.76000000000000E+03,
+                'ang'  => 1.60934400000000E+13,
+                'Pica' => 4.56191999999971E+06,
+            ),
+            'Nmi' => array(
+                'm'    => 1.85200000000000E+03,
+                'mi'   => 1.15077944802354E+00,
+                'Nmi'  => 1.0,
+                'in'   => 7.29133858267717E+04,
+                'ft'   => 6.07611548556430E+03,
+                'yd'   => 2.02537182785694E+03,
+                'ang'  => 1.85200000000000E+13,
+                'Pica' => 5.24976377952723E+06,
+            ),
+            'in' => array(
+                'm'    => 2.54000000000000E-02,
+                'mi'   => 1.57828282828283E-05,
+                'Nmi'  => 1.37149028077754E-05,
+                'in'   => 1.0,
+                'ft'   => 8.33333333333333E-02,
+                'yd'   => 2.77777777686643E-02,
+                'ang'  => 2.54000000000000E+08,
+                'Pica' => 7.19999999999955E+01,
+            ),
+            'ft' => array(
+                'm'    => 3.04800000000000E-01,
+                'mi'   => 1.89393939393939E-04,
+                'Nmi'  => 1.64578833693305E-04,
+                'in'   => 1.20000000000000E+01,
+                'ft'   => 1.0,
+                'yd'   => 3.33333333223972E-01,
+                'ang'  => 3.04800000000000E+09,
+                'Pica' => 8.63999999999946E+02,
+            ),
+            'yd' => array(
+                'm'    => 9.14400000300000E-01,
+                'mi'   => 5.68181818368230E-04,
+                'Nmi'  => 4.93736501241901E-04,
+                'in'   => 3.60000000118110E+01,
+                'ft'   => 3.00000000000000E+00,
+                'yd'   => 1.0,
+                'ang'  => 9.14400000300000E+09,
+                'Pica' => 2.59200000085023E+03,
+            ),
+            'ang' => array(
+                'm'    => 1.00000000000000E-10,
+                'mi'   => 6.21371192237334E-14,
+                'Nmi'  => 5.39956803455724E-14,
+                'in'   => 3.93700787401575E-09,
+                'ft'   => 3.28083989501312E-10,
+                'yd'   => 1.09361329797891E-10,
+                'ang'  => 1.0,
+                'Pica' => 2.83464566929116E-07,
+            ),
+            'Pica' => array(
+                'm'    => 3.52777777777800E-04,
+                'mi'   => 2.19205948372629E-07,
+                'Nmi'  => 1.90484761219114E-07,
+                'in'   => 1.38888888888898E-02,
+                'ft'   => 1.15740740740748E-03,
+                'yd'   => 3.85802469009251E-04,
+                'ang'  => 3.52777777777800E+06,
+                'Pica' => 1.0,
+            ),
+        ),
+        'Time' => array(
+            'yr' => array(
+                'yr'  => 1.0,
+                'day' => 365.25,
+                'hr'  => 8766.0,
+                'mn'  => 525960.0,
+                'sec' => 31557600.0,
+            ),
+            'day' => array(
+                'yr'  => 2.73785078713210E-03,
+                'day' => 1.0,
+                'hr'  => 24.0,
+                'mn'  => 1440.0,
+                'sec' => 86400.0,
+            ),
+            'hr' => array(
+                'yr'  => 1.14077116130504E-04,
+                'day' => 4.16666666666667E-02,
+                'hr'  => 1.0,
+                'mn'  => 60.0,
+                'sec' => 3600.0,
+            ),
+            'mn' => array(
+                'yr'  => 1.90128526884174E-06,
+                'day' => 6.94444444444444E-04,
+                'hr'  => 1.66666666666667E-02,
+                'mn'  => 1.0,
+                'sec' => 60.0,
+            ),
+            'sec' => array(
+                'yr'  => 3.16880878140289E-08,
+                'day' => 1.15740740740741E-05,
+                'hr'  => 2.77777777777778E-04,
+                'mn'  => 1.66666666666667E-02,
+                'sec' => 1.0,
+            ),
+        ),
+        'Pressure' => array(
+            'Pa' => array(
+                'Pa'   => 1.0,
+                'p'    => 1.0,
+                'atm'  => 9.86923299998193E-06,
+                'at'   => 9.86923299998193E-06,
+                'mmHg' => 7.50061707998627E-03,
+            ),
+            'p' => array(
+                'Pa'   => 1.0,
+                'p'    => 1.0,
+                'atm'  => 9.86923299998193E-06,
+                'at'   => 9.86923299998193E-06,
+                'mmHg' => 7.50061707998627E-03,
+            ),
+            'atm' => array(
+                'Pa'   => 1.01324996583000E+05,
+                'p'    => 1.01324996583000E+05,
+                'atm'  => 1.0,
+                'at'   => 1.0,
+                'mmHg' => 760.0,
+            ),
+            'at' => array(
+                'Pa'   => 1.01324996583000E+05,
+                'p'    => 1.01324996583000E+05,
+                'atm'  => 1.0,
+                'at'   => 1.0,
+                'mmHg' => 760.0,
+            ),
+            'mmHg' => array(
+                'Pa'   => 1.33322363925000E+02,
+                'p'    => 1.33322363925000E+02,
+                'atm'  => 1.31578947368421E-03,
+                'at'   => 1.31578947368421E-03,
+                'mmHg' => 1.0,
+            ),
+        ),
+        'Force' => array(
+            'N' => array(
+                'N'   => 1.0,
+                'dyn' => 1.0E+5,
+                'dy'  => 1.0E+5,
+                'lbf' => 2.24808923655339E-01,
+            ),
+            'dyn' => array(
+                'N'   => 1.0E-5,
+                'dyn' => 1.0,
+                'dy'  => 1.0,
+                'lbf' => 2.24808923655339E-06,
+            ),
+            'dy' => array(
+                'N'   => 1.0E-5,
+                'dyn' => 1.0,
+                'dy'  => 1.0,
+                'lbf' => 2.24808923655339E-06,
+            ),
+            'lbf' => array(
+                'N'   => 4.448222,
+                'dyn' => 4.448222E+5,
+                'dy'  => 4.448222E+5,
+                'lbf' => 1.0,
+            ),
+        ),
+        'Energy' => array(
+            'J' => array(
+                'J'   => 1.0,
+                'e'   => 9.99999519343231E+06,
+                'c'   => 2.39006249473467E-01,
+                'cal' => 2.38846190642017E-01,
+                'eV'  => 6.24145700000000E+18,
+                'ev'  => 6.24145700000000E+18,
+                'HPh' => 3.72506430801000E-07,
+                'hh'  => 3.72506430801000E-07,
+                'Wh'  => 2.77777916238711E-04,
+                'wh'  => 2.77777916238711E-04,
+                'flb' => 2.37304222192651E+01,
+                'BTU' => 9.47815067349015E-04,
+                'btu' => 9.47815067349015E-04,
+            ),
+            'e' => array(
+                'J'   => 1.00000048065700E-07,
+                'e'   => 1.0,
+                'c'   => 2.39006364353494E-08,
+                'cal' => 2.38846305445111E-08,
+                'eV'  => 6.24146000000000E+11,
+                'ev'  => 6.24146000000000E+11,
+                'HPh' => 3.72506609848824E-14,
+                'hh'  => 3.72506609848824E-14,
+                'Wh'  => 2.77778049754611E-11,
+                'wh'  => 2.77778049754611E-11,
+                'flb' => 2.37304336254586E-06,
+                'BTU' => 9.47815522922962E-11,
+                'btu' => 9.47815522922962E-11,
+            ),
+            'c' => array(
+                'J'   => 4.18399101363672E+00,
+                'e'   => 4.18398900257312E+07,
+                'c'   => 1.0,
+                'cal' => 9.99330315287563E-01,
+                'eV'  => 2.61142000000000E+19,
+                'ev'  => 2.61142000000000E+19,
+                'HPh' => 1.55856355899327E-06,
+                'hh'  => 1.55856355899327E-06,
+                'Wh'  => 1.16222030532950E-03,
+                'wh'  => 1.16222030532950E-03,
+                'flb' => 9.92878733152102E+01,
+                'BTU' => 3.96564972437776E-03,
+                'btu' => 3.96564972437776E-03,
+            ),
+            'cal' => array(
+                'J'   => 4.18679484613929E+00,
+                'e'   => 4.18679283372801E+07,
+                'c'   => 1.00067013349059E+00,
+                'cal' => 1.0,
+                'eV'  => 2.61317000000000E+19,
+                'ev'  => 2.61317000000000E+19,
+                'HPh' => 1.55960800463137E-06,
+                'hh'  => 1.55960800463137E-06,
+                'Wh'  => 1.16299914807955E-03,
+                'wh'  => 1.16299914807955E-03,
+                'flb' => 9.93544094443283E+01,
+                'BTU' => 3.96830723907002E-03,
+                'btu' => 3.96830723907002E-03,
+            ),
+            'eV' => array(
+                'J'   => 1.60219000146921E-19,
+                'e'   => 1.60218923136574E-12,
+                'c'   => 3.82933423195043E-20,
+                'cal' => 3.82676978535648E-20,
+                'eV'  => 1.0,
+                'ev'  => 1.0,
+                'HPh' => 5.96826078912344E-26,
+                'hh'  => 5.96826078912344E-26,
+                'Wh'  => 4.45053000026614E-23,
+                'wh'  => 4.45053000026614E-23,
+                'flb' => 3.80206452103492E-18,
+                'BTU' => 1.51857982414846E-22,
+                'btu' => 1.51857982414846E-22,
+            ),
+            'ev' => array(
+                'J'   => 1.60219000146921E-19,
+                'e'   => 1.60218923136574E-12,
+                'c'   => 3.82933423195043E-20,
+                'cal' => 3.82676978535648E-20,
+                'eV'  => 1.0,
+                'ev'  => 1.0,
+                'HPh' => 5.96826078912344E-26,
+                'hh'  => 5.96826078912344E-26,
+                'Wh'  => 4.45053000026614E-23,
+                'wh'  => 4.45053000026614E-23,
+                'flb' => 3.80206452103492E-18,
+                'BTU' => 1.51857982414846E-22,
+                'btu' => 1.51857982414846E-22,
+            ),
+            'HPh' => array(
+                'J'   => 2.68451741316170E+06,
+                'e'   => 2.68451612283024E+13,
+                'c'   => 6.41616438565991E+05,
+                'cal' => 6.41186757845835E+05,
+                'eV'  => 1.67553000000000E+25,
+                'ev'  => 1.67553000000000E+25,
+                'HPh' => 1.0,
+                'hh'  => 1.0,
+                'Wh'  => 7.45699653134593E+02,
+                'wh'  => 7.45699653134593E+02,
+                'flb' => 6.37047316692964E+07,
+                'BTU' => 2.54442605275546E+03,
+                'btu' => 2.54442605275546E+03,
+            ),
+            'hh' => array(
+                'J'   => 2.68451741316170E+06,
+                'e'   => 2.68451612283024E+13,
+                'c'   => 6.41616438565991E+05,
+                'cal' => 6.41186757845835E+05,
+                'eV'  => 1.67553000000000E+25,
+                'ev'  => 1.67553000000000E+25,
+                'HPh' => 1.0,
+                'hh'  => 1.0,
+                'Wh'  => 7.45699653134593E+02,
+                'wh'  => 7.45699653134593E+02,
+                'flb' => 6.37047316692964E+07,
+                'BTU' => 2.54442605275546E+03,
+                'btu' => 2.54442605275546E+03,
+            ),
+            'Wh' => array(
+                'J'   => 3.59999820554720E+03,
+                'e'   => 3.59999647518369E+10,
+                'c'   => 8.60422069219046E+02,
+                'cal' => 8.59845857713046E+02,
+                'eV'  => 2.24692340000000E+22,
+                'ev'  => 2.24692340000000E+22,
+                'HPh' => 1.34102248243839E-03,
+                'hh'  => 1.34102248243839E-03,
+                'Wh'  => 1.0,
+                'wh'  => 1.0,
+                'flb' => 8.54294774062316E+04,
+                'BTU' => 3.41213254164705E+00,
+                'btu' => 3.41213254164705E+00,
+            ),
+            'wh' => array(
+                'J'   => 3.59999820554720E+03,
+                'e'   => 3.59999647518369E+10,
+                'c'   => 8.60422069219046E+02,
+                'cal' => 8.59845857713046E+02,
+                'eV'  => 2.24692340000000E+22,
+                'ev'  => 2.24692340000000E+22,
+                'HPh' => 1.34102248243839E-03,
+                'hh'  => 1.34102248243839E-03,
+                'Wh'  => 1.0,
+                'wh'  => 1.0,
+                'flb' => 8.54294774062316E+04,
+                'BTU' => 3.41213254164705E+00,
+                'btu' => 3.41213254164705E+00,
+            ),
+            'flb' => array(
+                'J'   => 4.21400003236424E-02,
+                'e'   => 4.21399800687660E+05,
+                'c'   => 1.00717234301644E-02,
+                'cal' => 1.00649785509554E-02,
+                'eV'  => 2.63015000000000E+17,
+                'ev'  => 2.63015000000000E+17,
+                'HPh' => 1.56974211145130E-08,
+                'hh'  => 1.56974211145130E-08,
+                'Wh'  => 1.17055614802000E-05,
+                'wh'  => 1.17055614802000E-05,
+                'flb' => 1.0,
+                'BTU' => 3.99409272448406E-05,
+                'btu' => 3.99409272448406E-05,
+            ),
+            'BTU' => array(
+                'J'   => 1.05505813786749E+03,
+                'e'   => 1.05505763074665E+10,
+                'c'   => 2.52165488508168E+02,
+                'cal' => 2.51996617135510E+02,
+                'eV'  => 6.58510000000000E+21,
+                'ev'  => 6.58510000000000E+21,
+                'HPh' => 3.93015941224568E-04,
+                'hh'  => 3.93015941224568E-04,
+                'Wh'  => 2.93071851047526E-01,
+                'wh'  => 2.93071851047526E-01,
+                'flb' => 2.50369750774671E+04,
+                'BTU' => 1.0,
+                'btu' => 1.0,
+            ),
+            'btu' => array(
+                'J'   => 1.05505813786749E+03,
+                'e'   => 1.05505763074665E+10,
+                'c'   => 2.52165488508168E+02,
+                'cal' => 2.51996617135510E+02,
+                'eV'  => 6.58510000000000E+21,
+                'ev'  => 6.58510000000000E+21,
+                'HPh' => 3.93015941224568E-04,
+                'hh'  => 3.93015941224568E-04,
+                'Wh'  => 2.93071851047526E-01,
+                'wh'  => 2.93071851047526E-01,
+                'flb' => 2.50369750774671E+04,
+                'BTU' => 1.0,
+                'btu' => 1.0,
+            ),
+        ),
+        'Power' => array(
+            'HP' => array(
+                'HP' => 1.0,
+                'h'  => 1.0,
+                'W'  => 7.45701000000000E+02,
+                'w'  => 7.45701000000000E+02,
+            ),
+            'h' => array(
+                'HP' => 1.0,
+                'h'  => 1.0,
+                'W'  => 7.45701000000000E+02,
+                'w'  => 7.45701000000000E+02,
+            ),
+            'W' => array(
+                'HP' => 1.34102006031908E-03,
+                'h'  => 1.34102006031908E-03,
+                'W'  => 1.0,
+                'w'  => 1.0,
+            ),
+            'w' => array(
+                'HP' => 1.34102006031908E-03,
+                'h'  => 1.34102006031908E-03,
+                'W'  => 1.0,
+                'w'  => 1.0,
+            ),
+        ),
+        'Magnetism' => array(
+            'T' => array(
+                'T'  => 1.0,
+                'ga' => 10000.0,
+            ),
+            'ga' => array(
+                'T'  => 0.0001,
+                'ga' => 1.0,
+            ),
+        ),
+        'Liquid' => array(
+            'tsp' => array(
+                'tsp'   => 1.0,
+                'tbs'   => 3.33333333333333E-01,
+                'oz'    => 1.66666666666667E-01,
+                'cup'   => 2.08333333333333E-02,
+                'pt'    => 1.04166666666667E-02,
+                'us_pt' => 1.04166666666667E-02,
+                'uk_pt' => 8.67558516821960E-03,
+                'qt'    => 5.20833333333333E-03,
+                'gal'   => 1.30208333333333E-03,
+                'l'     => 4.92999408400710E-03,
+                'lt'    => 4.92999408400710E-03,
+            ),
+            'tbs' => array(
+                'tsp'   => 3.00000000000000E+00,
+                'tbs'   => 1.0,
+                'oz'    => 5.00000000000000E-01,
+                'cup'   => 6.25000000000000E-02,
+                'pt'    => 3.12500000000000E-02,
+                'us_pt' => 3.12500000000000E-02,
+                'uk_pt' => 2.60267555046588E-02,
+                'qt'    => 1.56250000000000E-02,
+                'gal'   => 3.90625000000000E-03,
+                'l'     => 1.47899822520213E-02,
+                'lt'    => 1.47899822520213E-02,
+            ),
+            'oz' => array(
+                'tsp'   => 6.00000000000000E+00,
+                'tbs'   => 2.00000000000000E+00,
+                'oz'    => 1.0,
+                'cup'   => 1.25000000000000E-01,
+                'pt'    => 6.25000000000000E-02,
+                'us_pt' => 6.25000000000000E-02,
+                'uk_pt' => 5.20535110093176E-02,
+                'qt'    => 3.12500000000000E-02,
+                'gal'   => 7.81250000000000E-03,
+                'l'     => 2.95799645040426E-02,
+                'lt'    => 2.95799645040426E-02,
+            ),
+            'cup' => array(
+                'tsp'   => 4.80000000000000E+01,
+                'tbs'   => 1.60000000000000E+01,
+                'oz'    => 8.00000000000000E+00,
+                'cup'   => 1.0,
+                'pt'    => 5.00000000000000E-01,
+                'us_pt' => 5.00000000000000E-01,
+                'uk_pt' => 4.16428088074541E-01,
+                'qt'    => 2.50000000000000E-01,
+                'gal'   => 6.25000000000000E-02,
+                'l'     => 2.36639716032341E-01,
+                'lt'    => 2.36639716032341E-01,
+            ),
+            'pt' => array(
+                'tsp'   => 9.60000000000000E+01,
+                'tbs'   => 3.20000000000000E+01,
+                'oz'    => 1.60000000000000E+01,
+                'cup'   => 2.00000000000000E+00,
+                'pt'    => 1.0,
+                'us_pt' => 1.0,
+                'uk_pt' => 8.32856176149081E-01,
+                'qt'    => 5.00000000000000E-01,
+                'gal'   => 1.25000000000000E-01,
+                'l'     => 4.73279432064682E-01,
+                'lt'    => 4.73279432064682E-01,
+            ),
+            'us_pt' => array(
+                'tsp'   => 9.60000000000000E+01,
+                'tbs'   => 3.20000000000000E+01,
+                'oz'    => 1.60000000000000E+01,
+                'cup'   => 2.00000000000000E+00,
+                'pt'    => 1.0,
+                'us_pt' => 1.0,
+                'uk_pt' => 8.32856176149081E-01,
+                'qt'    => 5.00000000000000E-01,
+                'gal'   => 1.25000000000000E-01,
+                'l'     => 4.73279432064682E-01,
+                'lt'    => 4.73279432064682E-01,
+            ),
+            'uk_pt' => array(
+                'tsp'   => 1.15266000000000E+02,
+                'tbs'   => 3.84220000000000E+01,
+                'oz'    => 1.92110000000000E+01,
+                'cup'   => 2.40137500000000E+00,
+                'pt'    => 1.20068750000000E+00,
+                'us_pt' => 1.20068750000000E+00,
+                'uk_pt' => 1.0,
+                'qt'    => 6.00343750000000E-01,
+                'gal'   => 1.50085937500000E-01,
+                'l'     => 5.68260698087162E-01,
+                'lt'    => 5.68260698087162E-01,
+            ),
+            'qt' => array(
+                'tsp'   => 1.92000000000000E+02,
+                'tbs'   => 6.40000000000000E+01,
+                'oz'    => 3.20000000000000E+01,
+                'cup'   => 4.00000000000000E+00,
+                'pt'    => 2.00000000000000E+00,
+                'us_pt' => 2.00000000000000E+00,
+                'uk_pt' => 1.66571235229816E+00,
+                'qt'    => 1.0,
+                'gal'   => 2.50000000000000E-01,
+                'l'     => 9.46558864129363E-01,
+                'lt'    => 9.46558864129363E-01,
+            ),
+            'gal' => array(
+                'tsp'   => 7.68000000000000E+02,
+                'tbs'   => 2.56000000000000E+02,
+                'oz'    => 1.28000000000000E+02,
+                'cup'   => 1.60000000000000E+01,
+                'pt'    => 8.00000000000000E+00,
+                'us_pt' => 8.00000000000000E+00,
+                'uk_pt' => 6.66284940919265E+00,
+                'qt'    => 4.00000000000000E+00,
+                'gal'   => 1.0,
+                'l'     => 3.78623545651745E+00,
+                'lt'    => 3.78623545651745E+00,
+            ),
+            'l' => array(
+                'tsp'   => 2.02840000000000E+02,
+                'tbs'   => 6.76133333333333E+01,
+                'oz'    => 3.38066666666667E+01,
+                'cup'   => 4.22583333333333E+00,
+                'pt'    => 2.11291666666667E+00,
+                'us_pt' => 2.11291666666667E+00,
+                'uk_pt' => 1.75975569552166E+00,
+                'qt'    => 1.05645833333333E+00,
+                'gal'   => 2.64114583333333E-01,
+                'l'     => 1.0,
+                'lt'    => 1.0,
+            ),
+            'lt' => array(
+                'tsp'   => 2.02840000000000E+02,
+                'tbs'   => 6.76133333333333E+01,
+                'oz'    => 3.38066666666667E+01,
+                'cup'   => 4.22583333333333E+00,
+                'pt'    => 2.11291666666667E+00,
+                'us_pt' => 2.11291666666667E+00,
+                'uk_pt' => 1.75975569552166E+00,
+                'qt'    => 1.05645833333333E+00,
+                'gal'   => 2.64114583333333E-01,
+                'l'     => 1.0,
+                'lt'    => 1.0,
+            ),
+        ),
+    );
+
+
+    /**
+     * parseComplex
+     *
+     * Parses a complex number into its real and imaginary parts, and an I or J suffix
+     *
+     * @param    string        $complexNumber    The complex number
+     * @return    string[]    Indexed on "real", "imaginary" and "suffix"
+     */
+    public static function parseComplex($complexNumber)
+    {
+        $workString = (string) $complexNumber;
+
+        $realNumber = $imaginary = 0;
+        //    Extract the suffix, if there is one
+        $suffix = substr($workString, -1);
+        if (!is_numeric($suffix)) {
+            $workString = substr($workString, 0, -1);
+        } else {
+            $suffix = '';
+        }
+
+        //    Split the input into its Real and Imaginary components
+        $leadingSign = 0;
+        if (strlen($workString) > 0) {
+            $leadingSign = (($workString[0] == '+') || ($workString[0] == '-')) ? 1 : 0;
+        }
+        $power = '';
+        $realNumber = strtok($workString, '+-');
+        if (strtoupper(substr($realNumber, -1)) == 'E') {
+            $power = strtok('+-');
+            ++$leadingSign;
+        }
+
+        $realNumber = substr($workString, 0, strlen($realNumber)+strlen($power)+$leadingSign);
+
+        if ($suffix != '') {
+            $imaginary = substr($workString, strlen($realNumber));
+
+            if (($imaginary == '') && (($realNumber == '') || ($realNumber == '+') || ($realNumber == '-'))) {
+                $imaginary = $realNumber.'1';
+                $realNumber = '0';
+            } elseif ($imaginary == '') {
+                $imaginary = $realNumber;
+                $realNumber = '0';
+            } elseif (($imaginary == '+') || ($imaginary == '-')) {
+                $imaginary .= '1';
+            }
+        }
+
+        return array(
+            'real'   => $realNumber,
+            'imaginary' => $imaginary,
+            'suffix' => $suffix
+        );
+    }
+
+
+    /**
+     * Cleans the leading characters in a complex number string
+     *
+     * @param    string        $complexNumber    The complex number to clean
+     * @return    string        The "cleaned" complex number
+     */
+    private static function cleanComplex($complexNumber)
+    {
+        if ($complexNumber[0] == '+') {
+            $complexNumber = substr($complexNumber, 1);
+        }
+        if ($complexNumber[0] == '0') {
+            $complexNumber = substr($complexNumber, 1);
+        }
+        if ($complexNumber[0] == '.') {
+            $complexNumber = '0'.$complexNumber;
+        }
+        if ($complexNumber[0] == '+') {
+            $complexNumber = substr($complexNumber, 1);
+        }
+        return $complexNumber;
+    }
+
+    /**
+     * Formats a number base string value with leading zeroes
+     *
+     * @param    string        $xVal        The "number" to pad
+     * @param    integer        $places        The length that we want to pad this value
+     * @return    string        The padded "number"
+     */
+    private static function nbrConversionFormat($xVal, $places)
+    {
+        if (!is_null($places)) {
+            if (strlen($xVal) <= $places) {
+                return substr(str_pad($xVal, $places, '0', STR_PAD_LEFT), -10);
+            } else {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+        }
+
+        return substr($xVal, -10);
+    }
+
+    /**
+     *    BESSELI
+     *
+     *    Returns the modified Bessel function In(x), which is equivalent to the Bessel function evaluated
+     *        for purely imaginary arguments
+     *
+     *    Excel Function:
+     *        BESSELI(x,ord)
+     *
+     *    @access    public
+     *    @category Engineering Functions
+     *    @param    float        $x        The value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELI returns the #VALUE! error value.
+     *    @param    integer        $ord    The order of the Bessel function.
+     *                                If ord is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
+     *                                If $ord < 0, BESSELI returns the #NUM! error value.
+     *    @return    float
+     *
+     */
+    public static function BESSELI($x, $ord)
+    {
+        $x    = (is_null($x))    ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $ord    = (is_null($ord))    ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($ord);
+
+        if ((is_numeric($x)) && (is_numeric($ord))) {
+            $ord    = floor($ord);
+            if ($ord < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            if (abs($x) <= 30) {
+                $fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
+                $ordK = 1;
+                $fSqrX = ($x * $x) / 4;
+                do {
+                    $fTerm *= $fSqrX;
+                    $fTerm /= ($ordK * ($ordK + $ord));
+                    $fResult += $fTerm;
+                } while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
+            } else {
+                $f_2_PI = 2 * M_PI;
+
+                $fXAbs = abs($x);
+                $fResult = exp($fXAbs) / sqrt($f_2_PI * $fXAbs);
+                if (($ord & 1) && ($x < 0)) {
+                    $fResult = -$fResult;
+                }
+            }
+            return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     *    BESSELJ
+     *
+     *    Returns the Bessel function
+     *
+     *    Excel Function:
+     *        BESSELJ(x,ord)
+     *
+     *    @access    public
+     *    @category Engineering Functions
+     *    @param    float        $x        The value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELJ returns the #VALUE! error value.
+     *    @param    integer        $ord    The order of the Bessel function. If n is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
+     *                                If $ord < 0, BESSELJ returns the #NUM! error value.
+     *    @return    float
+     *
+     */
+    public static function BESSELJ($x, $ord)
+    {
+        $x    = (is_null($x))    ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $ord    = (is_null($ord))    ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($ord);
+
+        if ((is_numeric($x)) && (is_numeric($ord))) {
+            $ord    = floor($ord);
+            if ($ord < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            $fResult = 0;
+            if (abs($x) <= 30) {
+                $fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
+                $ordK = 1;
+                $fSqrX = ($x * $x) / -4;
+                do {
+                    $fTerm *= $fSqrX;
+                    $fTerm /= ($ordK * ($ordK + $ord));
+                    $fResult += $fTerm;
+                } while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
+            } else {
+                $f_PI_DIV_2 = M_PI / 2;
+                $f_PI_DIV_4 = M_PI / 4;
+
+                $fXAbs = abs($x);
+                $fResult = sqrt(M_2DIVPI / $fXAbs) * cos($fXAbs - $ord * $f_PI_DIV_2 - $f_PI_DIV_4);
+                if (($ord & 1) && ($x < 0)) {
+                    $fResult = -$fResult;
+                }
+            }
+            return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    private static function besselK0($fNum)
+    {
+        if ($fNum <= 2) {
+            $fNum2 = $fNum * 0.5;
+            $y = ($fNum2 * $fNum2);
+            $fRet = -log($fNum2) * self::BESSELI($fNum, 0) +
+                (-0.57721566 + $y * (0.42278420 + $y * (0.23069756 + $y * (0.3488590e-1 + $y * (0.262698e-2 + $y *
+                (0.10750e-3 + $y * 0.74e-5))))));
+        } else {
+            $y = 2 / $fNum;
+            $fRet = exp(-$fNum) / sqrt($fNum) *
+                (1.25331414 + $y * (-0.7832358e-1 + $y * (0.2189568e-1 + $y * (-0.1062446e-1 + $y *
+                (0.587872e-2 + $y * (-0.251540e-2 + $y * 0.53208e-3))))));
+        }
+        return $fRet;
+    }
+
+
+    private static function besselK1($fNum)
+    {
+        if ($fNum <= 2) {
+            $fNum2 = $fNum * 0.5;
+            $y = ($fNum2 * $fNum2);
+            $fRet = log($fNum2) * self::BESSELI($fNum, 1) +
+                (1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y *
+                (-0.110404e-2 + $y * (-0.4686e-4))))))) / $fNum;
+        } else {
+            $y = 2 / $fNum;
+            $fRet = exp(-$fNum) / sqrt($fNum) *
+                (1.25331414 + $y * (0.23498619 + $y * (-0.3655620e-1 + $y * (0.1504268e-1 + $y * (-0.780353e-2 + $y *
+                (0.325614e-2 + $y * (-0.68245e-3)))))));
+        }
+        return $fRet;
+    }
+
+
+    /**
+     *    BESSELK
+     *
+     *    Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
+     *        for purely imaginary arguments.
+     *
+     *    Excel Function:
+     *        BESSELK(x,ord)
+     *
+     *    @access    public
+     *    @category Engineering Functions
+     *    @param    float        $x        The value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
+     *    @param    integer        $ord    The order of the Bessel function. If n is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
+     *                                If $ord < 0, BESSELK returns the #NUM! error value.
+     *    @return    float
+     *
+     */
+    public static function BESSELK($x, $ord)
+    {
+        $x        = (is_null($x))        ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $ord    = (is_null($ord))    ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($ord);
+
+        if ((is_numeric($x)) && (is_numeric($ord))) {
+            if (($ord < 0) || ($x == 0.0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            switch (floor($ord)) {
+                case 0:
+                    return self::besselK0($x);
+                case 1:
+                    return self::besselK1($x);
+                default:
+                    $fTox    = 2 / $x;
+                    $fBkm    = self::besselK0($x);
+                    $fBk    = self::besselK1($x);
+                    for ($n = 1; $n < $ord; ++$n) {
+                        $fBkp    = $fBkm + $n * $fTox * $fBk;
+                        $fBkm    = $fBk;
+                        $fBk    = $fBkp;
+                    }
+            }
+            return (is_nan($fBk)) ? PHPExcel_Calculation_Functions::NaN() : $fBk;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    private static function besselY0($fNum)
+    {
+        if ($fNum < 8.0) {
+            $y = ($fNum * $fNum);
+            $f1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y * (-86327.92757 + $y * 228.4622733))));
+            $f2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y * (47447.26470 + $y * (226.1030244 + $y))));
+            $fRet = $f1 / $f2 + 0.636619772 * self::BESSELJ($fNum, 0) * log($fNum);
+        } else {
+            $z = 8.0 / $fNum;
+            $y = ($z * $z);
+            $xx = $fNum - 0.785398164;
+            $f1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
+            $f2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y * (-0.934945152e-7))));
+            $fRet = sqrt(0.636619772 / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
+        }
+        return $fRet;
+    }
+
+
+    private static function besselY1($fNum)
+    {
+        if ($fNum < 8.0) {
+            $y = ($fNum * $fNum);
+            $f1 = $fNum * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y * (0.7349264551e9 + $y *
+                (-0.4237922726e7 + $y * 0.8511937935e4)))));
+            $f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
+                (0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
+            $fRet = $f1 / $f2 + 0.636619772 * ( self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
+        } else {
+            $fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491);
+        }
+        return $fRet;
+    }
+
+
+    /**
+     *    BESSELY
+     *
+     *    Returns the Bessel function, which is also called the Weber function or the Neumann function.
+     *
+     *    Excel Function:
+     *        BESSELY(x,ord)
+     *
+     *    @access    public
+     *    @category Engineering Functions
+     *    @param    float        $x        The value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
+     *    @param    integer        $ord    The order of the Bessel function. If n is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
+     *                                If $ord < 0, BESSELK returns the #NUM! error value.
+     *
+     *    @return    float
+     */
+    public static function BESSELY($x, $ord)
+    {
+        $x        = (is_null($x))        ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $ord    = (is_null($ord))    ? 0.0 :    PHPExcel_Calculation_Functions::flattenSingleValue($ord);
+
+        if ((is_numeric($x)) && (is_numeric($ord))) {
+            if (($ord < 0) || ($x == 0.0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            switch (floor($ord)) {
+                case 0:
+                    return self::besselY0($x);
+                case 1:
+                    return self::besselY1($x);
+                default:
+                    $fTox    = 2 / $x;
+                    $fBym    = self::besselY0($x);
+                    $fBy    = self::besselY1($x);
+                    for ($n = 1; $n < $ord; ++$n) {
+                        $fByp    = $n * $fTox * $fBy - $fBym;
+                        $fBym    = $fBy;
+                        $fBy    = $fByp;
+                    }
+            }
+            return (is_nan($fBy)) ? PHPExcel_Calculation_Functions::NaN() : $fBy;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * BINTODEC
+     *
+     * Return a binary value as decimal.
+     *
+     * Excel Function:
+     *        BIN2DEC(x)
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The binary number (as a string) that you want to convert. The number
+     *                                cannot contain more than 10 characters (10 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+     *                                Negative numbers are represented using two's-complement notation.
+     *                                If number is not a valid binary number, or if number contains more than
+     *                                10 characters (10 bits), BIN2DEC returns the #NUM! error value.
+     * @return    string
+     */
+    public static function BINTODEC($x)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+
+        if (is_bool($x)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $x = (int) $x;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+            $x = floor($x);
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if (strlen($x) > 10) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif (strlen($x) == 10) {
+            //    Two's Complement
+            $x = substr($x, -9);
+            return '-'.(512-bindec($x));
+        }
+        return bindec($x);
+    }
+
+
+    /**
+     * BINTOHEX
+     *
+     * Return a binary value as hex.
+     *
+     * Excel Function:
+     *        BIN2HEX(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The binary number (as a string) that you want to convert. The number
+     *                                cannot contain more than 10 characters (10 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+     *                                Negative numbers are represented using two's-complement notation.
+     *                                If number is not a valid binary number, or if number contains more than
+     *                                10 characters (10 bits), BIN2HEX returns the #NUM! error value.
+     * @param    integer        $places    The number of characters to use. If places is omitted, BIN2HEX uses the
+     *                                minimum number of characters necessary. Places is useful for padding the
+     *                                return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
+     *                                If places is negative, BIN2HEX returns the #NUM! error value.
+     * @return    string
+     */
+    public static function BINTOHEX($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $x = (int) $x;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+            $x = floor($x);
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if (strlen($x) > 10) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif (strlen($x) == 10) {
+            //    Two's Complement
+            return str_repeat('F', 8).substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
+        }
+        $hexVal = (string) strtoupper(dechex(bindec($x)));
+
+        return self::nbrConversionFormat($hexVal, $places);
+    }
+
+
+    /**
+     * BINTOOCT
+     *
+     * Return a binary value as octal.
+     *
+     * Excel Function:
+     *        BIN2OCT(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The binary number (as a string) that you want to convert. The number
+     *                                cannot contain more than 10 characters (10 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+     *                                Negative numbers are represented using two's-complement notation.
+     *                                If number is not a valid binary number, or if number contains more than
+     *                                10 characters (10 bits), BIN2OCT returns the #NUM! error value.
+     * @param    integer        $places    The number of characters to use. If places is omitted, BIN2OCT uses the
+     *                                minimum number of characters necessary. Places is useful for padding the
+     *                                return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
+     *                                If places is negative, BIN2OCT returns the #NUM! error value.
+     * @return    string
+     */
+    public static function BINTOOCT($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $x = (int) $x;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+            $x = floor($x);
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if (strlen($x) > 10) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif (strlen($x) == 10) {
+            //    Two's Complement
+            return str_repeat('7', 7).substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
+        }
+        $octVal = (string) decoct(bindec($x));
+
+        return self::nbrConversionFormat($octVal, $places);
+    }
+
+
+    /**
+     * DECTOBIN
+     *
+     * Return a decimal value as binary.
+     *
+     * Excel Function:
+     *        DEC2BIN(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The decimal integer you want to convert. If number is negative,
+     *                                valid place values are ignored and DEC2BIN returns a 10-character
+     *                                (10-bit) binary number in which the most significant bit is the sign
+     *                                bit. The remaining 9 bits are magnitude bits. Negative numbers are
+     *                                represented using two's-complement notation.
+     *                                If number < -512 or if number > 511, DEC2BIN returns the #NUM! error
+     *                                value.
+     *                                If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
+     *                                If DEC2BIN requires more than places characters, it returns the #NUM!
+     *                                error value.
+     * @param    integer        $places    The number of characters to use. If places is omitted, DEC2BIN uses
+     *                                the minimum number of characters necessary. Places is useful for
+     *                                padding the return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
+     *                                If places is zero or negative, DEC2BIN returns the #NUM! error value.
+     * @return    string
+     */
+    public static function DECTOBIN($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $x = (int) $x;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) floor($x);
+        $r = decbin($x);
+        if (strlen($r) == 32) {
+            //    Two's Complement
+            $r = substr($r, -10);
+        } elseif (strlen($r) > 11) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+
+    /**
+     * DECTOHEX
+     *
+     * Return a decimal value as hex.
+     *
+     * Excel Function:
+     *        DEC2HEX(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The decimal integer you want to convert. If number is negative,
+     *                                places is ignored and DEC2HEX returns a 10-character (40-bit)
+     *                                hexadecimal number in which the most significant bit is the sign
+     *                                bit. The remaining 39 bits are magnitude bits. Negative numbers
+     *                                are represented using two's-complement notation.
+     *                                If number < -549,755,813,888 or if number > 549,755,813,887,
+     *                                DEC2HEX returns the #NUM! error value.
+     *                                If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
+     *                                If DEC2HEX requires more than places characters, it returns the
+     *                                #NUM! error value.
+     * @param    integer        $places    The number of characters to use. If places is omitted, DEC2HEX uses
+     *                                the minimum number of characters necessary. Places is useful for
+     *                                padding the return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
+     *                                If places is zero or negative, DEC2HEX returns the #NUM! error value.
+     * @return    string
+     */
+    public static function DECTOHEX($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $x = (int) $x;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) floor($x);
+        $r = strtoupper(dechex($x));
+        if (strlen($r) == 8) {
+            //    Two's Complement
+            $r = 'FF'.$r;
+        }
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+
+    /**
+     * DECTOOCT
+     *
+     * Return an decimal value as octal.
+     *
+     * Excel Function:
+     *        DEC2OCT(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The decimal integer you want to convert. If number is negative,
+     *                                places is ignored and DEC2OCT returns a 10-character (30-bit)
+     *                                octal number in which the most significant bit is the sign bit.
+     *                                The remaining 29 bits are magnitude bits. Negative numbers are
+     *                                represented using two's-complement notation.
+     *                                If number < -536,870,912 or if number > 536,870,911, DEC2OCT
+     *                                returns the #NUM! error value.
+     *                                If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
+     *                                If DEC2OCT requires more than places characters, it returns the
+     *                                #NUM! error value.
+     * @param    integer        $places    The number of characters to use. If places is omitted, DEC2OCT uses
+     *                                the minimum number of characters necessary. Places is useful for
+     *                                padding the return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
+     *                                If places is zero or negative, DEC2OCT returns the #NUM! error value.
+     * @return    string
+     */
+    public static function DECTOOCT($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $x = (int) $x;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) floor($x);
+        $r = decoct($x);
+        if (strlen($r) == 11) {
+            //    Two's Complement
+            $r = substr($r, -10);
+        }
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+
+    /**
+     * HEXTOBIN
+     *
+     * Return a hex value as binary.
+     *
+     * Excel Function:
+     *        HEX2BIN(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x            the hexadecimal number you want to convert. Number cannot
+     *                                    contain more than 10 characters. The most significant bit of
+     *                                    number is the sign bit (40th bit from the right). The remaining
+     *                                    9 bits are magnitude bits. Negative numbers are represented
+     *                                    using two's-complement notation.
+     *                                    If number is negative, HEX2BIN ignores places and returns a
+     *                                    10-character binary number.
+     *                                    If number is negative, it cannot be less than FFFFFFFE00, and
+     *                                    if number is positive, it cannot be greater than 1FF.
+     *                                    If number is not a valid hexadecimal number, HEX2BIN returns
+     *                                    the #NUM! error value.
+     *                                    If HEX2BIN requires more than places characters, it returns
+     *                                    the #NUM! error value.
+     * @param    integer        $places        The number of characters to use. If places is omitted,
+     *                                    HEX2BIN uses the minimum number of characters necessary. Places
+     *                                    is useful for padding the return value with leading 0s (zeros).
+     *                                    If places is not an integer, it is truncated.
+     *                                    If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
+     *                                    If places is negative, HEX2BIN returns the #NUM! error value.
+     * @return    string
+     */
+    public static function HEXTOBIN($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $binVal = decbin(hexdec($x));
+
+        return substr(self::nbrConversionFormat($binVal, $places), -10);
+    }
+
+
+    /**
+     * HEXTODEC
+     *
+     * Return a hex value as decimal.
+     *
+     * Excel Function:
+     *        HEX2DEC(x)
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The hexadecimal number you want to convert. This number cannot
+     *                                contain more than 10 characters (40 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 39 bits are magnitude
+     *                                bits. Negative numbers are represented using two's-complement
+     *                                notation.
+     *                                If number is not a valid hexadecimal number, HEX2DEC returns the
+     *                                #NUM! error value.
+     * @return    string
+     */
+    public static function HEXTODEC($x)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+
+        if (is_bool($x)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return hexdec($x);
+    }
+
+
+    /**
+     * HEXTOOCT
+     *
+     * Return a hex value as octal.
+     *
+     * Excel Function:
+     *        HEX2OCT(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x            The hexadecimal number you want to convert. Number cannot
+     *                                    contain more than 10 characters. The most significant bit of
+     *                                    number is the sign bit. The remaining 39 bits are magnitude
+     *                                    bits. Negative numbers are represented using two's-complement
+     *                                    notation.
+     *                                    If number is negative, HEX2OCT ignores places and returns a
+     *                                    10-character octal number.
+     *                                    If number is negative, it cannot be less than FFE0000000, and
+     *                                    if number is positive, it cannot be greater than 1FFFFFFF.
+     *                                    If number is not a valid hexadecimal number, HEX2OCT returns
+     *                                    the #NUM! error value.
+     *                                    If HEX2OCT requires more than places characters, it returns
+     *                                    the #NUM! error value.
+     * @param    integer        $places        The number of characters to use. If places is omitted, HEX2OCT
+     *                                    uses the minimum number of characters necessary. Places is
+     *                                    useful for padding the return value with leading 0s (zeros).
+     *                                    If places is not an integer, it is truncated.
+     *                                    If places is nonnumeric, HEX2OCT returns the #VALUE! error
+     *                                    value.
+     *                                    If places is negative, HEX2OCT returns the #NUM! error value.
+     * @return    string
+     */
+    public static function HEXTOOCT($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) $x;
+        if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $octVal = decoct(hexdec($x));
+
+        return self::nbrConversionFormat($octVal, $places);
+    }    //    function HEXTOOCT()
+
+
+    /**
+     * OCTTOBIN
+     *
+     * Return an octal value as binary.
+     *
+     * Excel Function:
+     *        OCT2BIN(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x            The octal number you want to convert. Number may not
+     *                                    contain more than 10 characters. The most significant
+     *                                    bit of number is the sign bit. The remaining 29 bits
+     *                                    are magnitude bits. Negative numbers are represented
+     *                                    using two's-complement notation.
+     *                                    If number is negative, OCT2BIN ignores places and returns
+     *                                    a 10-character binary number.
+     *                                    If number is negative, it cannot be less than 7777777000,
+     *                                    and if number is positive, it cannot be greater than 777.
+     *                                    If number is not a valid octal number, OCT2BIN returns
+     *                                    the #NUM! error value.
+     *                                    If OCT2BIN requires more than places characters, it
+     *                                    returns the #NUM! error value.
+     * @param    integer        $places        The number of characters to use. If places is omitted,
+     *                                    OCT2BIN uses the minimum number of characters necessary.
+     *                                    Places is useful for padding the return value with
+     *                                    leading 0s (zeros).
+     *                                    If places is not an integer, it is truncated.
+     *                                    If places is nonnumeric, OCT2BIN returns the #VALUE!
+     *                                    error value.
+     *                                    If places is negative, OCT2BIN returns the #NUM! error
+     *                                    value.
+     * @return    string
+     */
+    public static function OCTTOBIN($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) $x;
+        if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $r = decbin(octdec($x));
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+
+    /**
+     * OCTTODEC
+     *
+     * Return an octal value as decimal.
+     *
+     * Excel Function:
+     *        OCT2DEC(x)
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x        The octal number you want to convert. Number may not contain
+     *                                more than 10 octal characters (30 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 29 bits are
+     *                                magnitude bits. Negative numbers are represented using
+     *                                two's-complement notation.
+     *                                If number is not a valid octal number, OCT2DEC returns the
+     *                                #NUM! error value.
+     * @return    string
+     */
+    public static function OCTTODEC($x)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+
+        if (is_bool($x)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) $x;
+        if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return octdec($x);
+    }
+
+
+    /**
+     * OCTTOHEX
+     *
+     * Return an octal value as hex.
+     *
+     * Excel Function:
+     *        OCT2HEX(x[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $x            The octal number you want to convert. Number may not contain
+     *                                    more than 10 octal characters (30 bits). The most significant
+     *                                    bit of number is the sign bit. The remaining 29 bits are
+     *                                    magnitude bits. Negative numbers are represented using
+     *                                    two's-complement notation.
+     *                                    If number is negative, OCT2HEX ignores places and returns a
+     *                                    10-character hexadecimal number.
+     *                                    If number is not a valid octal number, OCT2HEX returns the
+     *                                    #NUM! error value.
+     *                                    If OCT2HEX requires more than places characters, it returns
+     *                                    the #NUM! error value.
+     * @param    integer        $places        The number of characters to use. If places is omitted, OCT2HEX
+     *                                    uses the minimum number of characters necessary. Places is useful
+     *                                    for padding the return value with leading 0s (zeros).
+     *                                    If places is not an integer, it is truncated.
+     *                                    If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
+     *                                    If places is negative, OCT2HEX returns the #NUM! error value.
+     * @return    string
+     */
+    public static function OCTTOHEX($x, $places = null)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $places    = PHPExcel_Calculation_Functions::flattenSingleValue($places);
+
+        if (is_bool($x)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $x = (string) $x;
+        if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $hexVal = strtoupper(dechex(octdec($x)));
+
+        return self::nbrConversionFormat($hexVal, $places);
+    }
+
+
+    /**
+     * COMPLEX
+     *
+     * Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj.
+     *
+     * Excel Function:
+     *        COMPLEX(realNumber,imaginary[,places])
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    float        $realNumber        The real coefficient of the complex number.
+     * @param    float        $imaginary        The imaginary coefficient of the complex number.
+     * @param    string        $suffix            The suffix for the imaginary component of the complex number.
+     *                                        If omitted, the suffix is assumed to be "i".
+     * @return    string
+     */
+    public static function COMPLEX($realNumber = 0.0, $imaginary = 0.0, $suffix = 'i')
+    {
+        $realNumber = (is_null($realNumber)) ? 0.0 : PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
+        $imaginary  = (is_null($imaginary))  ? 0.0 : PHPExcel_Calculation_Functions::flattenSingleValue($imaginary);
+        $suffix     = (is_null($suffix))     ? 'i' : PHPExcel_Calculation_Functions::flattenSingleValue($suffix);
+
+        if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
+            (($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))) {
+            $realNumber    = (float) $realNumber;
+            $imaginary    = (float) $imaginary;
+
+            if ($suffix == '') {
+                $suffix = 'i';
+            }
+            if ($realNumber == 0.0) {
+                if ($imaginary == 0.0) {
+                    return (string) '0';
+                } elseif ($imaginary == 1.0) {
+                    return (string) $suffix;
+                } elseif ($imaginary == -1.0) {
+                    return (string) '-'.$suffix;
+                }
+                return (string) $imaginary.$suffix;
+            } elseif ($imaginary == 0.0) {
+                return (string) $realNumber;
+            } elseif ($imaginary == 1.0) {
+                return (string) $realNumber.'+'.$suffix;
+            } elseif ($imaginary == -1.0) {
+                return (string) $realNumber.'-'.$suffix;
+            }
+            if ($imaginary > 0) {
+                $imaginary = (string) '+'.$imaginary;
+            }
+            return (string) $realNumber.$imaginary.$suffix;
+        }
+
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * IMAGINARY
+     *
+     * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMAGINARY(complexNumber)
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $complexNumber    The complex number for which you want the imaginary
+     *                                         coefficient.
+     * @return    float
+     */
+    public static function IMAGINARY($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+        return $parsedComplex['imaginary'];
+    }
+
+
+    /**
+     * IMREAL
+     *
+     * Returns the real coefficient of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMREAL(complexNumber)
+     *
+     * @access    public
+     * @category Engineering Functions
+     * @param    string        $complexNumber    The complex number for which you want the real coefficient.
+     * @return    float
+     */
+    public static function IMREAL($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+        return $parsedComplex['real'];
+    }
+
+
+    /**
+     * IMABS
+     *
+     * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMABS(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the absolute value.
+     * @return    float
+     */
+    public static function IMABS($complexNumber)
+    {
+        $complexNumber = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        return sqrt(
+            ($parsedComplex['real'] * $parsedComplex['real']) +
+            ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])
+        );
+    }
+
+
+    /**
+     * IMARGUMENT
+     *
+     * Returns the argument theta of a complex number, i.e. the angle in radians from the real
+     * axis to the representation of the number in polar coordinates.
+     *
+     * Excel Function:
+     *        IMARGUMENT(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the argument theta.
+     * @return    float
+     */
+    public static function IMARGUMENT($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if ($parsedComplex['real'] == 0.0) {
+            if ($parsedComplex['imaginary'] == 0.0) {
+                return 0.0;
+            } elseif ($parsedComplex['imaginary'] < 0.0) {
+                return M_PI / -2;
+            } else {
+                return M_PI / 2;
+            }
+        } elseif ($parsedComplex['real'] > 0.0) {
+            return atan($parsedComplex['imaginary'] / $parsedComplex['real']);
+        } elseif ($parsedComplex['imaginary'] < 0.0) {
+            return 0 - (M_PI - atan(abs($parsedComplex['imaginary']) / abs($parsedComplex['real'])));
+        } else {
+            return M_PI - atan($parsedComplex['imaginary'] / abs($parsedComplex['real']));
+        }
+    }
+
+
+    /**
+     * IMCONJUGATE
+     *
+     * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCONJUGATE(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the conjugate.
+     * @return    string
+     */
+    public static function IMCONJUGATE($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if ($parsedComplex['imaginary'] == 0.0) {
+            return $parsedComplex['real'];
+        } else {
+            return self::cleanComplex(
+                self::COMPLEX(
+                    $parsedComplex['real'],
+                    0 - $parsedComplex['imaginary'],
+                    $parsedComplex['suffix']
+                )
+            );
+        }
+    }
+
+
+    /**
+     * IMCOS
+     *
+     * Returns the cosine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOS(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the cosine.
+     * @return    string|float
+     */
+    public static function IMCOS($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if ($parsedComplex['imaginary'] == 0.0) {
+            return cos($parsedComplex['real']);
+        } else {
+            return self::IMCONJUGATE(
+                self::COMPLEX(
+                    cos($parsedComplex['real']) * cosh($parsedComplex['imaginary']),
+                    sin($parsedComplex['real']) * sinh($parsedComplex['imaginary']),
+                    $parsedComplex['suffix']
+                )
+            );
+        }
+    }
+
+
+    /**
+     * IMSIN
+     *
+     * Returns the sine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSIN(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the sine.
+     * @return    string|float
+     */
+    public static function IMSIN($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if ($parsedComplex['imaginary'] == 0.0) {
+            return sin($parsedComplex['real']);
+        } else {
+            return self::COMPLEX(
+                sin($parsedComplex['real']) * cosh($parsedComplex['imaginary']),
+                cos($parsedComplex['real']) * sinh($parsedComplex['imaginary']),
+                $parsedComplex['suffix']
+            );
+        }
+    }
+
+
+    /**
+     * IMSQRT
+     *
+     * Returns the square root of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSQRT(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the square root.
+     * @return    string
+     */
+    public static function IMSQRT($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        $theta = self::IMARGUMENT($complexNumber);
+        $d1 = cos($theta / 2);
+        $d2 = sin($theta / 2);
+        $r = sqrt(sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])));
+
+        if ($parsedComplex['suffix'] == '') {
+            return self::COMPLEX($d1 * $r, $d2 * $r);
+        } else {
+            return self::COMPLEX($d1 * $r, $d2 * $r, $parsedComplex['suffix']);
+        }
+    }
+
+
+    /**
+     * IMLN
+     *
+     * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLN(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the natural logarithm.
+     * @return    string
+     */
+    public static function IMLN($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        $logR = log(sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])));
+        $t = self::IMARGUMENT($complexNumber);
+
+        if ($parsedComplex['suffix'] == '') {
+            return self::COMPLEX($logR, $t);
+        } else {
+            return self::COMPLEX($logR, $t, $parsedComplex['suffix']);
+        }
+    }
+
+
+    /**
+     * IMLOG10
+     *
+     * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLOG10(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the common logarithm.
+     * @return    string
+     */
+    public static function IMLOG10($complexNumber)
+    {
+        $complexNumber = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif (($parsedComplex['real'] > 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
+            return log10($parsedComplex['real']);
+        }
+
+        return self::IMPRODUCT(log10(EULER), self::IMLN($complexNumber));
+    }
+
+
+    /**
+     * IMLOG2
+     *
+     * Returns the base-2 logarithm of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLOG2(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the base-2 logarithm.
+     * @return    string
+     */
+    public static function IMLOG2($complexNumber)
+    {
+        $complexNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif (($parsedComplex['real'] > 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
+            return log($parsedComplex['real'], 2);
+        }
+
+        return self::IMPRODUCT(log(EULER, 2), self::IMLN($complexNumber));
+    }
+
+
+    /**
+     * IMEXP
+     *
+     * Returns the exponential of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMEXP(complexNumber)
+     *
+     * @param    string        $complexNumber    The complex number for which you want the exponential.
+     * @return    string
+     */
+    public static function IMEXP($complexNumber)
+    {
+        $complexNumber = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
+            return '1';
+        }
+
+        $e = exp($parsedComplex['real']);
+        $eX = $e * cos($parsedComplex['imaginary']);
+        $eY = $e * sin($parsedComplex['imaginary']);
+
+        if ($parsedComplex['suffix'] == '') {
+            return self::COMPLEX($eX, $eY);
+        } else {
+            return self::COMPLEX($eX, $eY, $parsedComplex['suffix']);
+        }
+    }
+
+
+    /**
+     * IMPOWER
+     *
+     * Returns a complex number in x + yi or x + yj text format raised to a power.
+     *
+     * Excel Function:
+     *        IMPOWER(complexNumber,realNumber)
+     *
+     * @param    string        $complexNumber    The complex number you want to raise to a power.
+     * @param    float        $realNumber        The power to which you want to raise the complex number.
+     * @return    string
+     */
+    public static function IMPOWER($complexNumber, $realNumber)
+    {
+        $complexNumber = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
+        $realNumber    = PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
+
+        if (!is_numeric($realNumber)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        $parsedComplex = self::parseComplex($complexNumber);
+
+        $r = sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
+        $rPower = pow($r, $realNumber);
+        $theta = self::IMARGUMENT($complexNumber) * $realNumber;
+        if ($theta == 0) {
+            return 1;
+        } elseif ($parsedComplex['imaginary'] == 0.0) {
+            return self::COMPLEX($rPower * cos($theta), $rPower * sin($theta), $parsedComplex['suffix']);
+        } else {
+            return self::COMPLEX($rPower * cos($theta), $rPower * sin($theta), $parsedComplex['suffix']);
+        }
+    }
+
+
+    /**
+     * IMDIV
+     *
+     * Returns the quotient of two complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMDIV(complexDividend,complexDivisor)
+     *
+     * @param    string        $complexDividend    The complex numerator or dividend.
+     * @param    string        $complexDivisor        The complex denominator or divisor.
+     * @return    string
+     */
+    public static function IMDIV($complexDividend, $complexDivisor)
+    {
+        $complexDividend    = PHPExcel_Calculation_Functions::flattenSingleValue($complexDividend);
+        $complexDivisor    = PHPExcel_Calculation_Functions::flattenSingleValue($complexDivisor);
+
+        $parsedComplexDividend = self::parseComplex($complexDividend);
+        $parsedComplexDivisor = self::parseComplex($complexDivisor);
+
+        if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] != '') &&
+            ($parsedComplexDividend['suffix'] != $parsedComplexDivisor['suffix'])) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] == '')) {
+            $parsedComplexDivisor['suffix'] = $parsedComplexDividend['suffix'];
+        }
+
+        $d1 = ($parsedComplexDividend['real'] * $parsedComplexDivisor['real']) + ($parsedComplexDividend['imaginary'] * $parsedComplexDivisor['imaginary']);
+        $d2 = ($parsedComplexDividend['imaginary'] * $parsedComplexDivisor['real']) - ($parsedComplexDividend['real'] * $parsedComplexDivisor['imaginary']);
+        $d3 = ($parsedComplexDivisor['real'] * $parsedComplexDivisor['real']) + ($parsedComplexDivisor['imaginary'] * $parsedComplexDivisor['imaginary']);
+
+        $r = $d1 / $d3;
+        $i = $d2 / $d3;
+
+        if ($i > 0.0) {
+            return self::cleanComplex($r.'+'.$i.$parsedComplexDivisor['suffix']);
+        } elseif ($i < 0.0) {
+            return self::cleanComplex($r.$i.$parsedComplexDivisor['suffix']);
+        } else {
+            return $r;
+        }
+    }
+
+
+    /**
+     * IMSUB
+     *
+     * Returns the difference of two complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSUB(complexNumber1,complexNumber2)
+     *
+     * @param    string        $complexNumber1        The complex number from which to subtract complexNumber2.
+     * @param    string        $complexNumber2        The complex number to subtract from complexNumber1.
+     * @return    string
+     */
+    public static function IMSUB($complexNumber1, $complexNumber2)
+    {
+        $complexNumber1    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber1);
+        $complexNumber2    = PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber2);
+
+        $parsedComplex1 = self::parseComplex($complexNumber1);
+        $parsedComplex2 = self::parseComplex($complexNumber2);
+
+        if ((($parsedComplex1['suffix'] != '') && ($parsedComplex2['suffix'] != '')) &&
+            ($parsedComplex1['suffix'] != $parsedComplex2['suffix'])) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif (($parsedComplex1['suffix'] == '') && ($parsedComplex2['suffix'] != '')) {
+            $parsedComplex1['suffix'] = $parsedComplex2['suffix'];
+        }
+
+        $d1 = $parsedComplex1['real'] - $parsedComplex2['real'];
+        $d2 = $parsedComplex1['imaginary'] - $parsedComplex2['imaginary'];
+
+        return self::COMPLEX($d1, $d2, $parsedComplex1['suffix']);
+    }
+
+
+    /**
+     * IMSUM
+     *
+     * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSUM(complexNumber[,complexNumber[,...]])
+     *
+     * @param    string        $complexNumber,...    Series of complex numbers to add
+     * @return    string
+     */
+    public static function IMSUM()
+    {
+        // Return value
+        $returnValue = self::parseComplex('0');
+        $activeSuffix = '';
+
+        // Loop through the arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            $parsedComplex = self::parseComplex($arg);
+
+            if ($activeSuffix == '') {
+                $activeSuffix = $parsedComplex['suffix'];
+            } elseif (($parsedComplex['suffix'] != '') && ($activeSuffix != $parsedComplex['suffix'])) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+
+            $returnValue['real'] += $parsedComplex['real'];
+            $returnValue['imaginary'] += $parsedComplex['imaginary'];
+        }
+
+        if ($returnValue['imaginary'] == 0.0) {
+            $activeSuffix = '';
+        }
+        return self::COMPLEX($returnValue['real'], $returnValue['imaginary'], $activeSuffix);
+    }
+
+
+    /**
+     * IMPRODUCT
+     *
+     * Returns the product of two or more complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMPRODUCT(complexNumber[,complexNumber[,...]])
+     *
+     * @param    string        $complexNumber,...    Series of complex numbers to multiply
+     * @return    string
+     */
+    public static function IMPRODUCT()
+    {
+        // Return value
+        $returnValue = self::parseComplex('1');
+        $activeSuffix = '';
+
+        // Loop through the arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            $parsedComplex = self::parseComplex($arg);
+
+            $workValue = $returnValue;
+            if (($parsedComplex['suffix'] != '') && ($activeSuffix == '')) {
+                $activeSuffix = $parsedComplex['suffix'];
+            } elseif (($parsedComplex['suffix'] != '') && ($activeSuffix != $parsedComplex['suffix'])) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $returnValue['real'] = ($workValue['real'] * $parsedComplex['real']) - ($workValue['imaginary'] * $parsedComplex['imaginary']);
+            $returnValue['imaginary'] = ($workValue['real'] * $parsedComplex['imaginary']) + ($workValue['imaginary'] * $parsedComplex['real']);
+        }
+
+        if ($returnValue['imaginary'] == 0.0) {
+            $activeSuffix = '';
+        }
+        return self::COMPLEX($returnValue['real'], $returnValue['imaginary'], $activeSuffix);
+    }
+
+
+    /**
+     *    DELTA
+     *
+     *    Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
+     *    Use this function to filter a set of values. For example, by summing several DELTA
+     *    functions you calculate the count of equal pairs. This function is also known as the
+     *    Kronecker Delta function.
+     *
+     *    Excel Function:
+     *        DELTA(a[,b])
+     *
+     *    @param    float        $a    The first number.
+     *    @param    float        $b    The second number. If omitted, b is assumed to be zero.
+     *    @return    int
+     */
+    public static function DELTA($a, $b = 0)
+    {
+        $a = PHPExcel_Calculation_Functions::flattenSingleValue($a);
+        $b = PHPExcel_Calculation_Functions::flattenSingleValue($b);
+
+        return (int) ($a == $b);
+    }
+
+
+    /**
+     *    GESTEP
+     *
+     *    Excel Function:
+     *        GESTEP(number[,step])
+     *
+     *    Returns 1 if number >= step; returns 0 (zero) otherwise
+     *    Use this function to filter a set of values. For example, by summing several GESTEP
+     *    functions you calculate the count of values that exceed a threshold.
+     *
+     *    @param    float        $number        The value to test against step.
+     *    @param    float        $step        The threshold value.
+     *                                    If you omit a value for step, GESTEP uses zero.
+     *    @return    int
+     */
+    public static function GESTEP($number, $step = 0)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $step    = PHPExcel_Calculation_Functions::flattenSingleValue($step);
+
+        return (int) ($number >= $step);
+    }
+
+
+    //
+    //    Private method to calculate the erf value
+    //
+    private static $twoSqrtPi = 1.128379167095512574;
+
+    public static function erfVal($x)
+    {
+        if (abs($x) > 2.2) {
+            return 1 - self::erfcVal($x);
+        }
+        $sum = $term = $x;
+        $xsqr = ($x * $x);
+        $j = 1;
+        do {
+            $term *= $xsqr / $j;
+            $sum -= $term / (2 * $j + 1);
+            ++$j;
+            $term *= $xsqr / $j;
+            $sum += $term / (2 * $j + 1);
+            ++$j;
+            if ($sum == 0.0) {
+                break;
+            }
+        } while (abs($term / $sum) > PRECISION);
+        return self::$twoSqrtPi * $sum;
+    }
+
+
+    /**
+     *    ERF
+     *
+     *    Returns the error function integrated between the lower and upper bound arguments.
+     *
+     *    Note: In Excel 2007 or earlier, if you input a negative value for the upper or lower bound arguments,
+     *            the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
+     *            improved, so that it can now calculate the function for both positive and negative ranges.
+     *            PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
+     *
+     *    Excel Function:
+     *        ERF(lower[,upper])
+     *
+     *    @param    float        $lower    lower bound for integrating ERF
+     *    @param    float        $upper    upper bound for integrating ERF.
+     *                                If omitted, ERF integrates between zero and lower_limit
+     *    @return    float
+     */
+    public static function ERF($lower, $upper = null)
+    {
+        $lower    = PHPExcel_Calculation_Functions::flattenSingleValue($lower);
+        $upper    = PHPExcel_Calculation_Functions::flattenSingleValue($upper);
+
+        if (is_numeric($lower)) {
+            if (is_null($upper)) {
+                return self::erfVal($lower);
+            }
+            if (is_numeric($upper)) {
+                return self::erfVal($upper) - self::erfVal($lower);
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    //
+    //    Private method to calculate the erfc value
+    //
+    private static $oneSqrtPi = 0.564189583547756287;
+
+    private static function erfcVal($x)
+    {
+        if (abs($x) < 2.2) {
+            return 1 - self::erfVal($x);
+        }
+        if ($x < 0) {
+            return 2 - self::ERFC(-$x);
+        }
+        $a = $n = 1;
+        $b = $c = $x;
+        $d = ($x * $x) + 0.5;
+        $q1 = $q2 = $b / $d;
+        $t = 0;
+        do {
+            $t = $a * $n + $b * $x;
+            $a = $b;
+            $b = $t;
+            $t = $c * $n + $d * $x;
+            $c = $d;
+            $d = $t;
+            $n += 0.5;
+            $q1 = $q2;
+            $q2 = $b / $d;
+        } while ((abs($q1 - $q2) / $q2) > PRECISION);
+        return self::$oneSqrtPi * exp(-$x * $x) * $q2;
+    }
+
+
+    /**
+     *    ERFC
+     *
+     *    Returns the complementary ERF function integrated between x and infinity
+     *
+     *    Note: In Excel 2007 or earlier, if you input a negative value for the lower bound argument,
+     *        the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
+     *        improved, so that it can now calculate the function for both positive and negative x values.
+     *            PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
+     *
+     *    Excel Function:
+     *        ERFC(x)
+     *
+     *    @param    float    $x    The lower bound for integrating ERFC
+     *    @return    float
+     */
+    public static function ERFC($x)
+    {
+        $x = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+
+        if (is_numeric($x)) {
+            return self::erfcVal($x);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     *    getConversionGroups
+     *    Returns a list of the different conversion groups for UOM conversions
+     *
+     *    @return    array
+     */
+    public static function getConversionGroups()
+    {
+        $conversionGroups = array();
+        foreach (self::$conversionUnits as $conversionUnit) {
+            $conversionGroups[] = $conversionUnit['Group'];
+        }
+        return array_merge(array_unique($conversionGroups));
+    }
+
+
+    /**
+     *    getConversionGroupUnits
+     *    Returns an array of units of measure, for a specified conversion group, or for all groups
+     *
+     *    @param    string    $group    The group whose units of measure you want to retrieve
+     *    @return    array
+     */
+    public static function getConversionGroupUnits($group = null)
+    {
+        $conversionGroups = array();
+        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
+            if ((is_null($group)) || ($conversionGroup['Group'] == $group)) {
+                $conversionGroups[$conversionGroup['Group']][] = $conversionUnit;
+            }
+        }
+        return $conversionGroups;
+    }
+
+
+    /**
+     *    getConversionGroupUnitDetails
+     *
+     *    @param    string    $group    The group whose units of measure you want to retrieve
+     *    @return    array
+     */
+    public static function getConversionGroupUnitDetails($group = null)
+    {
+        $conversionGroups = array();
+        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
+            if ((is_null($group)) || ($conversionGroup['Group'] == $group)) {
+                $conversionGroups[$conversionGroup['Group']][] = array(
+                    'unit'        => $conversionUnit,
+                    'description' => $conversionGroup['Unit Name']
+                );
+            }
+        }
+        return $conversionGroups;
+    }
+
+
+    /**
+     *    getConversionMultipliers
+     *    Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
+     *
+     *    @return    array of mixed
+     */
+    public static function getConversionMultipliers()
+    {
+        return self::$conversionMultipliers;
+    }
+
+
+    /**
+     *    CONVERTUOM
+     *
+     *    Converts a number from one measurement system to another.
+     *    For example, CONVERT can translate a table of distances in miles to a table of distances
+     *    in kilometers.
+     *
+     *    Excel Function:
+     *        CONVERT(value,fromUOM,toUOM)
+     *
+     *    @param    float        $value        The value in fromUOM to convert.
+     *    @param    string        $fromUOM    The units for value.
+     *    @param    string        $toUOM        The units for the result.
+     *
+     *    @return    float
+     */
+    public static function CONVERTUOM($value, $fromUOM, $toUOM)
+    {
+        $value   = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $fromUOM = PHPExcel_Calculation_Functions::flattenSingleValue($fromUOM);
+        $toUOM   = PHPExcel_Calculation_Functions::flattenSingleValue($toUOM);
+
+        if (!is_numeric($value)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $fromMultiplier = 1.0;
+        if (isset(self::$conversionUnits[$fromUOM])) {
+            $unitGroup1 = self::$conversionUnits[$fromUOM]['Group'];
+        } else {
+            $fromMultiplier = substr($fromUOM, 0, 1);
+            $fromUOM = substr($fromUOM, 1);
+            if (isset(self::$conversionMultipliers[$fromMultiplier])) {
+                $fromMultiplier = self::$conversionMultipliers[$fromMultiplier]['multiplier'];
+            } else {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            if ((isset(self::$conversionUnits[$fromUOM])) && (self::$conversionUnits[$fromUOM]['AllowPrefix'])) {
+                $unitGroup1 = self::$conversionUnits[$fromUOM]['Group'];
+            } else {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+        }
+        $value *= $fromMultiplier;
+
+        $toMultiplier = 1.0;
+        if (isset(self::$conversionUnits[$toUOM])) {
+            $unitGroup2 = self::$conversionUnits[$toUOM]['Group'];
+        } else {
+            $toMultiplier = substr($toUOM, 0, 1);
+            $toUOM = substr($toUOM, 1);
+            if (isset(self::$conversionMultipliers[$toMultiplier])) {
+                $toMultiplier = self::$conversionMultipliers[$toMultiplier]['multiplier'];
+            } else {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            if ((isset(self::$conversionUnits[$toUOM])) && (self::$conversionUnits[$toUOM]['AllowPrefix'])) {
+                $unitGroup2 = self::$conversionUnits[$toUOM]['Group'];
+            } else {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+        }
+        if ($unitGroup1 != $unitGroup2) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+
+        if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) {
+            //    We've already factored $fromMultiplier into the value, so we need
+            //        to reverse it again
+            return $value / $fromMultiplier;
+        } elseif ($unitGroup1 == 'Temperature') {
+            if (($fromUOM == 'F') || ($fromUOM == 'fah')) {
+                if (($toUOM == 'F') || ($toUOM == 'fah')) {
+                    return $value;
+                } else {
+                    $value = (($value - 32) / 1.8);
+                    if (($toUOM == 'K') || ($toUOM == 'kel')) {
+                        $value += 273.15;
+                    }
+                    return $value;
+                }
+            } elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
+                      (($toUOM == 'K') || ($toUOM == 'kel'))) {
+                        return $value;
+            } elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
+                      (($toUOM == 'C') || ($toUOM == 'cel'))) {
+                    return $value;
+            }
+            if (($toUOM == 'F') || ($toUOM == 'fah')) {
+                if (($fromUOM == 'K') || ($fromUOM == 'kel')) {
+                    $value -= 273.15;
+                }
+                return ($value * 1.8) + 32;
+            }
+            if (($toUOM == 'C') || ($toUOM == 'cel')) {
+                return $value - 273.15;
+            }
+            return $value + 273.15;
+        }
+        return ($value * self::$unitConversions[$unitGroup1][$fromUOM][$toUOM]) / $toMultiplier;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Exception.php b/lib/PHPExcel/Calculation/Exception.php
new file mode 100644
index 000000000..52d73fc4f
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Exception.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * PHPExcel_Calculation_Exception
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Exception extends PHPExcel_Exception
+{
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/ExceptionHandler.php b/lib/PHPExcel/Calculation/ExceptionHandler.php
new file mode 100644
index 000000000..4cb0a6880
--- /dev/null
+++ b/lib/PHPExcel/Calculation/ExceptionHandler.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * PHPExcel_Calculation_ExceptionHandler
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_ExceptionHandler
+{
+    /**
+     * Register errorhandler
+     */
+    public function __construct()
+    {
+        set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
+    }
+
+    /**
+     * Unregister errorhandler
+     */
+    public function __destruct()
+    {
+        restore_error_handler();
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Financial.php b/lib/PHPExcel/Calculation/Financial.php
new file mode 100644
index 000000000..fdf489400
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Financial.php
@@ -0,0 +1,2359 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/** FINANCIAL_MAX_ITERATIONS */
+define('FINANCIAL_MAX_ITERATIONS', 128);
+
+/** FINANCIAL_PRECISION */
+define('FINANCIAL_PRECISION', 1.0e-08);
+
+/**
+ * PHPExcel_Calculation_Financial
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Financial
+{
+    /**
+     * isLastDayOfMonth
+     *
+     * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
+     *
+     * @param    DateTime    $testDate    The date for testing
+     * @return    boolean
+     */
+    private static function isLastDayOfMonth($testDate)
+    {
+        return ($testDate->format('d') == $testDate->format('t'));
+    }
+
+
+    /**
+     * isFirstDayOfMonth
+     *
+     * Returns a boolean TRUE/FALSE indicating if this date is the first date of the month
+     *
+     * @param    DateTime    $testDate    The date for testing
+     * @return    boolean
+     */
+    private static function isFirstDayOfMonth($testDate)
+    {
+        return ($testDate->format('d') == 1);
+    }
+
+
+    private static function couponFirstPeriodDate($settlement, $maturity, $frequency, $next)
+    {
+        $months = 12 / $frequency;
+
+        $result = PHPExcel_Shared_Date::ExcelToPHPObject($maturity);
+        $eom = self::isLastDayOfMonth($result);
+
+        while ($settlement < PHPExcel_Shared_Date::PHPToExcel($result)) {
+            $result->modify('-'.$months.' months');
+        }
+        if ($next) {
+            $result->modify('+'.$months.' months');
+        }
+
+        if ($eom) {
+            $result->modify('-1 day');
+        }
+
+        return PHPExcel_Shared_Date::PHPToExcel($result);
+    }
+
+
+    private static function isValidFrequency($frequency)
+    {
+        if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) {
+            return true;
+        }
+        if ((PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) &&
+            (($frequency == 6) || ($frequency == 12))) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * daysPerYear
+     *
+     * Returns the number of days in a specified year, as defined by the "basis" value
+     *
+     * @param    integer        $year    The year against which we're testing
+     * @param   integer        $basis    The type of day count:
+     *                                    0 or omitted US (NASD)    360
+     *                                    1                        Actual (365 or 366 in a leap year)
+     *                                    2                        360
+     *                                    3                        365
+     *                                    4                        European 360
+     * @return    integer
+     */
+    private static function daysPerYear($year, $basis = 0)
+    {
+        switch ($basis) {
+            case 0:
+            case 2:
+            case 4:
+                $daysPerYear = 360;
+                break;
+            case 3:
+                $daysPerYear = 365;
+                break;
+            case 1:
+                $daysPerYear = (PHPExcel_Calculation_DateTime::isLeapYear($year)) ? 366 : 365;
+                break;
+            default:
+                return PHPExcel_Calculation_Functions::NaN();
+        }
+        return $daysPerYear;
+    }
+
+
+    private static function interestAndPrincipal($rate = 0, $per = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0)
+    {
+        $pmt = self::PMT($rate, $nper, $pv, $fv, $type);
+        $capital = $pv;
+        for ($i = 1; $i<= $per; ++$i) {
+            $interest = ($type && $i == 1) ? 0 : -$capital * $rate;
+            $principal = $pmt - $interest;
+            $capital += $principal;
+        }
+        return array($interest, $principal);
+    }
+
+
+    /**
+     * ACCRINT
+     *
+     * Returns the accrued interest for a security that pays periodic interest.
+     *
+     * Excel Function:
+     *        ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    $issue            The security's issue date.
+     * @param    mixed    $firstinterest    The security's first interest date.
+     * @param    mixed    $settlement        The security's settlement date.
+     *                                    The security settlement date is the date after the issue date
+     *                                    when the security is traded to the buyer.
+     * @param    float    $rate            The security's annual coupon rate.
+     * @param    float    $par            The security's par value.
+     *                                    If you omit par, ACCRINT uses $1,000.
+     * @param    integer    $frequency        the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer    $basis            The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function ACCRINT($issue, $firstinterest, $settlement, $rate, $par = 1000, $frequency = 1, $basis = 0)
+    {
+        $issue        = PHPExcel_Calculation_Functions::flattenSingleValue($issue);
+        $firstinterest    = PHPExcel_Calculation_Functions::flattenSingleValue($firstinterest);
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $rate        = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $par        = (is_null($par))        ? 1000 :    PHPExcel_Calculation_Functions::flattenSingleValue($par);
+        $frequency    = (is_null($frequency))    ? 1    :         PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis))        ? 0    :        PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if ((is_numeric($rate)) && (is_numeric($par))) {
+            $rate    = (float) $rate;
+            $par    = (float) $par;
+            if (($rate <= 0) || ($par <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
+            if (!is_numeric($daysBetweenIssueAndSettlement)) {
+                //    return date error
+                return $daysBetweenIssueAndSettlement;
+            }
+
+            return $par * $rate * $daysBetweenIssueAndSettlement;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * ACCRINTM
+     *
+     * Returns the accrued interest for a security that pays interest at maturity.
+     *
+     * Excel Function:
+     *        ACCRINTM(issue,settlement,rate[,par[,basis]])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    issue        The security's issue date.
+     * @param    mixed    settlement    The security's settlement (or maturity) date.
+     * @param    float    rate        The security's annual coupon rate.
+     * @param    float    par            The security's par value.
+     *                                    If you omit par, ACCRINT uses $1,000.
+     * @param    integer    basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function ACCRINTM($issue, $settlement, $rate, $par = 1000, $basis = 0)
+    {
+        $issue        = PHPExcel_Calculation_Functions::flattenSingleValue($issue);
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $rate        = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $par        = (is_null($par))    ? 1000 :    PHPExcel_Calculation_Functions::flattenSingleValue($par);
+        $basis        = (is_null($basis))    ? 0 :        PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if ((is_numeric($rate)) && (is_numeric($par))) {
+            $rate    = (float) $rate;
+            $par    = (float) $par;
+            if (($rate <= 0) || ($par <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
+            if (!is_numeric($daysBetweenIssueAndSettlement)) {
+                //    return date error
+                return $daysBetweenIssueAndSettlement;
+            }
+            return $par * $rate * $daysBetweenIssueAndSettlement;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * AMORDEGRC
+     *
+     * Returns the depreciation for each accounting period.
+     * This function is provided for the French accounting system. If an asset is purchased in
+     * the middle of the accounting period, the prorated depreciation is taken into account.
+     * The function is similar to AMORLINC, except that a depreciation coefficient is applied in
+     * the calculation depending on the life of the assets.
+     * This function will return the depreciation until the last period of the life of the assets
+     * or until the cumulated value of depreciation is greater than the cost of the assets minus
+     * the salvage value.
+     *
+     * Excel Function:
+     *        AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    cost        The cost of the asset.
+     * @param    mixed    purchased    Date of the purchase of the asset.
+     * @param    mixed    firstPeriod    Date of the end of the first period.
+     * @param    mixed    salvage        The salvage value at the end of the life of the asset.
+     * @param    float    period        The period.
+     * @param    float    rate        Rate of depreciation.
+     * @param    integer    basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis = 0)
+    {
+        $cost            = PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+        $purchased        = PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
+        $firstPeriod    = PHPExcel_Calculation_Functions::flattenSingleValue($firstPeriod);
+        $salvage        = PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+        $period            = floor(PHPExcel_Calculation_Functions::flattenSingleValue($period));
+        $rate            = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $basis            = (is_null($basis))    ? 0 :    (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    The depreciation coefficients are:
+        //    Life of assets (1/rate)        Depreciation coefficient
+        //    Less than 3 years            1
+        //    Between 3 and 4 years        1.5
+        //    Between 5 and 6 years        2
+        //    More than 6 years            2.5
+        $fUsePer = 1.0 / $rate;
+        if ($fUsePer < 3.0) {
+            $amortiseCoeff = 1.0;
+        } elseif ($fUsePer < 5.0) {
+            $amortiseCoeff = 1.5;
+        } elseif ($fUsePer <= 6.0) {
+            $amortiseCoeff = 2.0;
+        } else {
+            $amortiseCoeff = 2.5;
+        }
+
+        $rate *= $amortiseCoeff;
+        $fNRate = round(PHPExcel_Calculation_DateTime::YEARFRAC($purchased, $firstPeriod, $basis) * $rate * $cost, 0);
+        $cost -= $fNRate;
+        $fRest = $cost - $salvage;
+
+        for ($n = 0; $n < $period; ++$n) {
+            $fNRate = round($rate * $cost, 0);
+            $fRest -= $fNRate;
+
+            if ($fRest < 0.0) {
+                switch ($period - $n) {
+                    case 0:
+                    case 1:
+                        return round($cost * 0.5, 0);
+                    default:
+                        return 0.0;
+                }
+            }
+            $cost -= $fNRate;
+        }
+        return $fNRate;
+    }
+
+
+    /**
+     * AMORLINC
+     *
+     * Returns the depreciation for each accounting period.
+     * This function is provided for the French accounting system. If an asset is purchased in
+     * the middle of the accounting period, the prorated depreciation is taken into account.
+     *
+     * Excel Function:
+     *        AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    cost        The cost of the asset.
+     * @param    mixed    purchased    Date of the purchase of the asset.
+     * @param    mixed    firstPeriod    Date of the end of the first period.
+     * @param    mixed    salvage        The salvage value at the end of the life of the asset.
+     * @param    float    period        The period.
+     * @param    float    rate        Rate of depreciation.
+     * @param    integer    basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis = 0)
+    {
+        $cost        = PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+        $purchased   = PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
+        $firstPeriod = PHPExcel_Calculation_Functions::flattenSingleValue($firstPeriod);
+        $salvage     = PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+        $period      = PHPExcel_Calculation_Functions::flattenSingleValue($period);
+        $rate        = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $basis       = (is_null($basis)) ? 0 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        $fOneRate = $cost * $rate;
+        $fCostDelta = $cost - $salvage;
+        //    Note, quirky variation for leap years on the YEARFRAC for this function
+        $purchasedYear = PHPExcel_Calculation_DateTime::YEAR($purchased);
+        $yearFrac = PHPExcel_Calculation_DateTime::YEARFRAC($purchased, $firstPeriod, $basis);
+
+        if (($basis == 1) && ($yearFrac < 1) && (PHPExcel_Calculation_DateTime::isLeapYear($purchasedYear))) {
+            $yearFrac *= 365 / 366;
+        }
+
+        $f0Rate = $yearFrac * $rate * $cost;
+        $nNumOfFullPeriods = intval(($cost - $salvage - $f0Rate) / $fOneRate);
+
+        if ($period == 0) {
+            return $f0Rate;
+        } elseif ($period <= $nNumOfFullPeriods) {
+            return $fOneRate;
+        } elseif ($period == ($nNumOfFullPeriods + 1)) {
+            return ($fCostDelta - $fOneRate * $nNumOfFullPeriods - $f0Rate);
+        } else {
+            return 0.0;
+        }
+    }
+
+
+    /**
+     * COUPDAYBS
+     *
+     * Returns the number of days from the beginning of the coupon period to the settlement date.
+     *
+     * Excel Function:
+     *        COUPDAYBS(settlement,maturity,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    frequency    the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function COUPDAYBS($settlement, $maturity, $frequency, $basis = 0)
+    {
+        $settlement = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity   = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $frequency  = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis      = (is_null($basis)) ? 0 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        $daysPerYear = self::daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement), $basis);
+        $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, false);
+
+        return PHPExcel_Calculation_DateTime::YEARFRAC($prev, $settlement, $basis) * $daysPerYear;
+    }
+
+
+    /**
+     * COUPDAYS
+     *
+     * Returns the number of days in the coupon period that contains the settlement date.
+     *
+     * Excel Function:
+     *        COUPDAYS(settlement,maturity,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    frequency    the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function COUPDAYS($settlement, $maturity, $frequency, $basis = 0)
+    {
+        $settlement = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity   = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $frequency  = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis      = (is_null($basis)) ? 0 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        switch ($basis) {
+            case 3:
+                // Actual/365
+                return 365 / $frequency;
+            case 1:
+                // Actual/actual
+                if ($frequency == 1) {
+                    $daysPerYear = self::daysPerYear(PHPExcel_Calculation_DateTime::YEAR($maturity), $basis);
+                    return ($daysPerYear / $frequency);
+                }
+                $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, false);
+                $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
+                return ($next - $prev);
+            default:
+                // US (NASD) 30/360, Actual/360 or European 30/360
+                return 360 / $frequency;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * COUPDAYSNC
+     *
+     * Returns the number of days from the settlement date to the next coupon date.
+     *
+     * Excel Function:
+     *        COUPDAYSNC(settlement,maturity,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    frequency    the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis = 0)
+    {
+        $settlement = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity   = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $frequency  = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis      = (is_null($basis)) ? 0 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        $daysPerYear = self::daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement), $basis);
+        $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
+
+        return PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $next, $basis) * $daysPerYear;
+    }
+
+
+    /**
+     * COUPNCD
+     *
+     * Returns the next coupon date after the settlement date.
+     *
+     * Excel Function:
+     *        COUPNCD(settlement,maturity,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    frequency    the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function COUPNCD($settlement, $maturity, $frequency, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $frequency    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis))    ? 0 :    (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
+    }
+
+
+    /**
+     * COUPNUM
+     *
+     * Returns the number of coupons payable between the settlement date and maturity date,
+     * rounded up to the nearest whole coupon.
+     *
+     * Excel Function:
+     *        COUPNUM(settlement,maturity,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    frequency    the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    integer
+     */
+    public static function COUPNUM($settlement, $maturity, $frequency, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $frequency    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis))    ? 0 :    (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        $settlement = self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
+        $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis) * 365;
+
+        switch ($frequency) {
+            case 1: // annual payments
+                return ceil($daysBetweenSettlementAndMaturity / 360);
+            case 2: // half-yearly
+                return ceil($daysBetweenSettlementAndMaturity / 180);
+            case 4: // quarterly
+                return ceil($daysBetweenSettlementAndMaturity / 90);
+            case 6: // bimonthly
+                return ceil($daysBetweenSettlementAndMaturity / 60);
+            case 12: // monthly
+                return ceil($daysBetweenSettlementAndMaturity / 30);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * COUPPCD
+     *
+     * Returns the previous coupon date before the settlement date.
+     *
+     * Excel Function:
+     *        COUPPCD(settlement,maturity,frequency[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    frequency    the number of coupon payments per year.
+     *                                    Valid frequency values are:
+     *                                        1    Annual
+     *                                        2    Semi-Annual
+     *                                        4    Quarterly
+     *                                    If working in Gnumeric Mode, the following frequency options are
+     *                                    also available
+     *                                        6    Bimonthly
+     *                                        12    Monthly
+     * @param    integer        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function COUPPCD($settlement, $maturity, $frequency, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $frequency    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis))    ? 0 :    (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, false);
+    }
+
+
+    /**
+     * CUMIPMT
+     *
+     * Returns the cumulative interest paid on a loan between the start and end periods.
+     *
+     * Excel Function:
+     *        CUMIPMT(rate,nper,pv,start,end[,type])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    $rate    The Interest rate
+     * @param    integer    $nper    The total number of payment periods
+     * @param    float    $pv        Present Value
+     * @param    integer    $start    The first period in the calculation.
+     *                            Payment periods are numbered beginning with 1.
+     * @param    integer    $end    The last period in the calculation.
+     * @param    integer    $type    A number 0 or 1 and indicates when payments are due:
+     *                                0 or omitted    At the end of the period.
+     *                                1                At the beginning of the period.
+     * @return    float
+     */
+    public static function CUMIPMT($rate, $nper, $pv, $start, $end, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $nper    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $start    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($start);
+        $end    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($end);
+        $type    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ($start < 1 || $start > $end) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Calculate
+        $interest = 0;
+        for ($per = $start; $per <= $end; ++$per) {
+            $interest += self::IPMT($rate, $per, $nper, $pv, 0, $type);
+        }
+
+        return $interest;
+    }
+
+
+    /**
+     * CUMPRINC
+     *
+     * Returns the cumulative principal paid on a loan between the start and end periods.
+     *
+     * Excel Function:
+     *        CUMPRINC(rate,nper,pv,start,end[,type])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    $rate    The Interest rate
+     * @param    integer    $nper    The total number of payment periods
+     * @param    float    $pv        Present Value
+     * @param    integer    $start    The first period in the calculation.
+     *                            Payment periods are numbered beginning with 1.
+     * @param    integer    $end    The last period in the calculation.
+     * @param    integer    $type    A number 0 or 1 and indicates when payments are due:
+     *                                0 or omitted    At the end of the period.
+     *                                1                At the beginning of the period.
+     * @return    float
+     */
+    public static function CUMPRINC($rate, $nper, $pv, $start, $end, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $nper    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $start    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($start);
+        $end    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($end);
+        $type    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ($start < 1 || $start > $end) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Calculate
+        $principal = 0;
+        for ($per = $start; $per <= $end; ++$per) {
+            $principal += self::PPMT($rate, $per, $nper, $pv, 0, $type);
+        }
+
+        return $principal;
+    }
+
+
+    /**
+     * DB
+     *
+     * Returns the depreciation of an asset for a specified period using the
+     * fixed-declining balance method.
+     * This form of depreciation is used if you want to get a higher depreciation value
+     * at the beginning of the depreciation (as opposed to linear depreciation). The
+     * depreciation value is reduced with every depreciation period by the depreciation
+     * already deducted from the initial cost.
+     *
+     * Excel Function:
+     *        DB(cost,salvage,life,period[,month])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    cost        Initial cost of the asset.
+     * @param    float    salvage        Value at the end of the depreciation.
+     *                                (Sometimes called the salvage value of the asset)
+     * @param    integer    life        Number of periods over which the asset is depreciated.
+     *                                (Sometimes called the useful life of the asset)
+     * @param    integer    period        The period for which you want to calculate the
+     *                                depreciation. Period must use the same units as life.
+     * @param    integer    month        Number of months in the first year. If month is omitted,
+     *                                it defaults to 12.
+     * @return    float
+     */
+    public static function DB($cost, $salvage, $life, $period, $month = 12)
+    {
+        $cost        = PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+        $salvage    = PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+        $life        = PHPExcel_Calculation_Functions::flattenSingleValue($life);
+        $period        = PHPExcel_Calculation_Functions::flattenSingleValue($period);
+        $month        = PHPExcel_Calculation_Functions::flattenSingleValue($month);
+
+        //    Validate
+        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
+            $cost    = (float) $cost;
+            $salvage = (float) $salvage;
+            $life    = (int) $life;
+            $period  = (int) $period;
+            $month   = (int) $month;
+            if ($cost == 0) {
+                return 0.0;
+            } elseif (($cost < 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($month < 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            //    Set Fixed Depreciation Rate
+            $fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
+            $fixedDepreciationRate = round($fixedDepreciationRate, 3);
+
+            //    Loop through each period calculating the depreciation
+            $previousDepreciation = 0;
+            for ($per = 1; $per <= $period; ++$per) {
+                if ($per == 1) {
+                    $depreciation = $cost * $fixedDepreciationRate * $month / 12;
+                } elseif ($per == ($life + 1)) {
+                    $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate * (12 - $month) / 12;
+                } else {
+                    $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate;
+                }
+                $previousDepreciation += $depreciation;
+            }
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                $depreciation = round($depreciation, 2);
+            }
+            return $depreciation;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * DDB
+     *
+     * Returns the depreciation of an asset for a specified period using the
+     * double-declining balance method or some other method you specify.
+     *
+     * Excel Function:
+     *        DDB(cost,salvage,life,period[,factor])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    cost        Initial cost of the asset.
+     * @param    float    salvage        Value at the end of the depreciation.
+     *                                (Sometimes called the salvage value of the asset)
+     * @param    integer    life        Number of periods over which the asset is depreciated.
+     *                                (Sometimes called the useful life of the asset)
+     * @param    integer    period        The period for which you want to calculate the
+     *                                depreciation. Period must use the same units as life.
+     * @param    float    factor        The rate at which the balance declines.
+     *                                If factor is omitted, it is assumed to be 2 (the
+     *                                double-declining balance method).
+     * @return    float
+     */
+    public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
+    {
+        $cost        = PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+        $salvage    = PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+        $life        = PHPExcel_Calculation_Functions::flattenSingleValue($life);
+        $period        = PHPExcel_Calculation_Functions::flattenSingleValue($period);
+        $factor        = PHPExcel_Calculation_Functions::flattenSingleValue($factor);
+
+        //    Validate
+        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($factor))) {
+            $cost    = (float) $cost;
+            $salvage = (float) $salvage;
+            $life    = (int) $life;
+            $period  = (int) $period;
+            $factor  = (float) $factor;
+            if (($cost <= 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($factor <= 0.0) || ($period > $life)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            //    Set Fixed Depreciation Rate
+            $fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
+            $fixedDepreciationRate = round($fixedDepreciationRate, 3);
+
+            //    Loop through each period calculating the depreciation
+            $previousDepreciation = 0;
+            for ($per = 1; $per <= $period; ++$per) {
+                $depreciation = min(($cost - $previousDepreciation) * ($factor / $life), ($cost - $salvage - $previousDepreciation));
+                $previousDepreciation += $depreciation;
+            }
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                $depreciation = round($depreciation, 2);
+            }
+            return $depreciation;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * DISC
+     *
+     * Returns the discount rate for a security.
+     *
+     * Excel Function:
+     *        DISC(settlement,maturity,price,redemption[,basis])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue
+     *                                date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    integer    price        The security's price per $100 face value.
+     * @param    integer    redemption    The security's redemption value per $100 face value.
+     * @param    integer    basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function DISC($settlement, $maturity, $price, $redemption, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $price        = PHPExcel_Calculation_Functions::flattenSingleValue($price);
+        $redemption    = PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+        $basis        = PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
+            $price        = (float) $price;
+            $redemption    = (float) $redemption;
+            $basis        = (int) $basis;
+            if (($price <= 0) || ($redemption <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+
+            return ((1 - $price / $redemption) / $daysBetweenSettlementAndMaturity);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * DOLLARDE
+     *
+     * Converts a dollar price expressed as an integer part and a fraction
+     *        part into a dollar price expressed as a decimal number.
+     * Fractional dollar numbers are sometimes used for security prices.
+     *
+     * Excel Function:
+     *        DOLLARDE(fractional_dollar,fraction)
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    $fractional_dollar    Fractional Dollar
+     * @param    integer    $fraction            Fraction
+     * @return    float
+     */
+    public static function DOLLARDE($fractional_dollar = null, $fraction = 0)
+    {
+        $fractional_dollar    = PHPExcel_Calculation_Functions::flattenSingleValue($fractional_dollar);
+        $fraction            = (int)PHPExcel_Calculation_Functions::flattenSingleValue($fraction);
+
+        // Validate parameters
+        if (is_null($fractional_dollar) || $fraction < 0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ($fraction == 0) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $dollars = floor($fractional_dollar);
+        $cents = fmod($fractional_dollar, 1);
+        $cents /= $fraction;
+        $cents *= pow(10, ceil(log10($fraction)));
+        return $dollars + $cents;
+    }
+
+
+    /**
+     * DOLLARFR
+     *
+     * Converts a dollar price expressed as a decimal number into a dollar price
+     *        expressed as a fraction.
+     * Fractional dollar numbers are sometimes used for security prices.
+     *
+     * Excel Function:
+     *        DOLLARFR(decimal_dollar,fraction)
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    $decimal_dollar        Decimal Dollar
+     * @param    integer    $fraction            Fraction
+     * @return    float
+     */
+    public static function DOLLARFR($decimal_dollar = null, $fraction = 0)
+    {
+        $decimal_dollar    = PHPExcel_Calculation_Functions::flattenSingleValue($decimal_dollar);
+        $fraction        = (int)PHPExcel_Calculation_Functions::flattenSingleValue($fraction);
+
+        // Validate parameters
+        if (is_null($decimal_dollar) || $fraction < 0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ($fraction == 0) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $dollars = floor($decimal_dollar);
+        $cents = fmod($decimal_dollar, 1);
+        $cents *= $fraction;
+        $cents *= pow(10, -ceil(log10($fraction)));
+        return $dollars + $cents;
+    }
+
+
+    /**
+     * EFFECT
+     *
+     * Returns the effective interest rate given the nominal rate and the number of
+     *        compounding payments per year.
+     *
+     * Excel Function:
+     *        EFFECT(nominal_rate,npery)
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    $nominal_rate        Nominal interest rate
+     * @param    integer    $npery                Number of compounding payments per year
+     * @return    float
+     */
+    public static function EFFECT($nominal_rate = 0, $npery = 0)
+    {
+        $nominal_rate    = PHPExcel_Calculation_Functions::flattenSingleValue($nominal_rate);
+        $npery            = (int)PHPExcel_Calculation_Functions::flattenSingleValue($npery);
+
+        // Validate parameters
+        if ($nominal_rate <= 0 || $npery < 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        return pow((1 + $nominal_rate / $npery), $npery) - 1;
+    }
+
+
+    /**
+     * FV
+     *
+     * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
+     *
+     * Excel Function:
+     *        FV(rate,nper,pmt[,pv[,type]])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    $rate    The interest rate per period
+     * @param    int        $nper    Total number of payment periods in an annuity
+     * @param    float    $pmt    The payment made each period: it cannot change over the
+     *                            life of the annuity. Typically, pmt contains principal
+     *                            and interest but no other fees or taxes.
+     * @param    float    $pv        Present Value, or the lump-sum amount that a series of
+     *                            future payments is worth right now.
+     * @param    integer    $type    A number 0 or 1 and indicates when payments are due:
+     *                                0 or omitted    At the end of the period.
+     *                                1                At the beginning of the period.
+     * @return    float
+     */
+    public static function FV($rate = 0, $nper = 0, $pmt = 0, $pv = 0, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $nper    = PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pmt    = PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $type    = PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Calculate
+        if (!is_null($rate) && $rate != 0) {
+            return -$pv * pow(1 + $rate, $nper) - $pmt * (1 + $rate * $type) * (pow(1 + $rate, $nper) - 1) / $rate;
+        }
+        return -$pv - $pmt * $nper;
+    }
+
+
+    /**
+     * FVSCHEDULE
+     *
+     * Returns the future value of an initial principal after applying a series of compound interest rates.
+     * Use FVSCHEDULE to calculate the future value of an investment with a variable or adjustable rate.
+     *
+     * Excel Function:
+     *        FVSCHEDULE(principal,schedule)
+     *
+     * @param    float    $principal    The present value.
+     * @param    float[]    $schedule    An array of interest rates to apply.
+     * @return    float
+     */
+    public static function FVSCHEDULE($principal, $schedule)
+    {
+        $principal    = PHPExcel_Calculation_Functions::flattenSingleValue($principal);
+        $schedule    = PHPExcel_Calculation_Functions::flattenArray($schedule);
+
+        foreach ($schedule as $rate) {
+            $principal *= 1 + $rate;
+        }
+
+        return $principal;
+    }
+
+
+    /**
+     * INTRATE
+     *
+     * Returns the interest rate for a fully invested security.
+     *
+     * Excel Function:
+     *        INTRATE(settlement,maturity,investment,redemption[,basis])
+     *
+     * @param    mixed    $settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue date when the security is traded to the buyer.
+     * @param    mixed    $maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    integer    $investment    The amount invested in the security.
+     * @param    integer    $redemption    The amount to be received at maturity.
+     * @param    integer    $basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $investment    = PHPExcel_Calculation_Functions::flattenSingleValue($investment);
+        $redemption    = PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+        $basis        = PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
+            $investment    = (float) $investment;
+            $redemption    = (float) $redemption;
+            $basis        = (int) $basis;
+            if (($investment <= 0) || ($redemption <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+
+            return (($redemption / $investment) - 1) / ($daysBetweenSettlementAndMaturity);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * IPMT
+     *
+     * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
+     *
+     * Excel Function:
+     *        IPMT(rate,per,nper,pv[,fv][,type])
+     *
+     * @param    float    $rate    Interest rate per period
+     * @param    int        $per    Period for which we want to find the interest
+     * @param    int        $nper    Number of periods
+     * @param    float    $pv        Present Value
+     * @param    float    $fv        Future Value
+     * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     * @return    float
+     */
+    public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $per    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($per);
+        $nper    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $fv        = PHPExcel_Calculation_Functions::flattenSingleValue($fv);
+        $type    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ($per <= 0 || $per > $nper) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Calculate
+        $interestAndPrincipal = self::interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
+        return $interestAndPrincipal[0];
+    }
+
+    /**
+     * IRR
+     *
+     * Returns the internal rate of return for a series of cash flows represented by the numbers in values.
+     * These cash flows do not have to be even, as they would be for an annuity. However, the cash flows must occur
+     * at regular intervals, such as monthly or annually. The internal rate of return is the interest rate received
+     * for an investment consisting of payments (negative values) and income (positive values) that occur at regular
+     * periods.
+     *
+     * Excel Function:
+     *        IRR(values[,guess])
+     *
+     * @param    float[]    $values        An array or a reference to cells that contain numbers for which you want
+     *                                    to calculate the internal rate of return.
+     *                                Values must contain at least one positive value and one negative value to
+     *                                    calculate the internal rate of return.
+     * @param    float    $guess        A number that you guess is close to the result of IRR
+     * @return    float
+     */
+    public static function IRR($values, $guess = 0.1)
+    {
+        if (!is_array($values)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $values = PHPExcel_Calculation_Functions::flattenArray($values);
+        $guess = PHPExcel_Calculation_Functions::flattenSingleValue($guess);
+
+        // create an initial range, with a root somewhere between 0 and guess
+        $x1 = 0.0;
+        $x2 = $guess;
+        $f1 = self::NPV($x1, $values);
+        $f2 = self::NPV($x2, $values);
+        for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
+            if (($f1 * $f2) < 0.0) {
+                break;
+            }
+            if (abs($f1) < abs($f2)) {
+                $f1 = self::NPV($x1 += 1.6 * ($x1 - $x2), $values);
+            } else {
+                $f2 = self::NPV($x2 += 1.6 * ($x2 - $x1), $values);
+            }
+        }
+        if (($f1 * $f2) > 0.0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        $f = self::NPV($x1, $values);
+        if ($f < 0.0) {
+            $rtb = $x1;
+            $dx = $x2 - $x1;
+        } else {
+            $rtb = $x2;
+            $dx = $x1 - $x2;
+        }
+
+        for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $dx *= 0.5;
+            $x_mid = $rtb + $dx;
+            $f_mid = self::NPV($x_mid, $values);
+            if ($f_mid <= 0.0) {
+                $rtb = $x_mid;
+            }
+            if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) < FINANCIAL_PRECISION)) {
+                return $x_mid;
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * ISPMT
+     *
+     * Returns the interest payment for an investment based on an interest rate and a constant payment schedule.
+     *
+     * Excel Function:
+     *     =ISPMT(interest_rate, period, number_payments, PV)
+     *
+     * interest_rate is the interest rate for the investment
+     *
+     * period is the period to calculate the interest rate.  It must be betweeen 1 and number_payments.
+     *
+     * number_payments is the number of payments for the annuity
+     *
+     * PV is the loan amount or present value of the payments
+     */
+    public static function ISPMT()
+    {
+        // Return value
+        $returnValue = 0;
+
+        // Get the parameters
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $interestRate = array_shift($aArgs);
+        $period = array_shift($aArgs);
+        $numberPeriods = array_shift($aArgs);
+        $principleRemaining = array_shift($aArgs);
+
+        // Calculate
+        $principlePayment = ($principleRemaining * 1.0) / ($numberPeriods * 1.0);
+        for ($i=0; $i <= $period; ++$i) {
+            $returnValue = $interestRate * $principleRemaining * -1;
+            $principleRemaining -= $principlePayment;
+            // principle needs to be 0 after the last payment, don't let floating point screw it up
+            if ($i == $numberPeriods) {
+                $returnValue = 0;
+            }
+        }
+        return($returnValue);
+    }
+
+
+    /**
+     * MIRR
+     *
+     * Returns the modified internal rate of return for a series of periodic cash flows. MIRR considers both
+     *        the cost of the investment and the interest received on reinvestment of cash.
+     *
+     * Excel Function:
+     *        MIRR(values,finance_rate, reinvestment_rate)
+     *
+     * @param    float[]    $values                An array or a reference to cells that contain a series of payments and
+     *                                            income occurring at regular intervals.
+     *                                        Payments are negative value, income is positive values.
+     * @param    float    $finance_rate        The interest rate you pay on the money used in the cash flows
+     * @param    float    $reinvestment_rate    The interest rate you receive on the cash flows as you reinvest them
+     * @return    float
+     */
+    public static function MIRR($values, $finance_rate, $reinvestment_rate)
+    {
+        if (!is_array($values)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $values                = PHPExcel_Calculation_Functions::flattenArray($values);
+        $finance_rate        = PHPExcel_Calculation_Functions::flattenSingleValue($finance_rate);
+        $reinvestment_rate    = PHPExcel_Calculation_Functions::flattenSingleValue($reinvestment_rate);
+        $n = count($values);
+
+        $rr = 1.0 + $reinvestment_rate;
+        $fr = 1.0 + $finance_rate;
+
+        $npv_pos = $npv_neg = 0.0;
+        foreach ($values as $i => $v) {
+            if ($v >= 0) {
+                $npv_pos += $v / pow($rr, $i);
+            } else {
+                $npv_neg += $v / pow($fr, $i);
+            }
+        }
+
+        if (($npv_neg == 0) || ($npv_pos == 0) || ($reinvestment_rate <= -1)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        $mirr = pow((-$npv_pos * pow($rr, $n))
+                / ($npv_neg * ($rr)), (1.0 / ($n - 1))) - 1.0;
+
+        return (is_finite($mirr) ? $mirr : PHPExcel_Calculation_Functions::VALUE());
+    }
+
+
+    /**
+     * NOMINAL
+     *
+     * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
+     *
+     * @param    float    $effect_rate    Effective interest rate
+     * @param    int        $npery            Number of compounding payments per year
+     * @return    float
+     */
+    public static function NOMINAL($effect_rate = 0, $npery = 0)
+    {
+        $effect_rate    = PHPExcel_Calculation_Functions::flattenSingleValue($effect_rate);
+        $npery            = (int)PHPExcel_Calculation_Functions::flattenSingleValue($npery);
+
+        // Validate parameters
+        if ($effect_rate <= 0 || $npery < 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Calculate
+        return $npery * (pow($effect_rate + 1, 1 / $npery) - 1);
+    }
+
+
+    /**
+     * NPER
+     *
+     * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
+     *
+     * @param    float    $rate    Interest rate per period
+     * @param    int        $pmt    Periodic payment (annuity)
+     * @param    float    $pv        Present Value
+     * @param    float    $fv        Future Value
+     * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     * @return    float
+     */
+    public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $pmt    = PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $fv        = PHPExcel_Calculation_Functions::flattenSingleValue($fv);
+        $type    = PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Calculate
+        if (!is_null($rate) && $rate != 0) {
+            if ($pmt == 0 && $pv == 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return log(($pmt * (1 + $rate * $type) / $rate - $fv) / ($pv + $pmt * (1 + $rate * $type) / $rate)) / log(1 + $rate);
+        }
+        if ($pmt == 0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return (-$pv -$fv) / $pmt;
+    }
+
+    /**
+     * NPV
+     *
+     * Returns the Net Present Value of a cash flow series given a discount rate.
+     *
+     * @return    float
+     */
+    public static function NPV()
+    {
+        // Return value
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $rate = array_shift($aArgs);
+        for ($i = 1; $i <= count($aArgs); ++$i) {
+            // Is it a numeric value?
+            if (is_numeric($aArgs[$i - 1])) {
+                $returnValue += $aArgs[$i - 1] / pow(1 + $rate, $i);
+            }
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+    /**
+     * PMT
+     *
+     * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
+     *
+     * @param    float    $rate    Interest rate per period
+     * @param    int        $nper    Number of periods
+     * @param    float    $pv        Present Value
+     * @param    float    $fv        Future Value
+     * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     * @return    float
+     */
+    public static function PMT($rate = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $nper    = PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $fv        = PHPExcel_Calculation_Functions::flattenSingleValue($fv);
+        $type    = PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Calculate
+        if (!is_null($rate) && $rate != 0) {
+            return (-$fv - $pv * pow(1 + $rate, $nper)) / (1 + $rate * $type) / ((pow(1 + $rate, $nper) - 1) / $rate);
+        }
+        return (-$pv - $fv) / $nper;
+    }
+
+
+    /**
+     * PPMT
+     *
+     * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
+     *
+     * @param    float    $rate    Interest rate per period
+     * @param    int        $per    Period for which we want to find the interest
+     * @param    int        $nper    Number of periods
+     * @param    float    $pv        Present Value
+     * @param    float    $fv        Future Value
+     * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     * @return    float
+     */
+    public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $per    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($per);
+        $nper    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $fv        = PHPExcel_Calculation_Functions::flattenSingleValue($fv);
+        $type    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ($per <= 0 || $per > $nper) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // Calculate
+        $interestAndPrincipal = self::interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
+        return $interestAndPrincipal[1];
+    }
+
+
+    public static function PRICE($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $rate        = (float) PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $yield        = (float) PHPExcel_Calculation_Functions::flattenSingleValue($yield);
+        $redemption    = (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+        $frequency    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis))    ? 0 :    (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        if (is_string($settlement = PHPExcel_Calculation_DateTime::getDateValue($settlement))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (($settlement > $maturity) ||
+            (!self::isValidFrequency($frequency)) ||
+            (($basis < 0) || ($basis > 4))) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        $dsc = self::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
+        $e = self::COUPDAYS($settlement, $maturity, $frequency, $basis);
+        $n = self::COUPNUM($settlement, $maturity, $frequency, $basis);
+        $a = self::COUPDAYBS($settlement, $maturity, $frequency, $basis);
+
+        $baseYF    = 1.0 + ($yield / $frequency);
+        $rfp    = 100 * ($rate / $frequency);
+        $de    = $dsc / $e;
+
+        $result = $redemption / pow($baseYF, (--$n + $de));
+        for ($k = 0; $k <= $n; ++$k) {
+            $result += $rfp / (pow($baseYF, ($k + $de)));
+        }
+        $result -= $rfp * ($a / $e);
+
+        return $result;
+    }
+
+
+    /**
+     * PRICEDISC
+     *
+     * Returns the price per $100 face value of a discounted security.
+     *
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    int        discount    The security's discount rate.
+     * @param    int        redemption    The security's redemption value per $100 face value.
+     * @param    int        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function PRICEDISC($settlement, $maturity, $discount, $redemption, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $discount    = (float) PHPExcel_Calculation_Functions::flattenSingleValue($discount);
+        $redemption    = (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+        $basis        = (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if ((is_numeric($discount)) && (is_numeric($redemption)) && (is_numeric($basis))) {
+            if (($discount <= 0) || ($redemption <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+
+            return $redemption * (1 - $discount * $daysBetweenSettlementAndMaturity);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * PRICEMAT
+     *
+     * Returns the price per $100 face value of a security that pays interest at maturity.
+     *
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security's settlement date is the date after the issue date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    mixed    issue        The security's issue date.
+     * @param    int        rate        The security's interest rate at date of issue.
+     * @param    int        yield        The security's annual yield.
+     * @param    int        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $issue        = PHPExcel_Calculation_Functions::flattenSingleValue($issue);
+        $rate        = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $yield        = PHPExcel_Calculation_Functions::flattenSingleValue($yield);
+        $basis        = (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if (is_numeric($rate) && is_numeric($yield)) {
+            if (($rate <= 0) || ($yield <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysPerYear = self::daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement), $basis);
+            if (!is_numeric($daysPerYear)) {
+                return $daysPerYear;
+            }
+            $daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
+            if (!is_numeric($daysBetweenIssueAndSettlement)) {
+                //    return date error
+                return $daysBetweenIssueAndSettlement;
+            }
+            $daysBetweenIssueAndSettlement *= $daysPerYear;
+            $daysBetweenIssueAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $maturity, $basis);
+            if (!is_numeric($daysBetweenIssueAndMaturity)) {
+                //    return date error
+                return $daysBetweenIssueAndMaturity;
+            }
+            $daysBetweenIssueAndMaturity *= $daysPerYear;
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+            $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+            return ((100 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate * 100)) /
+                   (1 + (($daysBetweenSettlementAndMaturity / $daysPerYear) * $yield)) -
+                   (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate * 100));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * PV
+     *
+     * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
+     *
+     * @param    float    $rate    Interest rate per period
+     * @param    int        $nper    Number of periods
+     * @param    float    $pmt    Periodic payment (annuity)
+     * @param    float    $fv        Future Value
+     * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     * @return    float
+     */
+    public static function PV($rate = 0, $nper = 0, $pmt = 0, $fv = 0, $type = 0)
+    {
+        $rate    = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $nper    = PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pmt    = PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
+        $fv        = PHPExcel_Calculation_Functions::flattenSingleValue($fv);
+        $type    = PHPExcel_Calculation_Functions::flattenSingleValue($type);
+
+        // Validate parameters
+        if ($type != 0 && $type != 1) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // Calculate
+        if (!is_null($rate) && $rate != 0) {
+            return (-$pmt * (1 + $rate * $type) * ((pow(1 + $rate, $nper) - 1) / $rate) - $fv) / pow(1 + $rate, $nper);
+        }
+        return -$fv - $pmt * $nper;
+    }
+
+
+    /**
+     * RATE
+     *
+     * Returns the interest rate per period of an annuity.
+     * RATE is calculated by iteration and can have zero or more solutions.
+     * If the successive results of RATE do not converge to within 0.0000001 after 20 iterations,
+     * RATE returns the #NUM! error value.
+     *
+     * Excel Function:
+     *        RATE(nper,pmt,pv[,fv[,type[,guess]]])
+     *
+     * @access    public
+     * @category Financial Functions
+     * @param    float    nper        The total number of payment periods in an annuity.
+     * @param    float    pmt            The payment made each period and cannot change over the life
+     *                                    of the annuity.
+     *                                Typically, pmt includes principal and interest but no other
+     *                                    fees or taxes.
+     * @param    float    pv            The present value - the total amount that a series of future
+     *                                    payments is worth now.
+     * @param    float    fv            The future value, or a cash balance you want to attain after
+     *                                    the last payment is made. If fv is omitted, it is assumed
+     *                                    to be 0 (the future value of a loan, for example, is 0).
+     * @param    integer    type        A number 0 or 1 and indicates when payments are due:
+     *                                        0 or omitted    At the end of the period.
+     *                                        1                At the beginning of the period.
+     * @param    float    guess        Your guess for what the rate will be.
+     *                                    If you omit guess, it is assumed to be 10 percent.
+     * @return    float
+     **/
+    public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1)
+    {
+        $nper    = (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
+        $pmt    = PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
+        $pv        = PHPExcel_Calculation_Functions::flattenSingleValue($pv);
+        $fv        = (is_null($fv))    ? 0.0    :    PHPExcel_Calculation_Functions::flattenSingleValue($fv);
+        $type    = (is_null($type))    ? 0        :    (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
+        $guess    = (is_null($guess))    ? 0.1    :    PHPExcel_Calculation_Functions::flattenSingleValue($guess);
+
+        $rate = $guess;
+        if (abs($rate) < FINANCIAL_PRECISION) {
+            $y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
+        } else {
+            $f = exp($nper * log(1 + $rate));
+            $y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
+        }
+        $y0 = $pv + $pmt * $nper + $fv;
+        $y1 = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
+
+        // find root by secant method
+        $i  = $x0 = 0.0;
+        $x1 = $rate;
+        while ((abs($y0 - $y1) > FINANCIAL_PRECISION) && ($i < FINANCIAL_MAX_ITERATIONS)) {
+            $rate = ($y1 * $x0 - $y0 * $x1) / ($y1 - $y0);
+            $x0 = $x1;
+            $x1 = $rate;
+            if (($nper * abs($pmt)) > ($pv - $fv)) {
+                $x1 = abs($x1);
+            }
+            if (abs($rate) < FINANCIAL_PRECISION) {
+                $y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
+            } else {
+                $f = exp($nper * log(1 + $rate));
+                $y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
+            }
+
+            $y0 = $y1;
+            $y1 = $y;
+            ++$i;
+        }
+        return $rate;
+    }
+
+
+    /**
+     * RECEIVED
+     *
+     * Returns the price per $100 face value of a discounted security.
+     *
+     * @param    mixed    settlement    The security's settlement date.
+     *                                The security settlement date is the date after the issue date when the security is traded to the buyer.
+     * @param    mixed    maturity    The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param    int        investment    The amount invested in the security.
+     * @param    int        discount    The security's discount rate.
+     * @param    int        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function RECEIVED($settlement, $maturity, $investment, $discount, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $investment    = (float) PHPExcel_Calculation_Functions::flattenSingleValue($investment);
+        $discount    = (float) PHPExcel_Calculation_Functions::flattenSingleValue($discount);
+        $basis        = (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if ((is_numeric($investment)) && (is_numeric($discount)) && (is_numeric($basis))) {
+            if (($investment <= 0) || ($discount <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+
+            return $investment / ( 1 - ($discount * $daysBetweenSettlementAndMaturity));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SLN
+     *
+     * Returns the straight-line depreciation of an asset for one period
+     *
+     * @param    cost        Initial cost of the asset
+     * @param    salvage        Value at the end of the depreciation
+     * @param    life        Number of periods over which the asset is depreciated
+     * @return    float
+     */
+    public static function SLN($cost, $salvage, $life)
+    {
+        $cost        = PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+        $salvage    = PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+        $life        = PHPExcel_Calculation_Functions::flattenSingleValue($life);
+
+        // Calculate
+        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life))) {
+            if ($life < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return ($cost - $salvage) / $life;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SYD
+     *
+     * Returns the sum-of-years' digits depreciation of an asset for a specified period.
+     *
+     * @param    cost        Initial cost of the asset
+     * @param    salvage        Value at the end of the depreciation
+     * @param    life        Number of periods over which the asset is depreciated
+     * @param    period        Period
+     * @return    float
+     */
+    public static function SYD($cost, $salvage, $life, $period)
+    {
+        $cost        = PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+        $salvage    = PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+        $life        = PHPExcel_Calculation_Functions::flattenSingleValue($life);
+        $period        = PHPExcel_Calculation_Functions::flattenSingleValue($period);
+
+        // Calculate
+        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period))) {
+            if (($life < 1) || ($period > $life)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * TBILLEQ
+     *
+     * Returns the bond-equivalent yield for a Treasury bill.
+     *
+     * @param    mixed    settlement    The Treasury bill's settlement date.
+     *                                The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
+     * @param    mixed    maturity    The Treasury bill's maturity date.
+     *                                The maturity date is the date when the Treasury bill expires.
+     * @param    int        discount    The Treasury bill's discount rate.
+     * @return    float
+     */
+    public static function TBILLEQ($settlement, $maturity, $discount)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $discount    = PHPExcel_Calculation_Functions::flattenSingleValue($discount);
+
+        //    Use TBILLPRICE for validation
+        $testValue = self::TBILLPRICE($settlement, $maturity, $discount);
+        if (is_string($testValue)) {
+            return $testValue;
+        }
+
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+            ++$maturity;
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
+        } else {
+            $daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::getDateValue($maturity) - PHPExcel_Calculation_DateTime::getDateValue($settlement));
+        }
+
+        return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
+    }
+
+
+    /**
+     * TBILLPRICE
+     *
+     * Returns the yield for a Treasury bill.
+     *
+     * @param    mixed    settlement    The Treasury bill's settlement date.
+     *                                The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
+     * @param    mixed    maturity    The Treasury bill's maturity date.
+     *                                The maturity date is the date when the Treasury bill expires.
+     * @param    int        discount    The Treasury bill's discount rate.
+     * @return    float
+     */
+    public static function TBILLPRICE($settlement, $maturity, $discount)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $discount    = PHPExcel_Calculation_Functions::flattenSingleValue($discount);
+
+        if (is_string($maturity = PHPExcel_Calculation_DateTime::getDateValue($maturity))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        //    Validate
+        if (is_numeric($discount)) {
+            if ($discount <= 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                ++$maturity;
+                $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
+                if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                    //    return date error
+                    return $daysBetweenSettlementAndMaturity;
+                }
+            } else {
+                $daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::getDateValue($maturity) - PHPExcel_Calculation_DateTime::getDateValue($settlement));
+            }
+
+            if ($daysBetweenSettlementAndMaturity > 360) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            $price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
+            if ($price <= 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return $price;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * TBILLYIELD
+     *
+     * Returns the yield for a Treasury bill.
+     *
+     * @param    mixed    settlement    The Treasury bill's settlement date.
+     *                                The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
+     * @param    mixed    maturity    The Treasury bill's maturity date.
+     *                                The maturity date is the date when the Treasury bill expires.
+     * @param    int        price        The Treasury bill's price per $100 face value.
+     * @return    float
+     */
+    public static function TBILLYIELD($settlement, $maturity, $price)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $price        = PHPExcel_Calculation_Functions::flattenSingleValue($price);
+
+        //    Validate
+        if (is_numeric($price)) {
+            if ($price <= 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                ++$maturity;
+                $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
+                if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                    //    return date error
+                    return $daysBetweenSettlementAndMaturity;
+                }
+            } else {
+                $daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::getDateValue($maturity) - PHPExcel_Calculation_DateTime::getDateValue($settlement));
+            }
+
+            if ($daysBetweenSettlementAndMaturity > 360) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    public static function XIRR($values, $dates, $guess = 0.1)
+    {
+        if ((!is_array($values)) && (!is_array($dates))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $values = PHPExcel_Calculation_Functions::flattenArray($values);
+        $dates  = PHPExcel_Calculation_Functions::flattenArray($dates);
+        $guess  = PHPExcel_Calculation_Functions::flattenSingleValue($guess);
+        if (count($values) != count($dates)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        // create an initial range, with a root somewhere between 0 and guess
+        $x1 = 0.0;
+        $x2 = $guess;
+        $f1 = self::XNPV($x1, $values, $dates);
+        $f2 = self::XNPV($x2, $values, $dates);
+        for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
+            if (($f1 * $f2) < 0.0) {
+                break;
+            } elseif (abs($f1) < abs($f2)) {
+                $f1 = self::XNPV($x1 += 1.6 * ($x1 - $x2), $values, $dates);
+            } else {
+                $f2 = self::XNPV($x2 += 1.6 * ($x2 - $x1), $values, $dates);
+            }
+        }
+        if (($f1 * $f2) > 0.0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        $f = self::XNPV($x1, $values, $dates);
+        if ($f < 0.0) {
+            $rtb = $x1;
+            $dx = $x2 - $x1;
+        } else {
+            $rtb = $x2;
+            $dx = $x1 - $x2;
+        }
+
+        for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $dx *= 0.5;
+            $x_mid = $rtb + $dx;
+            $f_mid = self::XNPV($x_mid, $values, $dates);
+            if ($f_mid <= 0.0) {
+                $rtb = $x_mid;
+            }
+            if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) < FINANCIAL_PRECISION)) {
+                return $x_mid;
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * XNPV
+     *
+     * Returns the net present value for a schedule of cash flows that is not necessarily periodic.
+     * To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
+     *
+     * Excel Function:
+     *        =XNPV(rate,values,dates)
+     *
+     * @param    float            $rate        The discount rate to apply to the cash flows.
+     * @param    array of float    $values     A series of cash flows that corresponds to a schedule of payments in dates.
+     *                                         The first payment is optional and corresponds to a cost or payment that occurs at the beginning of the investment.
+     *                                         If the first value is a cost or payment, it must be a negative value. All succeeding payments are discounted based on a 365-day year.
+     *                                         The series of values must contain at least one positive value and one negative value.
+     * @param    array of mixed    $dates      A schedule of payment dates that corresponds to the cash flow payments.
+     *                                         The first payment date indicates the beginning of the schedule of payments.
+     *                                         All other dates must be later than this date, but they may occur in any order.
+     * @return    float
+     */
+    public static function XNPV($rate, $values, $dates)
+    {
+        $rate = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        if (!is_numeric($rate)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if ((!is_array($values)) || (!is_array($dates))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $values    = PHPExcel_Calculation_Functions::flattenArray($values);
+        $dates    = PHPExcel_Calculation_Functions::flattenArray($dates);
+        $valCount = count($values);
+        if ($valCount != count($dates)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        if ((min($values) > 0) || (max($values) < 0)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        $xnpv = 0.0;
+        for ($i = 0; $i < $valCount; ++$i) {
+            if (!is_numeric($values[$i])) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            $xnpv += $values[$i] / pow(1 + $rate, PHPExcel_Calculation_DateTime::DATEDIF($dates[0], $dates[$i], 'd') / 365);
+        }
+        return (is_finite($xnpv)) ? $xnpv : PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * YIELDDISC
+     *
+     * Returns the annual yield of a security that pays interest at maturity.
+     *
+     * @param    mixed    settlement      The security's settlement date.
+     *                                    The security's settlement date is the date after the issue date when the security is traded to the buyer.
+     * @param    mixed    maturity        The security's maturity date.
+     *                                    The maturity date is the date when the security expires.
+     * @param    int        price         The security's price per $100 face value.
+     * @param    int        redemption    The security's redemption value per $100 face value.
+     * @param    int        basis         The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $price        = PHPExcel_Calculation_Functions::flattenSingleValue($price);
+        $redemption    = PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+        $basis        = (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if (is_numeric($price) && is_numeric($redemption)) {
+            if (($price <= 0) || ($redemption <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysPerYear = self::daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement), $basis);
+            if (!is_numeric($daysPerYear)) {
+                return $daysPerYear;
+            }
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+            $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+            return (($redemption - $price) / $price) * ($daysPerYear / $daysBetweenSettlementAndMaturity);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * YIELDMAT
+     *
+     * Returns the annual yield of a security that pays interest at maturity.
+     *
+     * @param    mixed    settlement     The security's settlement date.
+     *                                   The security's settlement date is the date after the issue date when the security is traded to the buyer.
+     * @param    mixed    maturity       The security's maturity date.
+     *                                   The maturity date is the date when the security expires.
+     * @param    mixed    issue          The security's issue date.
+     * @param    int        rate         The security's interest rate at date of issue.
+     * @param    int        price        The security's price per $100 face value.
+     * @param    int        basis        The type of day count to use.
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     * @return    float
+     */
+    public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis = 0)
+    {
+        $settlement    = PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
+        $maturity    = PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
+        $issue        = PHPExcel_Calculation_Functions::flattenSingleValue($issue);
+        $rate        = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+        $price        = PHPExcel_Calculation_Functions::flattenSingleValue($price);
+        $basis        = (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+
+        //    Validate
+        if (is_numeric($rate) && is_numeric($price)) {
+            if (($rate <= 0) || ($price <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $daysPerYear = self::daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement), $basis);
+            if (!is_numeric($daysPerYear)) {
+                return $daysPerYear;
+            }
+            $daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
+            if (!is_numeric($daysBetweenIssueAndSettlement)) {
+                //    return date error
+                return $daysBetweenIssueAndSettlement;
+            }
+            $daysBetweenIssueAndSettlement *= $daysPerYear;
+            $daysBetweenIssueAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $maturity, $basis);
+            if (!is_numeric($daysBetweenIssueAndMaturity)) {
+                //    return date error
+                return $daysBetweenIssueAndMaturity;
+            }
+            $daysBetweenIssueAndMaturity *= $daysPerYear;
+            $daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
+            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+                //    return date error
+                return $daysBetweenSettlementAndMaturity;
+            }
+            $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+            return ((1 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate) - (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) /
+                   (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) *
+                   ($daysPerYear / $daysBetweenSettlementAndMaturity);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+}
diff --git a/lib/PHPExcel/Calculation/FormulaParser.php b/lib/PHPExcel/Calculation/FormulaParser.php
new file mode 100644
index 000000000..03340e699
--- /dev/null
+++ b/lib/PHPExcel/Calculation/FormulaParser.php
@@ -0,0 +1,622 @@
+<?php
+
+/*
+PARTLY BASED ON:
+    Copyright (c) 2007 E. W. Bachtal, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+    and associated documentation files (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial
+      portions of the Software.
+
+    The software is provided "as is", without warranty of any kind, express or implied, including but not
+    limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+    no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+    whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+    software or the use or other dealings in the software.
+
+    http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+    http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+*/
+
+/**
+ * PHPExcel_Calculation_FormulaParser
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+class PHPExcel_Calculation_FormulaParser
+{
+    /* Character constants */
+    const QUOTE_DOUBLE  = '"';
+    const QUOTE_SINGLE  = '\'';
+    const BRACKET_CLOSE = ']';
+    const BRACKET_OPEN  = '[';
+    const BRACE_OPEN    = '{';
+    const BRACE_CLOSE   = '}';
+    const PAREN_OPEN    = '(';
+    const PAREN_CLOSE   = ')';
+    const SEMICOLON     = ';';
+    const WHITESPACE    = ' ';
+    const COMMA         = ',';
+    const ERROR_START   = '#';
+
+    const OPERATORS_SN             = "+-";
+    const OPERATORS_INFIX         = "+-*/^&=><";
+    const OPERATORS_POSTFIX     = "%";
+
+    /**
+     * Formula
+     *
+     * @var string
+     */
+    private $formula;
+
+    /**
+     * Tokens
+     *
+     * @var PHPExcel_Calculation_FormulaToken[]
+     */
+    private $tokens = array();
+
+    /**
+     * Create a new PHPExcel_Calculation_FormulaParser
+     *
+     * @param     string        $pFormula    Formula to parse
+     * @throws     PHPExcel_Calculation_Exception
+     */
+    public function __construct($pFormula = '')
+    {
+        // Check parameters
+        if (is_null($pFormula)) {
+            throw new PHPExcel_Calculation_Exception("Invalid parameter passed: formula");
+        }
+
+        // Initialise values
+        $this->formula = trim($pFormula);
+        // Parse!
+        $this->parseToTokens();
+    }
+
+    /**
+     * Get Formula
+     *
+     * @return string
+     */
+    public function getFormula()
+    {
+        return $this->formula;
+    }
+
+    /**
+     * Get Token
+     *
+     * @param     int        $pId    Token id
+     * @return    string
+     * @throws  PHPExcel_Calculation_Exception
+     */
+    public function getToken($pId = 0)
+    {
+        if (isset($this->tokens[$pId])) {
+            return $this->tokens[$pId];
+        } else {
+            throw new PHPExcel_Calculation_Exception("Token with id $pId does not exist.");
+        }
+    }
+
+    /**
+     * Get Token count
+     *
+     * @return string
+     */
+    public function getTokenCount()
+    {
+        return count($this->tokens);
+    }
+
+    /**
+     * Get Tokens
+     *
+     * @return PHPExcel_Calculation_FormulaToken[]
+     */
+    public function getTokens()
+    {
+        return $this->tokens;
+    }
+
+    /**
+     * Parse to tokens
+     */
+    private function parseToTokens()
+    {
+        // No attempt is made to verify formulas; assumes formulas are derived from Excel, where
+        // they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
+
+        // Check if the formula has a valid starting =
+        $formulaLength = strlen($this->formula);
+        if ($formulaLength < 2 || $this->formula[0] != '=') {
+            return;
+        }
+
+        // Helper variables
+        $tokens1    = $tokens2     = $stack = array();
+        $inString    = $inPath     = $inRange     = $inError = false;
+        $token        = $previousToken    = $nextToken    = null;
+
+        $index    = 1;
+        $value    = '';
+
+        $ERRORS             = array("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A");
+        $COMPARATORS_MULTI     = array(">=", "<=", "<>");
+
+        while ($index < $formulaLength) {
+            // state-dependent character evaluation (order is important)
+
+            // double-quoted strings
+            // embeds are doubled
+            // end marks token
+            if ($inString) {
+                if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
+                    if ((($index + 2) <= $formulaLength) && ($this->formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) {
+                        $value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE;
+                        ++$index;
+                    } else {
+                        $inString = false;
+                        $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_TEXT);
+                        $value = "";
+                    }
+                } else {
+                    $value .= $this->formula{$index};
+                }
+                ++$index;
+                continue;
+            }
+
+            // single-quoted strings (links)
+            // embeds are double
+            // end does not mark a token
+            if ($inPath) {
+                if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
+                    if ((($index + 2) <= $formulaLength) && ($this->formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) {
+                        $value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE;
+                        ++$index;
+                    } else {
+                        $inPath = false;
+                    }
+                } else {
+                    $value .= $this->formula{$index};
+                }
+                ++$index;
+                continue;
+            }
+
+            // bracked strings (R1C1 range index or linked workbook name)
+            // no embeds (changed to "()" by Excel)
+            // end does not mark a token
+            if ($inRange) {
+                if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) {
+                    $inRange = false;
+                }
+                $value .= $this->formula{$index};
+                ++$index;
+                continue;
+            }
+
+            // error values
+            // end marks a token, determined from absolute list of values
+            if ($inError) {
+                $value .= $this->formula{$index};
+                ++$index;
+                if (in_array($value, $ERRORS)) {
+                    $inError = false;
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_ERROR);
+                    $value = "";
+                }
+                continue;
+            }
+
+            // scientific notation check
+            if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->formula{$index}) !== false) {
+                if (strlen($value) > 1) {
+                    if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->formula{$index}) != 0) {
+                        $value .= $this->formula{$index};
+                        ++$index;
+                        continue;
+                    }
+                }
+            }
+
+            // independent character evaluation (order not important)
+
+            // establish state-dependent character evaluations
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
+                if (strlen($value > 0)) {
+                    // unexpected
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = "";
+                }
+                $inString = true;
+                ++$index;
+                continue;
+            }
+
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
+                if (strlen($value) > 0) {
+                    // unexpected
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = "";
+                }
+                $inPath = true;
+                ++$index;
+                continue;
+            }
+
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) {
+                $inRange = true;
+                $value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN;
+                ++$index;
+                continue;
+            }
+
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) {
+                if (strlen($value) > 0) {
+                    // unexpected
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = "";
+                }
+                $inError = true;
+                $value .= PHPExcel_Calculation_FormulaParser::ERROR_START;
+                ++$index;
+                continue;
+            }
+
+            // mark start and end of arrays and array rows
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) {
+                if (strlen($value) > 0) {
+                    // unexpected
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = "";
+                }
+
+                $tmp = new PHPExcel_Calculation_FormulaToken("ARRAY", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
+                $tokens1[] = $tmp;
+                $stack[] = clone $tmp;
+
+                $tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
+                $tokens1[] = $tmp;
+                $stack[] = clone $tmp;
+
+                ++$index;
+                continue;
+            }
+
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) {
+                if (strlen($value) > 0) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+
+                $tmp = array_pop($stack);
+                $tmp->setValue("");
+                $tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                $tmp = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
+                $tokens1[] = $tmp;
+
+                $tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
+                $tokens1[] = $tmp;
+                $stack[] = clone $tmp;
+
+                ++$index;
+                continue;
+            }
+
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) {
+                if (strlen($value) > 0) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+
+                $tmp = array_pop($stack);
+                $tmp->setValue("");
+                $tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                $tmp = array_pop($stack);
+                $tmp->setValue("");
+                $tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                ++$index;
+                continue;
+            }
+
+            // trim white-space
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) {
+                if (strlen($value) > 0) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+                $tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE);
+                ++$index;
+                while (($this->formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) {
+                    ++$index;
+                }
+                continue;
+            }
+
+            // multi-character comparators
+            if (($index + 2) <= $formulaLength) {
+                if (in_array(substr($this->formula, $index, 2), $COMPARATORS_MULTI)) {
+                    if (strlen($value) > 0) {
+                        $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                        $value = "";
+                    }
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken(substr($this->formula, $index, 2), PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                    $index += 2;
+                    continue;
+                }
+            }
+
+            // standard infix operators
+            if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->formula{$index}) !== false) {
+                if (strlen($value) > 0) {
+                    $tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+                $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX);
+                ++$index;
+                continue;
+            }
+
+            // standard postfix operators (only one)
+            if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->formula{$index}) !== false) {
+                if (strlen($value) > 0) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+                $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
+                ++$index;
+                continue;
+            }
+
+            // start subexpression or function
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) {
+                if (strlen($value) > 0) {
+                    $tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
+                    $tokens1[] = $tmp;
+                    $stack[] = clone $tmp;
+                    $value = "";
+                } else {
+                    $tmp = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
+                    $tokens1[] = $tmp;
+                    $stack[] = clone $tmp;
+                }
+                ++$index;
+                continue;
+            }
+
+            // function, subexpression, or array parameters, or operand unions
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) {
+                if (strlen($value) > 0) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+
+                $tmp = array_pop($stack);
+                $tmp->setValue("");
+                $tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
+                $stack[] = $tmp;
+
+                if ($tmp->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_UNION);
+                } else {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
+                }
+                ++$index;
+                continue;
+            }
+
+            // stop subexpression
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) {
+                if (strlen($value) > 0) {
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = "";
+                }
+
+                $tmp = array_pop($stack);
+                $tmp->setValue("");
+                $tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                ++$index;
+                continue;
+            }
+
+            // token accumulation
+            $value .= $this->formula{$index};
+            ++$index;
+        }
+
+        // dump remaining accumulation
+        if (strlen($value) > 0) {
+            $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
+        }
+
+        // move tokenList to new set, excluding unnecessary white-space tokens and converting necessary ones to intersections
+        $tokenCount = count($tokens1);
+        for ($i = 0; $i < $tokenCount; ++$i) {
+            $token = $tokens1[$i];
+            if (isset($tokens1[$i - 1])) {
+                $previousToken = $tokens1[$i - 1];
+            } else {
+                $previousToken = null;
+            }
+            if (isset($tokens1[$i + 1])) {
+                $nextToken = $tokens1[$i + 1];
+            } else {
+                $nextToken = null;
+            }
+
+            if (is_null($token)) {
+                continue;
+            }
+
+            if ($token->getTokenType() != PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE) {
+                $tokens2[] = $token;
+                continue;
+            }
+
+            if (is_null($previousToken)) {
+                continue;
+            }
+
+            if (! (
+                    (($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    (($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
+                  ) ) {
+                continue;
+            }
+
+            if (is_null($nextToken)) {
+                continue;
+            }
+
+            if (! (
+                    (($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
+                    (($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
+                    ($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
+                  ) ) {
+                continue;
+            }
+
+            $tokens2[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_INTERSECTION);
+        }
+
+        // move tokens to final list, switching infix "-" operators to prefix when appropriate, switching infix "+" operators
+        // to noop when appropriate, identifying operand and infix-operator subtypes, and pulling "@" from function names
+        $this->tokens = array();
+
+        $tokenCount = count($tokens2);
+        for ($i = 0; $i < $tokenCount; ++$i) {
+            $token = $tokens2[$i];
+            if (isset($tokens2[$i - 1])) {
+                $previousToken = $tokens2[$i - 1];
+            } else {
+                $previousToken = null;
+            }
+            if (isset($tokens2[$i + 1])) {
+                $nextToken = $tokens2[$i + 1];
+            } else {
+                $nextToken = null;
+            }
+
+            if (is_null($token)) {
+                continue;
+            }
+
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "-") {
+                if ($i == 0) {
+                    $token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
+                } elseif ((($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    (($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)) {
+                    $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
+                } else {
+                    $token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
+                }
+
+                $this->tokens[] = $token;
+                continue;
+            }
+
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "+") {
+                if ($i == 0) {
+                    continue;
+                } elseif ((($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    (($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)) {
+                    $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
+                } else {
+                    continue;
+                }
+
+                $this->tokens[] = $token;
+                continue;
+            }
+
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
+                $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+                if (strpos("<>=", substr($token->getValue(), 0, 1)) !== false) {
+                    $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                } elseif ($token->getValue() == "&") {
+                    $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_CONCATENATION);
+                } else {
+                    $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
+                }
+
+                $this->tokens[] = $token;
+                continue;
+            }
+
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND &&
+                $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+                if (!is_numeric($token->getValue())) {
+                    if (strtoupper($token->getValue()) == "TRUE" || strtoupper($token->getValue() == "FALSE")) {
+                        $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                    } else {
+                        $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_RANGE);
+                    }
+                } else {
+                    $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NUMBER);
+                }
+
+                $this->tokens[] = $token;
+                continue;
+            }
+
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
+                if (strlen($token->getValue() > 0)) {
+                    if (substr($token->getValue(), 0, 1) == "@") {
+                        $token->setValue(substr($token->getValue(), 1));
+                    }
+                }
+            }
+
+            $this->tokens[] = $token;
+        }
+    }
+}
diff --git a/lib/PHPExcel/Calculation/FormulaToken.php b/lib/PHPExcel/Calculation/FormulaToken.php
new file mode 100644
index 000000000..41c6e3d5d
--- /dev/null
+++ b/lib/PHPExcel/Calculation/FormulaToken.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+PARTLY BASED ON:
+    Copyright (c) 2007 E. W. Bachtal, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+    and associated documentation files (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial
+      portions of the Software.
+
+    The software is provided "as is", without warranty of any kind, express or implied, including but not
+    limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+    no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+    whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+    software or the use or other dealings in the software.
+
+    http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+    http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+*/
+
+/**
+ * PHPExcel_Calculation_FormulaToken
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+class PHPExcel_Calculation_FormulaToken
+{
+    /* Token types */
+    const TOKEN_TYPE_NOOP            = 'Noop';
+    const TOKEN_TYPE_OPERAND         = 'Operand';
+    const TOKEN_TYPE_FUNCTION        = 'Function';
+    const TOKEN_TYPE_SUBEXPRESSION   = 'Subexpression';
+    const TOKEN_TYPE_ARGUMENT        = 'Argument';
+    const TOKEN_TYPE_OPERATORPREFIX  = 'OperatorPrefix';
+    const TOKEN_TYPE_OPERATORINFIX   = 'OperatorInfix';
+    const TOKEN_TYPE_OPERATORPOSTFIX = 'OperatorPostfix';
+    const TOKEN_TYPE_WHITESPACE      = 'Whitespace';
+    const TOKEN_TYPE_UNKNOWN         = 'Unknown';
+
+    /* Token subtypes */
+    const TOKEN_SUBTYPE_NOTHING       = 'Nothing';
+    const TOKEN_SUBTYPE_START         = 'Start';
+    const TOKEN_SUBTYPE_STOP          = 'Stop';
+    const TOKEN_SUBTYPE_TEXT          = 'Text';
+    const TOKEN_SUBTYPE_NUMBER        = 'Number';
+    const TOKEN_SUBTYPE_LOGICAL       = 'Logical';
+    const TOKEN_SUBTYPE_ERROR         = 'Error';
+    const TOKEN_SUBTYPE_RANGE         = 'Range';
+    const TOKEN_SUBTYPE_MATH          = 'Math';
+    const TOKEN_SUBTYPE_CONCATENATION = 'Concatenation';
+    const TOKEN_SUBTYPE_INTERSECTION  = 'Intersection';
+    const TOKEN_SUBTYPE_UNION         = 'Union';
+
+    /**
+     * Value
+     *
+     * @var string
+     */
+    private $value;
+
+    /**
+     * Token Type (represented by TOKEN_TYPE_*)
+     *
+     * @var string
+     */
+    private $tokenType;
+
+    /**
+     * Token SubType (represented by TOKEN_SUBTYPE_*)
+     *
+     * @var string
+     */
+    private $tokenSubType;
+
+    /**
+     * Create a new PHPExcel_Calculation_FormulaToken
+     *
+     * @param string    $pValue
+     * @param string    $pTokenType     Token type (represented by TOKEN_TYPE_*)
+     * @param string    $pTokenSubType     Token Subtype (represented by TOKEN_SUBTYPE_*)
+     */
+    public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
+    {
+        // Initialise values
+        $this->value       = $pValue;
+        $this->tokenType    = $pTokenType;
+        $this->tokenSubType = $pTokenSubType;
+    }
+
+    /**
+     * Get Value
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set Value
+     *
+     * @param string    $value
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Get Token Type (represented by TOKEN_TYPE_*)
+     *
+     * @return string
+     */
+    public function getTokenType()
+    {
+        return $this->tokenType;
+    }
+
+    /**
+     * Set Token Type
+     *
+     * @param string    $value
+     */
+    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN)
+    {
+        $this->tokenType = $value;
+    }
+
+    /**
+     * Get Token SubType (represented by TOKEN_SUBTYPE_*)
+     *
+     * @return string
+     */
+    public function getTokenSubType()
+    {
+        return $this->tokenSubType;
+    }
+
+    /**
+     * Set Token SubType
+     *
+     * @param string    $value
+     */
+    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
+    {
+        $this->tokenSubType = $value;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Function.php b/lib/PHPExcel/Calculation/Function.php
new file mode 100644
index 000000000..d58cef253
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Function.php
@@ -0,0 +1,148 @@
+<?php
+
+/**
+ * PHPExcel_Calculation_Function
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Function
+{
+    /* Function categories */
+    const CATEGORY_CUBE                 = 'Cube';
+    const CATEGORY_DATABASE             = 'Database';
+    const CATEGORY_DATE_AND_TIME        = 'Date and Time';
+    const CATEGORY_ENGINEERING          = 'Engineering';
+    const CATEGORY_FINANCIAL            = 'Financial';
+    const CATEGORY_INFORMATION          = 'Information';
+    const CATEGORY_LOGICAL              = 'Logical';
+    const CATEGORY_LOOKUP_AND_REFERENCE = 'Lookup and Reference';
+    const CATEGORY_MATH_AND_TRIG        = 'Math and Trig';
+    const CATEGORY_STATISTICAL          = 'Statistical';
+    const CATEGORY_TEXT_AND_DATA        = 'Text and Data';
+
+    /**
+     * Category (represented by CATEGORY_*)
+     *
+     * @var string
+     */
+    private $category;
+
+    /**
+     * Excel name
+     *
+     * @var string
+     */
+    private $excelName;
+
+    /**
+     * PHPExcel name
+     *
+     * @var string
+     */
+    private $phpExcelName;
+
+    /**
+     * Create a new PHPExcel_Calculation_Function
+     *
+     * @param     string        $pCategory         Category (represented by CATEGORY_*)
+     * @param     string        $pExcelName        Excel function name
+     * @param     string        $pPHPExcelName    PHPExcel function mapping
+     * @throws     PHPExcel_Calculation_Exception
+     */
+    public function __construct($pCategory = null, $pExcelName = null, $pPHPExcelName = null)
+    {
+        if (($pCategory !== null) && ($pExcelName !== null) && ($pPHPExcelName !== null)) {
+            // Initialise values
+            $this->category     = $pCategory;
+            $this->excelName    = $pExcelName;
+            $this->phpExcelName = $pPHPExcelName;
+        } else {
+            throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Get Category (represented by CATEGORY_*)
+     *
+     * @return string
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * Set Category (represented by CATEGORY_*)
+     *
+     * @param     string        $value
+     * @throws     PHPExcel_Calculation_Exception
+     */
+    public function setCategory($value = null)
+    {
+        if (!is_null($value)) {
+            $this->category = $value;
+        } else {
+            throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
+        }
+    }
+
+    /**
+     * Get Excel name
+     *
+     * @return string
+     */
+    public function getExcelName()
+    {
+        return $this->excelName;
+    }
+
+    /**
+     * Set Excel name
+     *
+     * @param string    $value
+     */
+    public function setExcelName($value)
+    {
+        $this->excelName = $value;
+    }
+
+    /**
+     * Get PHPExcel name
+     *
+     * @return string
+     */
+    public function getPHPExcelName()
+    {
+        return $this->phpExcelName;
+    }
+
+    /**
+     * Set PHPExcel name
+     *
+     * @param string    $value
+     */
+    public function setPHPExcelName($value)
+    {
+        $this->phpExcelName = $value;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Functions.php b/lib/PHPExcel/Calculation/Functions.php
new file mode 100644
index 000000000..773ce1ad0
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Functions.php
@@ -0,0 +1,760 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+
+/** MAX_VALUE */
+define('MAX_VALUE', 1.2e308);
+
+/** 2 / PI */
+define('M_2DIVPI', 0.63661977236758134307553505349006);
+
+/** MAX_ITERATIONS */
+define('MAX_ITERATIONS', 256);
+
+/** PRECISION */
+define('PRECISION', 8.88E-016);
+
+
+/**
+ * PHPExcel_Calculation_Functions
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Functions
+{
+
+    /** constants */
+    const COMPATIBILITY_EXCEL      = 'Excel';
+    const COMPATIBILITY_GNUMERIC   = 'Gnumeric';
+    const COMPATIBILITY_OPENOFFICE = 'OpenOfficeCalc';
+
+    const RETURNDATE_PHP_NUMERIC = 'P';
+    const RETURNDATE_PHP_OBJECT  = 'O';
+    const RETURNDATE_EXCEL       = 'E';
+
+
+    /**
+     * Compatibility mode to use for error checking and responses
+     *
+     * @access    private
+     * @var string
+     */
+    protected static $compatibilityMode = self::COMPATIBILITY_EXCEL;
+
+    /**
+     * Data Type to use when returning date values
+     *
+     * @access    private
+     * @var string
+     */
+    protected static $returnDateType = self::RETURNDATE_EXCEL;
+
+    /**
+     * List of error codes
+     *
+     * @access    private
+     * @var array
+     */
+    protected static $errorCodes = array(
+        'null'           => '#NULL!',
+        'divisionbyzero' => '#DIV/0!',
+        'value'          => '#VALUE!',
+        'reference'      => '#REF!',
+        'name'           => '#NAME?',
+        'num'            => '#NUM!',
+        'na'             => '#N/A',
+        'gettingdata'    => '#GETTING_DATA'
+    );
+
+
+    /**
+     * Set the Compatibility Mode
+     *
+     * @access    public
+     * @category Function Configuration
+     * @param     string        $compatibilityMode        Compatibility Mode
+     *                                                Permitted values are:
+     *                                                    PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL            'Excel'
+     *                                                    PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC        'Gnumeric'
+     *                                                    PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE    'OpenOfficeCalc'
+     * @return     boolean    (Success or Failure)
+     */
+    public static function setCompatibilityMode($compatibilityMode)
+    {
+        if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
+            ($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
+            ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)) {
+            self::$compatibilityMode = $compatibilityMode;
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Return the current Compatibility Mode
+     *
+     * @access    public
+     * @category Function Configuration
+     * @return     string        Compatibility Mode
+     *                            Possible Return values are:
+     *                                PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL            'Excel'
+     *                                PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC        'Gnumeric'
+     *                                PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE    'OpenOfficeCalc'
+     */
+    public static function getCompatibilityMode()
+    {
+        return self::$compatibilityMode;
+    }
+
+
+    /**
+     * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
+     *
+     * @access    public
+     * @category Function Configuration
+     * @param     string    $returnDateType            Return Date Format
+     *                                                Permitted values are:
+     *                                                    PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC        'P'
+     *                                                    PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT        'O'
+     *                                                    PHPExcel_Calculation_Functions::RETURNDATE_EXCEL            'E'
+     * @return     boolean                            Success or failure
+     */
+    public static function setReturnDateType($returnDateType)
+    {
+        if (($returnDateType == self::RETURNDATE_PHP_NUMERIC) ||
+            ($returnDateType == self::RETURNDATE_PHP_OBJECT) ||
+            ($returnDateType == self::RETURNDATE_EXCEL)) {
+            self::$returnDateType = $returnDateType;
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
+     *
+     * @access    public
+     * @category Function Configuration
+     * @return     string        Return Date Format
+     *                            Possible Return values are:
+     *                                PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC        'P'
+     *                                PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT        'O'
+     *                                PHPExcel_Calculation_Functions::RETURNDATE_EXCEL            'E'
+     */
+    public static function getReturnDateType()
+    {
+        return self::$returnDateType;
+    }
+
+
+    /**
+     * DUMMY
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #Not Yet Implemented
+     */
+    public static function DUMMY()
+    {
+        return '#Not Yet Implemented';
+    }
+
+
+    /**
+     * DIV0
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #Not Yet Implemented
+     */
+    public static function DIV0()
+    {
+        return self::$errorCodes['divisionbyzero'];
+    }
+
+
+    /**
+     * NA
+     *
+     * Excel Function:
+     *        =NA()
+     *
+     * Returns the error value #N/A
+     *        #N/A is the error value that means "no value is available."
+     *
+     * @access    public
+     * @category Logical Functions
+     * @return    string    #N/A!
+     */
+    public static function NA()
+    {
+        return self::$errorCodes['na'];
+    }
+
+
+    /**
+     * NaN
+     *
+     * Returns the error value #NUM!
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #NUM!
+     */
+    public static function NaN()
+    {
+        return self::$errorCodes['num'];
+    }
+
+
+    /**
+     * NAME
+     *
+     * Returns the error value #NAME?
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #NAME?
+     */
+    public static function NAME()
+    {
+        return self::$errorCodes['name'];
+    }
+
+
+    /**
+     * REF
+     *
+     * Returns the error value #REF!
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #REF!
+     */
+    public static function REF()
+    {
+        return self::$errorCodes['reference'];
+    }
+
+
+    /**
+     * NULL
+     *
+     * Returns the error value #NULL!
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #NULL!
+     */
+    public static function NULL()
+    {
+        return self::$errorCodes['null'];
+    }
+
+
+    /**
+     * VALUE
+     *
+     * Returns the error value #VALUE!
+     *
+     * @access    public
+     * @category Error Returns
+     * @return    string    #VALUE!
+     */
+    public static function VALUE()
+    {
+        return self::$errorCodes['value'];
+    }
+
+
+    public static function isMatrixValue($idx)
+    {
+        return ((substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0));
+    }
+
+
+    public static function isValue($idx)
+    {
+        return (substr_count($idx, '.') == 0);
+    }
+
+
+    public static function isCellValue($idx)
+    {
+        return (substr_count($idx, '.') > 1);
+    }
+
+
+    public static function ifCondition($condition)
+    {
+        $condition    = PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+        if (!isset($condition[0])) {
+            $condition = '=""';
+        }
+        if (!in_array($condition[0], array('>', '<', '='))) {
+            if (!is_numeric($condition)) {
+                $condition = PHPExcel_Calculation::wrapResult(strtoupper($condition));
+            }
+            return '=' . $condition;
+        } else {
+            preg_match('/([<>=]+)(.*)/', $condition, $matches);
+            list(, $operator, $operand) = $matches;
+
+            if (!is_numeric($operand)) {
+                $operand = str_replace('"', '""', $operand);
+                $operand = PHPExcel_Calculation::wrapResult(strtoupper($operand));
+            }
+
+            return $operator.$operand;
+        }
+    }
+
+    /**
+     * ERROR_TYPE
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function ERROR_TYPE($value = '')
+    {
+        $value = self::flattenSingleValue($value);
+
+        $i = 1;
+        foreach (self::$errorCodes as $errorCode) {
+            if ($value === $errorCode) {
+                return $i;
+            }
+            ++$i;
+        }
+        return self::NA();
+    }
+
+
+    /**
+     * IS_BLANK
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function IS_BLANK($value = null)
+    {
+        if (!is_null($value)) {
+            $value    = self::flattenSingleValue($value);
+        }
+
+        return is_null($value);
+    }
+
+
+    /**
+     * IS_ERR
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function IS_ERR($value = '')
+    {
+        $value = self::flattenSingleValue($value);
+
+        return self::IS_ERROR($value) && (!self::IS_NA($value));
+    }
+
+
+    /**
+     * IS_ERROR
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function IS_ERROR($value = '')
+    {
+        $value = self::flattenSingleValue($value);
+
+        if (!is_string($value)) {
+            return false;
+        }
+        return in_array($value, array_values(self::$errorCodes));
+    }
+
+
+    /**
+     * IS_NA
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function IS_NA($value = '')
+    {
+        $value = self::flattenSingleValue($value);
+
+        return ($value === self::NA());
+    }
+
+
+    /**
+     * IS_EVEN
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function IS_EVEN($value = null)
+    {
+        $value = self::flattenSingleValue($value);
+
+        if ($value === null) {
+            return self::NAME();
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+            return self::VALUE();
+        }
+
+        return ($value % 2 == 0);
+    }
+
+
+    /**
+     * IS_ODD
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function IS_ODD($value = null)
+    {
+        $value = self::flattenSingleValue($value);
+
+        if ($value === null) {
+            return self::NAME();
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+            return self::VALUE();
+        }
+
+        return (abs($value) % 2 == 1);
+    }
+
+
+    /**
+     * IS_NUMBER
+     *
+     * @param    mixed    $value        Value to check
+     * @return    boolean
+     */
+    public static function IS_NUMBER($value = null)
+    {
+        $value = self::flattenSingleValue($value);
+
+        if (is_string($value)) {
+            return false;
+        }
+        return is_numeric($value);
+    }
+
+
+    /**
+     * IS_LOGICAL
+     *
+     * @param    mixed    $value        Value to check
+     * @return    boolean
+     */
+    public static function IS_LOGICAL($value = null)
+    {
+        $value = self::flattenSingleValue($value);
+
+        return is_bool($value);
+    }
+
+
+    /**
+     * IS_TEXT
+     *
+     * @param    mixed    $value        Value to check
+     * @return    boolean
+     */
+    public static function IS_TEXT($value = null)
+    {
+        $value = self::flattenSingleValue($value);
+
+        return (is_string($value) && !self::IS_ERROR($value));
+    }
+
+
+    /**
+     * IS_NONTEXT
+     *
+     * @param    mixed    $value        Value to check
+     * @return    boolean
+     */
+    public static function IS_NONTEXT($value = null)
+    {
+        return !self::IS_TEXT($value);
+    }
+
+
+    /**
+     * VERSION
+     *
+     * @return    string    Version information
+     */
+    public static function VERSION()
+    {
+        return 'PHPExcel ##VERSION##, ##DATE##';
+    }
+
+
+    /**
+     * N
+     *
+     * Returns a value converted to a number
+     *
+     * @param    value        The value you want converted
+     * @return    number        N converts values listed in the following table
+     *        If value is or refers to N returns
+     *        A number            That number
+     *        A date                The serial number of that date
+     *        TRUE                1
+     *        FALSE                0
+     *        An error value        The error value
+     *        Anything else        0
+     */
+    public static function N($value = null)
+    {
+        while (is_array($value)) {
+            $value = array_shift($value);
+        }
+
+        switch (gettype($value)) {
+            case 'double':
+            case 'float':
+            case 'integer':
+                return $value;
+            case 'boolean':
+                return (integer) $value;
+            case 'string':
+                //    Errors
+                if ((strlen($value) > 0) && ($value[0] == '#')) {
+                    return $value;
+                }
+                break;
+        }
+        return 0;
+    }
+
+
+    /**
+     * TYPE
+     *
+     * Returns a number that identifies the type of a value
+     *
+     * @param    value        The value you want tested
+     * @return    number        N converts values listed in the following table
+     *        If value is or refers to N returns
+     *        A number            1
+     *        Text                2
+     *        Logical Value        4
+     *        An error value        16
+     *        Array or Matrix        64
+     */
+    public static function TYPE($value = null)
+    {
+        $value = self::flattenArrayIndexed($value);
+        if (is_array($value) && (count($value) > 1)) {
+            end($value);
+            $a = key($value);
+            //    Range of cells is an error
+            if (self::isCellValue($a)) {
+                return 16;
+            //    Test for Matrix
+            } elseif (self::isMatrixValue($a)) {
+                return 64;
+            }
+        } elseif (empty($value)) {
+            //    Empty Cell
+            return 1;
+        }
+        $value = self::flattenSingleValue($value);
+
+        if (($value === null) || (is_float($value)) || (is_int($value))) {
+                return 1;
+        } elseif (is_bool($value)) {
+                return 4;
+        } elseif (is_array($value)) {
+                return 64;
+        } elseif (is_string($value)) {
+            //    Errors
+            if ((strlen($value) > 0) && ($value[0] == '#')) {
+                return 16;
+            }
+            return 2;
+        }
+        return 0;
+    }
+
+
+    /**
+     * Convert a multi-dimensional array to a simple 1-dimensional array
+     *
+     * @param    array    $array    Array to be flattened
+     * @return    array    Flattened array
+     */
+    public static function flattenArray($array)
+    {
+        if (!is_array($array)) {
+            return (array) $array;
+        }
+
+        $arrayValues = array();
+        foreach ($array as $value) {
+            if (is_array($value)) {
+                foreach ($value as $val) {
+                    if (is_array($val)) {
+                        foreach ($val as $v) {
+                            $arrayValues[] = $v;
+                        }
+                    } else {
+                        $arrayValues[] = $val;
+                    }
+                }
+            } else {
+                $arrayValues[] = $value;
+            }
+        }
+
+        return $arrayValues;
+    }
+
+
+    /**
+     * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing
+     *
+     * @param    array    $array    Array to be flattened
+     * @return    array    Flattened array
+     */
+    public static function flattenArrayIndexed($array)
+    {
+        if (!is_array($array)) {
+            return (array) $array;
+        }
+
+        $arrayValues = array();
+        foreach ($array as $k1 => $value) {
+            if (is_array($value)) {
+                foreach ($value as $k2 => $val) {
+                    if (is_array($val)) {
+                        foreach ($val as $k3 => $v) {
+                            $arrayValues[$k1.'.'.$k2.'.'.$k3] = $v;
+                        }
+                    } else {
+                        $arrayValues[$k1.'.'.$k2] = $val;
+                    }
+                }
+            } else {
+                $arrayValues[$k1] = $value;
+            }
+        }
+
+        return $arrayValues;
+    }
+
+
+    /**
+     * Convert an array to a single scalar value by extracting the first element
+     *
+     * @param    mixed        $value        Array or scalar value
+     * @return    mixed
+     */
+    public static function flattenSingleValue($value = '')
+    {
+        while (is_array($value)) {
+            $value = array_pop($value);
+        }
+
+        return $value;
+    }
+}
+
+
+//
+//    There are a few mathematical functions that aren't available on all versions of PHP for all platforms
+//    These functions aren't available in Windows implementations of PHP prior to version 5.3.0
+//    So we test if they do exist for this version of PHP/operating platform; and if not we create them
+//
+if (!function_exists('acosh')) {
+    function acosh($x)
+    {
+        return 2 * log(sqrt(($x + 1) / 2) + sqrt(($x - 1) / 2));
+    }    //    function acosh()
+}
+
+if (!function_exists('asinh')) {
+    function asinh($x)
+    {
+        return log($x + sqrt(1 + $x * $x));
+    }    //    function asinh()
+}
+
+if (!function_exists('atanh')) {
+    function atanh($x)
+    {
+        return (log(1 + $x) - log(1 - $x)) / 2;
+    }    //    function atanh()
+}
+
+
+//
+//    Strangely, PHP doesn't have a mb_str_replace multibyte function
+//    As we'll only ever use this function with UTF-8 characters, we can simply "hard-code" the character set
+//
+if ((!function_exists('mb_str_replace')) &&
+    (function_exists('mb_substr')) && (function_exists('mb_strlen')) && (function_exists('mb_strpos'))) {
+    function mb_str_replace($search, $replace, $subject)
+    {
+        if (is_array($subject)) {
+            $ret = array();
+            foreach ($subject as $key => $val) {
+                $ret[$key] = mb_str_replace($search, $replace, $val);
+            }
+            return $ret;
+        }
+
+        foreach ((array) $search as $key => $s) {
+            if ($s == '' && $s !== 0) {
+                continue;
+            }
+            $r = !is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');
+            $pos = mb_strpos($subject, $s, 0, 'UTF-8');
+            while ($pos !== false) {
+                $subject = mb_substr($subject, 0, $pos, 'UTF-8') . $r . mb_substr($subject, $pos + mb_strlen($s, 'UTF-8'), 65535, 'UTF-8');
+                $pos = mb_strpos($subject, $s, $pos + mb_strlen($r, 'UTF-8'), 'UTF-8');
+            }
+        }
+        return $subject;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Logical.php b/lib/PHPExcel/Calculation/Logical.php
new file mode 100644
index 000000000..dd65f0104
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Logical.php
@@ -0,0 +1,285 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_Logical
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Logical
+{
+    /**
+     * TRUE
+     *
+     * Returns the boolean TRUE.
+     *
+     * Excel Function:
+     *        =TRUE()
+     *
+     * @access    public
+     * @category Logical Functions
+     * @return    boolean        True
+     */
+    public static function TRUE()
+    {
+        return true;
+    }
+
+
+    /**
+     * FALSE
+     *
+     * Returns the boolean FALSE.
+     *
+     * Excel Function:
+     *        =FALSE()
+     *
+     * @access    public
+     * @category Logical Functions
+     * @return    boolean        False
+     */
+    public static function FALSE()
+    {
+        return false;
+    }
+
+
+    /**
+     * LOGICAL_AND
+     *
+     * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
+     *
+     * Excel Function:
+     *        =AND(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
+     *            the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    boolean        The logical AND of the arguments.
+     */
+    public static function LOGICAL_AND()
+    {
+        // Return value
+        $returnValue = true;
+
+        // Loop through the arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $argCount = -1;
+        foreach ($aArgs as $argCount => $arg) {
+            // Is it a boolean value?
+            if (is_bool($arg)) {
+                $returnValue = $returnValue && $arg;
+            } elseif ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue = $returnValue && ($arg != 0);
+            } elseif (is_string($arg)) {
+                $arg = strtoupper($arg);
+                if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
+                    $arg = true;
+                } elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
+                    $arg = false;
+                } else {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                $returnValue = $returnValue && ($arg != 0);
+            }
+        }
+
+        // Return
+        if ($argCount < 0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * LOGICAL_OR
+     *
+     * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
+     *
+     * Excel Function:
+     *        =OR(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
+     *            the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    boolean        The logical OR of the arguments.
+     */
+    public static function LOGICAL_OR()
+    {
+        // Return value
+        $returnValue = false;
+
+        // Loop through the arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $argCount = -1;
+        foreach ($aArgs as $argCount => $arg) {
+            // Is it a boolean value?
+            if (is_bool($arg)) {
+                $returnValue = $returnValue || $arg;
+            } elseif ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue = $returnValue || ($arg != 0);
+            } elseif (is_string($arg)) {
+                $arg = strtoupper($arg);
+                if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
+                    $arg = true;
+                } elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
+                    $arg = false;
+                } else {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                $returnValue = $returnValue || ($arg != 0);
+            }
+        }
+
+        // Return
+        if ($argCount < 0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * NOT
+     *
+     * Returns the boolean inverse of the argument.
+     *
+     * Excel Function:
+     *        =NOT(logical)
+     *
+     *        The argument must evaluate to a logical value such as TRUE or FALSE
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
+     *            the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed        $logical    A value or expression that can be evaluated to TRUE or FALSE
+     * @return    boolean        The boolean inverse of the argument.
+     */
+    public static function NOT($logical = false)
+    {
+        $logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
+        if (is_string($logical)) {
+            $logical = strtoupper($logical);
+            if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
+                return false;
+            } elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
+                return true;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+
+        return !$logical;
+    }
+
+    /**
+     * STATEMENT_IF
+     *
+     * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
+     *
+     * Excel Function:
+     *        =IF(condition[,returnIfTrue[,returnIfFalse]])
+     *
+     *        Condition is any value or expression that can be evaluated to TRUE or FALSE.
+     *            For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
+     *            the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
+     *            This argument can use any comparison calculation operator.
+     *        ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
+     *            For example, if this argument is the text string "Within budget" and the condition argument evaluates to TRUE,
+     *            then the IF function returns the text "Within budget"
+     *            If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero). To display the word TRUE, use
+     *            the logical value TRUE for this argument.
+     *            ReturnIfTrue can be another formula.
+     *        ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
+     *            For example, if this argument is the text string "Over budget" and the condition argument evaluates to FALSE,
+     *            then the IF function returns the text "Over budget".
+     *            If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
+     *            If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
+     *            ReturnIfFalse can be another formula.
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed    $condition        Condition to evaluate
+     * @param    mixed    $returnIfTrue    Value to return when condition is true
+     * @param    mixed    $returnIfFalse    Optional value to return when condition is false
+     * @return    mixed    The value of returnIfTrue or returnIfFalse determined by condition
+     */
+    public static function STATEMENT_IF($condition = true, $returnIfTrue = 0, $returnIfFalse = false)
+    {
+        $condition     = (is_null($condition))     ? true :  (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+        $returnIfTrue  = (is_null($returnIfTrue))  ? 0 :     PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
+        $returnIfFalse = (is_null($returnIfFalse)) ? false : PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
+
+        return ($condition) ? $returnIfTrue : $returnIfFalse;
+    }
+
+
+    /**
+     * IFERROR
+     *
+     * Excel Function:
+     *        =IFERROR(testValue,errorpart)
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed    $testValue    Value to check, is also the value returned when no error
+     * @param    mixed    $errorpart    Value to return when testValue is an error condition
+     * @return    mixed    The value of errorpart or testValue determined by error condition
+     */
+    public static function IFERROR($testValue = '', $errorpart = '')
+    {
+        $testValue = (is_null($testValue)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
+        $errorpart = (is_null($errorpart)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($errorpart);
+
+        return self::STATEMENT_IF(PHPExcel_Calculation_Functions::IS_ERROR($testValue), $errorpart, $testValue);
+    }
+}
diff --git a/lib/PHPExcel/Calculation/LookupRef.php b/lib/PHPExcel/Calculation/LookupRef.php
new file mode 100644
index 000000000..1fe77902f
--- /dev/null
+++ b/lib/PHPExcel/Calculation/LookupRef.php
@@ -0,0 +1,879 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_LookupRef
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_LookupRef
+{
+    /**
+     * CELL_ADDRESS
+     *
+     * Creates a cell address as text, given specified row and column numbers.
+     *
+     * Excel Function:
+     *        =ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
+     *
+     * @param    row                Row number to use in the cell reference
+     * @param    column            Column number to use in the cell reference
+     * @param    relativity        Flag indicating the type of reference to return
+     *                                1 or omitted    Absolute
+     *                                2                Absolute row; relative column
+     *                                3                Relative row; absolute column
+     *                                4                Relative
+     * @param    referenceStyle    A logical value that specifies the A1 or R1C1 reference style.
+     *                                TRUE or omitted        CELL_ADDRESS returns an A1-style reference
+     *                                FALSE                CELL_ADDRESS returns an R1C1-style reference
+     * @param    sheetText        Optional Name of worksheet to use
+     * @return    string
+     */
+    public static function CELL_ADDRESS($row, $column, $relativity = 1, $referenceStyle = true, $sheetText = '')
+    {
+        $row        = PHPExcel_Calculation_Functions::flattenSingleValue($row);
+        $column     = PHPExcel_Calculation_Functions::flattenSingleValue($column);
+        $relativity = PHPExcel_Calculation_Functions::flattenSingleValue($relativity);
+        $sheetText  = PHPExcel_Calculation_Functions::flattenSingleValue($sheetText);
+
+        if (($row < 1) || ($column < 1)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if ($sheetText > '') {
+            if (strpos($sheetText, ' ') !== false) {
+                $sheetText = "'".$sheetText."'";
+            }
+            $sheetText .='!';
+        }
+        if ((!is_bool($referenceStyle)) || $referenceStyle) {
+            $rowRelative = $columnRelative = '$';
+            $column = PHPExcel_Cell::stringFromColumnIndex($column-1);
+            if (($relativity == 2) || ($relativity == 4)) {
+                $columnRelative = '';
+            }
+            if (($relativity == 3) || ($relativity == 4)) {
+                $rowRelative = '';
+            }
+            return $sheetText.$columnRelative.$column.$rowRelative.$row;
+        } else {
+            if (($relativity == 2) || ($relativity == 4)) {
+                $column = '['.$column.']';
+            }
+            if (($relativity == 3) || ($relativity == 4)) {
+                $row = '['.$row.']';
+            }
+            return $sheetText.'R'.$row.'C'.$column;
+        }
+    }
+
+
+    /**
+     * COLUMN
+     *
+     * Returns the column number of the given cell reference
+     * If the cell reference is a range of cells, COLUMN returns the column numbers of each column in the reference as a horizontal array.
+     * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
+     *        reference of the cell in which the COLUMN function appears; otherwise this function returns 0.
+     *
+     * Excel Function:
+     *        =COLUMN([cellAddress])
+     *
+     * @param    cellAddress        A reference to a range of cells for which you want the column numbers
+     * @return    integer or array of integer
+     */
+    public static function COLUMN($cellAddress = null)
+    {
+        if (is_null($cellAddress) || trim($cellAddress) === '') {
+            return 0;
+        }
+
+        if (is_array($cellAddress)) {
+            foreach ($cellAddress as $columnKey => $value) {
+                $columnKey = preg_replace('/[^a-z]/i', '', $columnKey);
+                return (integer) PHPExcel_Cell::columnIndexFromString($columnKey);
+            }
+        } else {
+            if (strpos($cellAddress, '!') !== false) {
+                list($sheet, $cellAddress) = explode('!', $cellAddress);
+            }
+            if (strpos($cellAddress, ':') !== false) {
+                list($startAddress, $endAddress) = explode(':', $cellAddress);
+                $startAddress = preg_replace('/[^a-z]/i', '', $startAddress);
+                $endAddress = preg_replace('/[^a-z]/i', '', $endAddress);
+                $returnValue = array();
+                do {
+                    $returnValue[] = (integer) PHPExcel_Cell::columnIndexFromString($startAddress);
+                } while ($startAddress++ != $endAddress);
+                return $returnValue;
+            } else {
+                $cellAddress = preg_replace('/[^a-z]/i', '', $cellAddress);
+                return (integer) PHPExcel_Cell::columnIndexFromString($cellAddress);
+            }
+        }
+    }
+
+
+    /**
+     * COLUMNS
+     *
+     * Returns the number of columns in an array or reference.
+     *
+     * Excel Function:
+     *        =COLUMNS(cellAddress)
+     *
+     * @param    cellAddress        An array or array formula, or a reference to a range of cells for which you want the number of columns
+     * @return    integer            The number of columns in cellAddress
+     */
+    public static function COLUMNS($cellAddress = null)
+    {
+        if (is_null($cellAddress) || $cellAddress === '') {
+            return 1;
+        } elseif (!is_array($cellAddress)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
+        list($columns, $rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
+
+        if ($isMatrix) {
+            return $rows;
+        } else {
+            return $columns;
+        }
+    }
+
+
+    /**
+     * ROW
+     *
+     * Returns the row number of the given cell reference
+     * If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference as a vertical array.
+     * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
+     *        reference of the cell in which the ROW function appears; otherwise this function returns 0.
+     *
+     * Excel Function:
+     *        =ROW([cellAddress])
+     *
+     * @param    cellAddress        A reference to a range of cells for which you want the row numbers
+     * @return    integer or array of integer
+     */
+    public static function ROW($cellAddress = null)
+    {
+        if (is_null($cellAddress) || trim($cellAddress) === '') {
+            return 0;
+        }
+
+        if (is_array($cellAddress)) {
+            foreach ($cellAddress as $columnKey => $rowValue) {
+                foreach ($rowValue as $rowKey => $cellValue) {
+                    return (integer) preg_replace('/[^0-9]/i', '', $rowKey);
+                }
+            }
+        } else {
+            if (strpos($cellAddress, '!') !== false) {
+                list($sheet, $cellAddress) = explode('!', $cellAddress);
+            }
+            if (strpos($cellAddress, ':') !== false) {
+                list($startAddress, $endAddress) = explode(':', $cellAddress);
+                $startAddress = preg_replace('/[^0-9]/', '', $startAddress);
+                $endAddress = preg_replace('/[^0-9]/', '', $endAddress);
+                $returnValue = array();
+                do {
+                    $returnValue[][] = (integer) $startAddress;
+                } while ($startAddress++ != $endAddress);
+                return $returnValue;
+            } else {
+                list($cellAddress) = explode(':', $cellAddress);
+                return (integer) preg_replace('/[^0-9]/', '', $cellAddress);
+            }
+        }
+    }
+
+
+    /**
+     * ROWS
+     *
+     * Returns the number of rows in an array or reference.
+     *
+     * Excel Function:
+     *        =ROWS(cellAddress)
+     *
+     * @param    cellAddress        An array or array formula, or a reference to a range of cells for which you want the number of rows
+     * @return    integer            The number of rows in cellAddress
+     */
+    public static function ROWS($cellAddress = null)
+    {
+        if (is_null($cellAddress) || $cellAddress === '') {
+            return 1;
+        } elseif (!is_array($cellAddress)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
+        list($columns, $rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
+
+        if ($isMatrix) {
+            return $columns;
+        } else {
+            return $rows;
+        }
+    }
+
+
+    /**
+     * HYPERLINK
+     *
+     * Excel Function:
+     *        =HYPERLINK(linkURL,displayName)
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    string            $linkURL        Value to check, is also the value returned when no error
+     * @param    string            $displayName    Value to return when testValue is an error condition
+     * @param    PHPExcel_Cell    $pCell            The cell to set the hyperlink in
+     * @return    mixed    The value of $displayName (or $linkURL if $displayName was blank)
+     */
+    public static function HYPERLINK($linkURL = '', $displayName = null, PHPExcel_Cell $pCell = null)
+    {
+        $args = func_get_args();
+        $pCell = array_pop($args);
+
+        $linkURL     = (is_null($linkURL))     ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($linkURL);
+        $displayName = (is_null($displayName)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($displayName);
+
+        if ((!is_object($pCell)) || (trim($linkURL) == '')) {
+            return PHPExcel_Calculation_Functions::REF();
+        }
+
+        if ((is_object($displayName)) || trim($displayName) == '') {
+            $displayName = $linkURL;
+        }
+
+        $pCell->getHyperlink()->setUrl($linkURL);
+        $pCell->getHyperlink()->setTooltip($displayName);
+
+        return $displayName;
+    }
+
+
+    /**
+     * INDIRECT
+     *
+     * Returns the reference specified by a text string.
+     * References are immediately evaluated to display their contents.
+     *
+     * Excel Function:
+     *        =INDIRECT(cellAddress)
+     *
+     * NOTE - INDIRECT() does not yet support the optional a1 parameter introduced in Excel 2010
+     *
+     * @param    cellAddress        $cellAddress    The cell address of the current cell (containing this formula)
+     * @param    PHPExcel_Cell    $pCell            The current cell (containing this formula)
+     * @return    mixed            The cells referenced by cellAddress
+     *
+     * @todo    Support for the optional a1 parameter introduced in Excel 2010
+     *
+     */
+    public static function INDIRECT($cellAddress = null, PHPExcel_Cell $pCell = null)
+    {
+        $cellAddress    = PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
+        if (is_null($cellAddress) || $cellAddress === '') {
+            return PHPExcel_Calculation_Functions::REF();
+        }
+
+        $cellAddress1 = $cellAddress;
+        $cellAddress2 = null;
+        if (strpos($cellAddress, ':') !== false) {
+            list($cellAddress1, $cellAddress2) = explode(':', $cellAddress);
+        }
+
+        if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
+            ((!is_null($cellAddress2)) && (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
+            if (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
+                return PHPExcel_Calculation_Functions::REF();
+            }
+
+            if (strpos($cellAddress, '!') !== false) {
+                list($sheetName, $cellAddress) = explode('!', $cellAddress);
+                $sheetName = trim($sheetName, "'");
+                $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
+            } else {
+                $pSheet = $pCell->getWorksheet();
+            }
+
+            return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, false);
+        }
+
+        if (strpos($cellAddress, '!') !== false) {
+            list($sheetName, $cellAddress) = explode('!', $cellAddress);
+            $sheetName = trim($sheetName, "'");
+            $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
+        } else {
+            $pSheet = $pCell->getWorksheet();
+        }
+
+        return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, false);
+    }
+
+
+    /**
+     * OFFSET
+     *
+     * Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
+     * The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
+     * the number of columns to be returned.
+     *
+     * Excel Function:
+     *        =OFFSET(cellAddress, rows, cols, [height], [width])
+     *
+     * @param    cellAddress        The reference from which you want to base the offset. Reference must refer to a cell or
+     *                                range of adjacent cells; otherwise, OFFSET returns the #VALUE! error value.
+     * @param    rows            The number of rows, up or down, that you want the upper-left cell to refer to.
+     *                                Using 5 as the rows argument specifies that the upper-left cell in the reference is
+     *                                five rows below reference. Rows can be positive (which means below the starting reference)
+     *                                or negative (which means above the starting reference).
+     * @param    cols            The number of columns, to the left or right, that you want the upper-left cell of the result
+     *                                to refer to. Using 5 as the cols argument specifies that the upper-left cell in the
+     *                                reference is five columns to the right of reference. Cols can be positive (which means
+     *                                to the right of the starting reference) or negative (which means to the left of the
+     *                                starting reference).
+     * @param    height            The height, in number of rows, that you want the returned reference to be. Height must be a positive number.
+     * @param    width            The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
+     * @return    string            A reference to a cell or range of cells
+     */
+    public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null)
+    {
+        $rows    = PHPExcel_Calculation_Functions::flattenSingleValue($rows);
+        $columns = PHPExcel_Calculation_Functions::flattenSingleValue($columns);
+        $height  = PHPExcel_Calculation_Functions::flattenSingleValue($height);
+        $width   = PHPExcel_Calculation_Functions::flattenSingleValue($width);
+        if ($cellAddress == null) {
+            return 0;
+        }
+
+        $args = func_get_args();
+        $pCell = array_pop($args);
+        if (!is_object($pCell)) {
+            return PHPExcel_Calculation_Functions::REF();
+        }
+
+        $sheetName = null;
+        if (strpos($cellAddress, "!")) {
+            list($sheetName, $cellAddress) = explode("!", $cellAddress);
+            $sheetName = trim($sheetName, "'");
+        }
+        if (strpos($cellAddress, ":")) {
+            list($startCell, $endCell) = explode(":", $cellAddress);
+        } else {
+            $startCell = $endCell = $cellAddress;
+        }
+        list($startCellColumn, $startCellRow) = PHPExcel_Cell::coordinateFromString($startCell);
+        list($endCellColumn, $endCellRow) = PHPExcel_Cell::coordinateFromString($endCell);
+
+        $startCellRow += $rows;
+        $startCellColumn = PHPExcel_Cell::columnIndexFromString($startCellColumn) - 1;
+        $startCellColumn += $columns;
+
+        if (($startCellRow <= 0) || ($startCellColumn < 0)) {
+            return PHPExcel_Calculation_Functions::REF();
+        }
+        $endCellColumn = PHPExcel_Cell::columnIndexFromString($endCellColumn) - 1;
+        if (($width != null) && (!is_object($width))) {
+            $endCellColumn = $startCellColumn + $width - 1;
+        } else {
+            $endCellColumn += $columns;
+        }
+        $startCellColumn = PHPExcel_Cell::stringFromColumnIndex($startCellColumn);
+
+        if (($height != null) && (!is_object($height))) {
+            $endCellRow = $startCellRow + $height - 1;
+        } else {
+            $endCellRow += $rows;
+        }
+
+        if (($endCellRow <= 0) || ($endCellColumn < 0)) {
+            return PHPExcel_Calculation_Functions::REF();
+        }
+        $endCellColumn = PHPExcel_Cell::stringFromColumnIndex($endCellColumn);
+
+        $cellAddress = $startCellColumn.$startCellRow;
+        if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
+            $cellAddress .= ':'.$endCellColumn.$endCellRow;
+        }
+
+        if ($sheetName !== null) {
+            $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
+        } else {
+            $pSheet = $pCell->getWorksheet();
+        }
+
+        return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, false);
+    }
+
+
+    /**
+     * CHOOSE
+     *
+     * Uses lookup_value to return a value from the list of value arguments.
+     * Use CHOOSE to select one of up to 254 values based on the lookup_value.
+     *
+     * Excel Function:
+     *        =CHOOSE(index_num, value1, [value2], ...)
+     *
+     * @param    index_num        Specifies which value argument is selected.
+     *                            Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number
+     *                                between 1 and 254.
+     * @param    value1...        Value1 is required, subsequent values are optional.
+     *                            Between 1 to 254 value arguments from which CHOOSE selects a value or an action to perform based on
+     *                                index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or
+     *                                text.
+     * @return    mixed            The selected value
+     */
+    public static function CHOOSE()
+    {
+        $chooseArgs = func_get_args();
+        $chosenEntry = PHPExcel_Calculation_Functions::flattenArray(array_shift($chooseArgs));
+        $entryCount = count($chooseArgs) - 1;
+
+        if (is_array($chosenEntry)) {
+            $chosenEntry = array_shift($chosenEntry);
+        }
+        if ((is_numeric($chosenEntry)) && (!is_bool($chosenEntry))) {
+            --$chosenEntry;
+        } else {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $chosenEntry = floor($chosenEntry);
+        if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (is_array($chooseArgs[$chosenEntry])) {
+            return PHPExcel_Calculation_Functions::flattenArray($chooseArgs[$chosenEntry]);
+        } else {
+            return $chooseArgs[$chosenEntry];
+        }
+    }
+
+
+    /**
+     * MATCH
+     *
+     * The MATCH function searches for a specified item in a range of cells
+     *
+     * Excel Function:
+     *        =MATCH(lookup_value, lookup_array, [match_type])
+     *
+     * @param    lookup_value    The value that you want to match in lookup_array
+     * @param    lookup_array    The range of cells being searched
+     * @param    match_type        The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
+     * @return    integer            The relative position of the found item
+     */
+    public static function MATCH($lookup_value, $lookup_array, $match_type = 1)
+    {
+        $lookup_array = PHPExcel_Calculation_Functions::flattenArray($lookup_array);
+        $lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+        $match_type    = (is_null($match_type)) ? 1 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($match_type);
+        //    MATCH is not case sensitive
+        $lookup_value = strtolower($lookup_value);
+
+        //    lookup_value type has to be number, text, or logical values
+        if ((!is_numeric($lookup_value)) && (!is_string($lookup_value)) && (!is_bool($lookup_value))) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+
+        //    match_type is 0, 1 or -1
+        if (($match_type !== 0) && ($match_type !== -1) && ($match_type !== 1)) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+
+        //    lookup_array should not be empty
+        $lookupArraySize = count($lookup_array);
+        if ($lookupArraySize <= 0) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+
+        //    lookup_array should contain only number, text, or logical values, or empty (null) cells
+        foreach ($lookup_array as $i => $lookupArrayValue) {
+            //    check the type of the value
+            if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
+                (!is_bool($lookupArrayValue)) && (!is_null($lookupArrayValue))) {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            //    convert strings to lowercase for case-insensitive testing
+            if (is_string($lookupArrayValue)) {
+                $lookup_array[$i] = strtolower($lookupArrayValue);
+            }
+            if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) {
+                $lookup_array = array_slice($lookup_array, 0, $i-1);
+            }
+        }
+
+        // if match_type is 1 or -1, the list has to be ordered
+        if ($match_type == 1) {
+            asort($lookup_array);
+            $keySet = array_keys($lookup_array);
+        } elseif ($match_type == -1) {
+            arsort($lookup_array);
+            $keySet = array_keys($lookup_array);
+        }
+
+        // **
+        // find the match
+        // **
+        foreach ($lookup_array as $i => $lookupArrayValue) {
+            if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) {
+                //    exact match
+                return ++$i;
+            } elseif (($match_type == -1) && ($lookupArrayValue <= $lookup_value)) {
+                $i = array_search($i, $keySet);
+                // if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value
+                if ($i < 1) {
+                    // 1st cell was already smaller than the lookup_value
+                    break;
+                } else {
+                    // the previous cell was the match
+                    return $keySet[$i-1]+1;
+                }
+            } elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
+                $i = array_search($i, $keySet);
+                // if match_type is 1 <=> find the largest value that is less than or equal to lookup_value
+                if ($i < 1) {
+                    // 1st cell was already bigger than the lookup_value
+                    break;
+                } else {
+                    // the previous cell was the match
+                    return $keySet[$i-1]+1;
+                }
+            }
+        }
+
+        //    unsuccessful in finding a match, return #N/A error value
+        return PHPExcel_Calculation_Functions::NA();
+    }
+
+
+    /**
+     * INDEX
+     *
+     * Uses an index to choose a value from a reference or array
+     *
+     * Excel Function:
+     *        =INDEX(range_array, row_num, [column_num])
+     *
+     * @param    range_array        A range of cells or an array constant
+     * @param    row_num            The row in array from which to return a value. If row_num is omitted, column_num is required.
+     * @param    column_num        The column in array from which to return a value. If column_num is omitted, row_num is required.
+     * @return    mixed            the value of a specified cell or array of cells
+     */
+    public static function INDEX($arrayValues, $rowNum = 0, $columnNum = 0)
+    {
+        if (($rowNum < 0) || ($columnNum < 0)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (!is_array($arrayValues)) {
+            return PHPExcel_Calculation_Functions::REF();
+        }
+
+        $rowKeys = array_keys($arrayValues);
+        $columnKeys = @array_keys($arrayValues[$rowKeys[0]]);
+
+        if ($columnNum > count($columnKeys)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($columnNum == 0) {
+            if ($rowNum == 0) {
+                return $arrayValues;
+            }
+            $rowNum = $rowKeys[--$rowNum];
+            $returnArray = array();
+            foreach ($arrayValues as $arrayColumn) {
+                if (is_array($arrayColumn)) {
+                    if (isset($arrayColumn[$rowNum])) {
+                        $returnArray[] = $arrayColumn[$rowNum];
+                    } else {
+                        return $arrayValues[$rowNum];
+                    }
+                } else {
+                    return $arrayValues[$rowNum];
+                }
+            }
+            return $returnArray;
+        }
+        $columnNum = $columnKeys[--$columnNum];
+        if ($rowNum > count($rowKeys)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif ($rowNum == 0) {
+            return $arrayValues[$columnNum];
+        }
+        $rowNum = $rowKeys[--$rowNum];
+
+        return $arrayValues[$rowNum][$columnNum];
+    }
+
+
+    /**
+     * TRANSPOSE
+     *
+     * @param    array    $matrixData    A matrix of values
+     * @return    array
+     *
+     * Unlike the Excel TRANSPOSE function, which will only work on a single row or column, this function will transpose a full matrix.
+     */
+    public static function TRANSPOSE($matrixData)
+    {
+        $returnMatrix = array();
+        if (!is_array($matrixData)) {
+            $matrixData = array(array($matrixData));
+        }
+
+        $column = 0;
+        foreach ($matrixData as $matrixRow) {
+            $row = 0;
+            foreach ($matrixRow as $matrixCell) {
+                $returnMatrix[$row][$column] = $matrixCell;
+                ++$row;
+            }
+            ++$column;
+        }
+        return $returnMatrix;
+    }
+
+
+    private static function vlookupSort($a, $b)
+    {
+        reset($a);
+        $firstColumn = key($a);
+        if (($aLower = strtolower($a[$firstColumn])) == ($bLower = strtolower($b[$firstColumn]))) {
+            return 0;
+        }
+        return ($aLower < $bLower) ? -1 : 1;
+    }
+
+
+    /**
+     * VLOOKUP
+     * The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
+     * @param    lookup_value    The value that you want to match in lookup_array
+     * @param    lookup_array    The range of cells being searched
+     * @param    index_number    The column number in table_array from which the matching value must be returned. The first column is 1.
+     * @param    not_exact_match    Determines if you are looking for an exact match based on lookup_value.
+     * @return    mixed            The value of the found cell
+     */
+    public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true)
+    {
+        $lookup_value    = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+        $index_number    = PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
+        $not_exact_match = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
+
+        // index_number must be greater than or equal to 1
+        if ($index_number < 1) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // index_number must be less than or equal to the number of columns in lookup_array
+        if ((!is_array($lookup_array)) || (empty($lookup_array))) {
+            return PHPExcel_Calculation_Functions::REF();
+        } else {
+            $f = array_keys($lookup_array);
+            $firstRow = array_pop($f);
+            if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
+                return PHPExcel_Calculation_Functions::REF();
+            } else {
+                $columnKeys = array_keys($lookup_array[$firstRow]);
+                $returnColumn = $columnKeys[--$index_number];
+                $firstColumn = array_shift($columnKeys);
+            }
+        }
+
+        if (!$not_exact_match) {
+            uasort($lookup_array, array('self', 'vlookupSort'));
+        }
+
+        $rowNumber = $rowValue = false;
+        foreach ($lookup_array as $rowKey => $rowData) {
+            if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
+                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)))) {
+                break;
+            }
+            $rowNumber = $rowKey;
+            $rowValue = $rowData[$firstColumn];
+        }
+
+        if ($rowNumber !== false) {
+            if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
+                //    if an exact match is required, we have what we need to return an appropriate response
+                return PHPExcel_Calculation_Functions::NA();
+            } else {
+                //    otherwise return the appropriate value
+                return $lookup_array[$rowNumber][$returnColumn];
+            }
+        }
+
+        return PHPExcel_Calculation_Functions::NA();
+    }
+
+
+    /**
+     * HLOOKUP
+     * The HLOOKUP function searches for value in the top-most row of lookup_array and returns the value in the same column based on the index_number.
+     * @param    lookup_value    The value that you want to match in lookup_array
+     * @param    lookup_array    The range of cells being searched
+     * @param    index_number    The row number in table_array from which the matching value must be returned. The first row is 1.
+     * @param    not_exact_match Determines if you are looking for an exact match based on lookup_value.
+     * @return   mixed           The value of the found cell
+     */
+    public static function HLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true)
+    {
+        $lookup_value   = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+        $index_number   = PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
+        $not_exact_match    = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
+
+        // index_number must be greater than or equal to 1
+        if ($index_number < 1) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // index_number must be less than or equal to the number of columns in lookup_array
+        if ((!is_array($lookup_array)) || (empty($lookup_array))) {
+            return PHPExcel_Calculation_Functions::REF();
+        } else {
+            $f = array_keys($lookup_array);
+            $firstRow = array_pop($f);
+            if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
+                return PHPExcel_Calculation_Functions::REF();
+            } else {
+                $columnKeys = array_keys($lookup_array[$firstRow]);
+                                $firstkey = $f[0] - 1;
+                $returnColumn = $firstkey + $index_number;
+                $firstColumn = array_shift($f);
+            }
+        }
+
+        if (!$not_exact_match) {
+            $firstRowH = asort($lookup_array[$firstColumn]);
+        }
+
+        $rowNumber = $rowValue = false;
+        foreach ($lookup_array[$firstColumn] as $rowKey => $rowData) {
+            if ((is_numeric($lookup_value) && is_numeric($rowData) && ($rowData > $lookup_value)) ||
+                (!is_numeric($lookup_value) && !is_numeric($rowData) && (strtolower($rowData) > strtolower($lookup_value)))) {
+                break;
+            }
+            $rowNumber = $rowKey;
+            $rowValue = $rowData;
+        }
+
+        if ($rowNumber !== false) {
+            if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
+                //  if an exact match is required, we have what we need to return an appropriate response
+                return PHPExcel_Calculation_Functions::NA();
+            } else {
+                //  otherwise return the appropriate value
+                return $lookup_array[$returnColumn][$rowNumber];
+            }
+        }
+
+        return PHPExcel_Calculation_Functions::NA();
+    }
+
+
+    /**
+     * LOOKUP
+     * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
+     * @param    lookup_value    The value that you want to match in lookup_array
+     * @param    lookup_vector    The range of cells being searched
+     * @param    result_vector    The column from which the matching value must be returned
+     * @return    mixed            The value of the found cell
+     */
+    public static function LOOKUP($lookup_value, $lookup_vector, $result_vector = null)
+    {
+        $lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+
+        if (!is_array($lookup_vector)) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+        $lookupRows = count($lookup_vector);
+        $l = array_keys($lookup_vector);
+        $l = array_shift($l);
+        $lookupColumns = count($lookup_vector[$l]);
+        if ((($lookupRows == 1) && ($lookupColumns > 1)) || (($lookupRows == 2) && ($lookupColumns != 2))) {
+            $lookup_vector = self::TRANSPOSE($lookup_vector);
+            $lookupRows = count($lookup_vector);
+            $l = array_keys($lookup_vector);
+            $lookupColumns = count($lookup_vector[array_shift($l)]);
+        }
+
+        if (is_null($result_vector)) {
+            $result_vector = $lookup_vector;
+        }
+        $resultRows = count($result_vector);
+        $l = array_keys($result_vector);
+        $l = array_shift($l);
+        $resultColumns = count($result_vector[$l]);
+        if ((($resultRows == 1) && ($resultColumns > 1)) || (($resultRows == 2) && ($resultColumns != 2))) {
+            $result_vector = self::TRANSPOSE($result_vector);
+            $resultRows = count($result_vector);
+            $r = array_keys($result_vector);
+            $resultColumns = count($result_vector[array_shift($r)]);
+        }
+
+        if ($lookupRows == 2) {
+            $result_vector = array_pop($lookup_vector);
+            $lookup_vector = array_shift($lookup_vector);
+        }
+        if ($lookupColumns != 2) {
+            foreach ($lookup_vector as &$value) {
+                if (is_array($value)) {
+                    $k = array_keys($value);
+                    $key1 = $key2 = array_shift($k);
+                    $key2++;
+                    $dataValue1 = $value[$key1];
+                } else {
+                    $key1 = 0;
+                    $key2 = 1;
+                    $dataValue1 = $value;
+                }
+                $dataValue2 = array_shift($result_vector);
+                if (is_array($dataValue2)) {
+                    $dataValue2 = array_shift($dataValue2);
+                }
+                $value = array($key1 => $dataValue1, $key2 => $dataValue2);
+            }
+            unset($value);
+        }
+
+        return self::VLOOKUP($lookup_value, $lookup_vector, 2);
+    }
+}
diff --git a/lib/PHPExcel/Calculation/MathTrig.php b/lib/PHPExcel/Calculation/MathTrig.php
new file mode 100644
index 000000000..894ba9cf0
--- /dev/null
+++ b/lib/PHPExcel/Calculation/MathTrig.php
@@ -0,0 +1,1459 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_MathTrig
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_MathTrig
+{
+    //
+    //    Private method to return an array of the factors of the input value
+    //
+    private static function factors($value)
+    {
+        $startVal = floor(sqrt($value));
+
+        $factorArray = array();
+        for ($i = $startVal; $i > 1; --$i) {
+            if (($value % $i) == 0) {
+                $factorArray = array_merge($factorArray, self::factors($value / $i));
+                $factorArray = array_merge($factorArray, self::factors($i));
+                if ($i <= sqrt($value)) {
+                    break;
+                }
+            }
+        }
+        if (!empty($factorArray)) {
+            rsort($factorArray);
+            return $factorArray;
+        } else {
+            return array((integer) $value);
+        }
+    }
+
+
+    private static function romanCut($num, $n)
+    {
+        return ($num - ($num % $n ) ) / $n;
+    }
+
+
+    /**
+     * ATAN2
+     *
+     * This function calculates the arc tangent of the two variables x and y. It is similar to
+     *        calculating the arc tangent of y ÷ x, except that the signs of both arguments are used
+     *        to determine the quadrant of the result.
+     * The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
+     *        point with coordinates (xCoordinate, yCoordinate). The angle is given in radians between
+     *        -pi and pi, excluding -pi.
+     *
+     * Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
+     *        PHP atan2() function, so we need to reverse them here before calling the PHP atan() function.
+     *
+     * Excel Function:
+     *        ATAN2(xCoordinate,yCoordinate)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $xCoordinate        The x-coordinate of the point.
+     * @param    float    $yCoordinate        The y-coordinate of the point.
+     * @return    float    The inverse tangent of the specified x- and y-coordinates.
+     */
+    public static function ATAN2($xCoordinate = null, $yCoordinate = null)
+    {
+        $xCoordinate = PHPExcel_Calculation_Functions::flattenSingleValue($xCoordinate);
+        $yCoordinate = PHPExcel_Calculation_Functions::flattenSingleValue($yCoordinate);
+
+        $xCoordinate = ($xCoordinate !== null) ? $xCoordinate : 0.0;
+        $yCoordinate = ($yCoordinate !== null) ? $yCoordinate : 0.0;
+
+        if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
+            ((is_numeric($yCoordinate)))  || (is_bool($yCoordinate))) {
+            $xCoordinate    = (float) $xCoordinate;
+            $yCoordinate    = (float) $yCoordinate;
+
+            if (($xCoordinate == 0) && ($yCoordinate == 0)) {
+                return PHPExcel_Calculation_Functions::DIV0();
+            }
+
+            return atan2($yCoordinate, $xCoordinate);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * CEILING
+     *
+     * Returns number rounded up, away from zero, to the nearest multiple of significance.
+     *        For example, if you want to avoid using pennies in your prices and your product is
+     *        priced at $4.42, use the formula =CEILING(4.42,0.05) to round prices up to the
+     *        nearest nickel.
+     *
+     * Excel Function:
+     *        CEILING(number[,significance])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $number            The number you want to round.
+     * @param    float    $significance    The multiple to which you want to round.
+     * @return    float    Rounded Number
+     */
+    public static function CEILING($number, $significance = null)
+    {
+        $number       = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $significance = PHPExcel_Calculation_Functions::flattenSingleValue($significance);
+
+        if ((is_null($significance)) &&
+            (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
+            $significance = $number / abs($number);
+        }
+
+        if ((is_numeric($number)) && (is_numeric($significance))) {
+            if (($number == 0.0 ) || ($significance == 0.0)) {
+                return 0.0;
+            } elseif (self::SIGN($number) == self::SIGN($significance)) {
+                return ceil($number / $significance) * $significance;
+            } else {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * COMBIN
+     *
+     * Returns the number of combinations for a given number of items. Use COMBIN to
+     *        determine the total possible number of groups for a given number of items.
+     *
+     * Excel Function:
+     *        COMBIN(numObjs,numInSet)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    int        $numObjs    Number of different objects
+     * @param    int        $numInSet    Number of objects in each combination
+     * @return    int        Number of combinations
+     */
+    public static function COMBIN($numObjs, $numInSet)
+    {
+        $numObjs    = PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
+        $numInSet    = PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
+
+        if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
+            if ($numObjs < $numInSet) {
+                return PHPExcel_Calculation_Functions::NaN();
+            } elseif ($numInSet < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return round(self::FACT($numObjs) / self::FACT($numObjs - $numInSet)) / self::FACT($numInSet);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * EVEN
+     *
+     * Returns number rounded up to the nearest even integer.
+     * You can use this function for processing items that come in twos. For example,
+     *        a packing crate accepts rows of one or two items. The crate is full when
+     *        the number of items, rounded up to the nearest two, matches the crate's
+     *        capacity.
+     *
+     * Excel Function:
+     *        EVEN(number)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $number            Number to round
+     * @return    int        Rounded Number
+     */
+    public static function EVEN($number)
+    {
+        $number = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+
+        if (is_null($number)) {
+            return 0;
+        } elseif (is_bool($number)) {
+            $number = (int) $number;
+        }
+
+        if (is_numeric($number)) {
+            $significance = 2 * self::SIGN($number);
+            return (int) self::CEILING($number, $significance);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FACT
+     *
+     * Returns the factorial of a number.
+     * The factorial of a number is equal to 1*2*3*...* number.
+     *
+     * Excel Function:
+     *        FACT(factVal)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $factVal    Factorial Value
+     * @return    int        Factorial
+     */
+    public static function FACT($factVal)
+    {
+        $factVal    = PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
+
+        if (is_numeric($factVal)) {
+            if ($factVal < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $factLoop = floor($factVal);
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                if ($factVal > $factLoop) {
+                    return PHPExcel_Calculation_Functions::NaN();
+                }
+            }
+
+            $factorial = 1;
+            while ($factLoop > 1) {
+                $factorial *= $factLoop--;
+            }
+            return $factorial ;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FACTDOUBLE
+     *
+     * Returns the double factorial of a number.
+     *
+     * Excel Function:
+     *        FACTDOUBLE(factVal)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $factVal    Factorial Value
+     * @return    int        Double Factorial
+     */
+    public static function FACTDOUBLE($factVal)
+    {
+        $factLoop    = PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
+
+        if (is_numeric($factLoop)) {
+            $factLoop    = floor($factLoop);
+            if ($factVal < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $factorial = 1;
+            while ($factLoop > 1) {
+                $factorial *= $factLoop--;
+                --$factLoop;
+            }
+            return $factorial ;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FLOOR
+     *
+     * Rounds number down, toward zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        FLOOR(number[,significance])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $number            Number to round
+     * @param    float    $significance    Significance
+     * @return    float    Rounded Number
+     */
+    public static function FLOOR($number, $significance = null)
+    {
+        $number            = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $significance    = PHPExcel_Calculation_Functions::flattenSingleValue($significance);
+
+        if ((is_null($significance)) &&
+            (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
+            $significance = $number/abs($number);
+        }
+
+        if ((is_numeric($number)) && (is_numeric($significance))) {
+            if ($significance == 0.0) {
+                return PHPExcel_Calculation_Functions::DIV0();
+            } elseif ($number == 0.0) {
+                return 0.0;
+            } elseif (self::SIGN($number) == self::SIGN($significance)) {
+                return floor($number / $significance) * $significance;
+            } else {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+        }
+
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * GCD
+     *
+     * Returns the greatest common divisor of a series of numbers.
+     * The greatest common divisor is the largest integer that divides both
+     *        number1 and number2 without a remainder.
+     *
+     * Excel Function:
+     *        GCD(number1[,number2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed    $arg,...        Data values
+     * @return    integer                    Greatest Common Divisor
+     */
+    public static function GCD()
+    {
+        $returnValue = 1;
+        $allValuesFactors = array();
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
+            if (!is_numeric($value)) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            } elseif ($value == 0) {
+                continue;
+            } elseif ($value < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $myFactors = self::factors($value);
+            $myCountedFactors = array_count_values($myFactors);
+            $allValuesFactors[] = $myCountedFactors;
+        }
+        $allValuesCount = count($allValuesFactors);
+        if ($allValuesCount == 0) {
+            return 0;
+        }
+
+        $mergedArray = $allValuesFactors[0];
+        for ($i=1; $i < $allValuesCount; ++$i) {
+            $mergedArray = array_intersect_key($mergedArray, $allValuesFactors[$i]);
+        }
+        $mergedArrayValues = count($mergedArray);
+        if ($mergedArrayValues == 0) {
+            return $returnValue;
+        } elseif ($mergedArrayValues > 1) {
+            foreach ($mergedArray as $mergedKey => $mergedValue) {
+                foreach ($allValuesFactors as $highestPowerTest) {
+                    foreach ($highestPowerTest as $testKey => $testValue) {
+                        if (($testKey == $mergedKey) && ($testValue < $mergedValue)) {
+                            $mergedArray[$mergedKey] = $testValue;
+                            $mergedValue = $testValue;
+                        }
+                    }
+                }
+            }
+
+            $returnValue = 1;
+            foreach ($mergedArray as $key => $value) {
+                $returnValue *= pow($key, $value);
+            }
+            return $returnValue;
+        } else {
+            $keys = array_keys($mergedArray);
+            $key = $keys[0];
+            $value = $mergedArray[$key];
+            foreach ($allValuesFactors as $testValue) {
+                foreach ($testValue as $mergedKey => $mergedValue) {
+                    if (($mergedKey == $key) && ($mergedValue < $value)) {
+                        $value = $mergedValue;
+                    }
+                }
+            }
+            return pow($key, $value);
+        }
+    }
+
+
+    /**
+     * INT
+     *
+     * Casts a floating point value to an integer
+     *
+     * Excel Function:
+     *        INT(number)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $number            Number to cast to an integer
+     * @return    integer    Integer value
+     */
+    public static function INT($number)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+
+        if (is_null($number)) {
+            return 0;
+        } elseif (is_bool($number)) {
+            return (int) $number;
+        }
+        if (is_numeric($number)) {
+            return (int) floor($number);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * LCM
+     *
+     * Returns the lowest common multiplier of a series of numbers
+     * The least common multiple is the smallest positive integer that is a multiple
+     * of all integer arguments number1, number2, and so on. Use LCM to add fractions
+     * with different denominators.
+     *
+     * Excel Function:
+     *        LCM(number1[,number2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed    $arg,...        Data values
+     * @return    int        Lowest Common Multiplier
+     */
+    public static function LCM()
+    {
+        $returnValue = 1;
+        $allPoweredFactors = array();
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
+            if (!is_numeric($value)) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+            if ($value == 0) {
+                return 0;
+            } elseif ($value < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $myFactors = self::factors(floor($value));
+            $myCountedFactors = array_count_values($myFactors);
+            $myPoweredFactors = array();
+            foreach ($myCountedFactors as $myCountedFactor => $myCountedPower) {
+                $myPoweredFactors[$myCountedFactor] = pow($myCountedFactor, $myCountedPower);
+            }
+            foreach ($myPoweredFactors as $myPoweredValue => $myPoweredFactor) {
+                if (array_key_exists($myPoweredValue, $allPoweredFactors)) {
+                    if ($allPoweredFactors[$myPoweredValue] < $myPoweredFactor) {
+                        $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
+                    }
+                } else {
+                    $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
+                }
+            }
+        }
+        foreach ($allPoweredFactors as $allPoweredFactor) {
+            $returnValue *= (integer) $allPoweredFactor;
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * LOG_BASE
+     *
+     * Returns the logarithm of a number to a specified base. The default base is 10.
+     *
+     * Excel Function:
+     *        LOG(number[,base])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    float    $number        The positive real number for which you want the logarithm
+     * @param    float    $base        The base of the logarithm. If base is omitted, it is assumed to be 10.
+     * @return    float
+     */
+    public static function LOG_BASE($number = null, $base = 10)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $base    = (is_null($base)) ? 10 : (float) PHPExcel_Calculation_Functions::flattenSingleValue($base);
+
+        if ((!is_numeric($base)) || (!is_numeric($number))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (($base <= 0) || ($number <= 0)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return log($number, $base);
+    }
+
+
+    /**
+     * MDETERM
+     *
+     * Returns the matrix determinant of an array.
+     *
+     * Excel Function:
+     *        MDETERM(array)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    array    $matrixValues    A matrix of values
+     * @return    float
+     */
+    public static function MDETERM($matrixValues)
+    {
+        $matrixData = array();
+        if (!is_array($matrixValues)) {
+            $matrixValues = array(array($matrixValues));
+        }
+
+        $row = $maxColumn = 0;
+        foreach ($matrixValues as $matrixRow) {
+            if (!is_array($matrixRow)) {
+                $matrixRow = array($matrixRow);
+            }
+            $column = 0;
+            foreach ($matrixRow as $matrixCell) {
+                if ((is_string($matrixCell)) || ($matrixCell === null)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                $matrixData[$column][$row] = $matrixCell;
+                ++$column;
+            }
+            if ($column > $maxColumn) {
+                $maxColumn = $column;
+            }
+            ++$row;
+        }
+        if ($row != $maxColumn) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        try {
+            $matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
+            return $matrix->det();
+        } catch (PHPExcel_Exception $ex) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+    }
+
+
+    /**
+     * MINVERSE
+     *
+     * Returns the inverse matrix for the matrix stored in an array.
+     *
+     * Excel Function:
+     *        MINVERSE(array)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    array    $matrixValues    A matrix of values
+     * @return    array
+     */
+    public static function MINVERSE($matrixValues)
+    {
+        $matrixData = array();
+        if (!is_array($matrixValues)) {
+            $matrixValues = array(array($matrixValues));
+        }
+
+        $row = $maxColumn = 0;
+        foreach ($matrixValues as $matrixRow) {
+            if (!is_array($matrixRow)) {
+                $matrixRow = array($matrixRow);
+            }
+            $column = 0;
+            foreach ($matrixRow as $matrixCell) {
+                if ((is_string($matrixCell)) || ($matrixCell === null)) {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                $matrixData[$column][$row] = $matrixCell;
+                ++$column;
+            }
+            if ($column > $maxColumn) {
+                $maxColumn = $column;
+            }
+            ++$row;
+        }
+        if ($row != $maxColumn) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        try {
+            $matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
+            return $matrix->inverse()->getArray();
+        } catch (PHPExcel_Exception $ex) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+    }
+
+
+    /**
+     * MMULT
+     *
+     * @param    array    $matrixData1    A matrix of values
+     * @param    array    $matrixData2    A matrix of values
+     * @return    array
+     */
+    public static function MMULT($matrixData1, $matrixData2)
+    {
+        $matrixAData = $matrixBData = array();
+        if (!is_array($matrixData1)) {
+            $matrixData1 = array(array($matrixData1));
+        }
+        if (!is_array($matrixData2)) {
+            $matrixData2 = array(array($matrixData2));
+        }
+
+        try {
+            $rowA = 0;
+            foreach ($matrixData1 as $matrixRow) {
+                if (!is_array($matrixRow)) {
+                    $matrixRow = array($matrixRow);
+                }
+                $columnA = 0;
+                foreach ($matrixRow as $matrixCell) {
+                    if ((!is_numeric($matrixCell)) || ($matrixCell === null)) {
+                        return PHPExcel_Calculation_Functions::VALUE();
+                    }
+                    $matrixAData[$rowA][$columnA] = $matrixCell;
+                    ++$columnA;
+                }
+                ++$rowA;
+            }
+            $matrixA = new PHPExcel_Shared_JAMA_Matrix($matrixAData);
+            $rowB = 0;
+            foreach ($matrixData2 as $matrixRow) {
+                if (!is_array($matrixRow)) {
+                    $matrixRow = array($matrixRow);
+                }
+                $columnB = 0;
+                foreach ($matrixRow as $matrixCell) {
+                    if ((!is_numeric($matrixCell)) || ($matrixCell === null)) {
+                        return PHPExcel_Calculation_Functions::VALUE();
+                    }
+                    $matrixBData[$rowB][$columnB] = $matrixCell;
+                    ++$columnB;
+                }
+                ++$rowB;
+            }
+            $matrixB = new PHPExcel_Shared_JAMA_Matrix($matrixBData);
+
+            if ($columnA != $rowB) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+
+            return $matrixA->times($matrixB)->getArray();
+        } catch (PHPExcel_Exception $ex) {
+            var_dump($ex->getMessage());
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+    }
+
+
+    /**
+     * MOD
+     *
+     * @param    int        $a        Dividend
+     * @param    int        $b        Divisor
+     * @return    int        Remainder
+     */
+    public static function MOD($a = 1, $b = 1)
+    {
+        $a = PHPExcel_Calculation_Functions::flattenSingleValue($a);
+        $b = PHPExcel_Calculation_Functions::flattenSingleValue($b);
+
+        if ($b == 0.0) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        } elseif (($a < 0.0) && ($b > 0.0)) {
+            return $b - fmod(abs($a), $b);
+        } elseif (($a > 0.0) && ($b < 0.0)) {
+            return $b + fmod($a, abs($b));
+        }
+
+        return fmod($a, $b);
+    }
+
+
+    /**
+     * MROUND
+     *
+     * Rounds a number to the nearest multiple of a specified value
+     *
+     * @param    float    $number            Number to round
+     * @param    int        $multiple        Multiple to which you want to round $number
+     * @return    float    Rounded Number
+     */
+    public static function MROUND($number, $multiple)
+    {
+        $number   = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $multiple = PHPExcel_Calculation_Functions::flattenSingleValue($multiple);
+
+        if ((is_numeric($number)) && (is_numeric($multiple))) {
+            if ($multiple == 0) {
+                return 0;
+            }
+            if ((self::SIGN($number)) == (self::SIGN($multiple))) {
+                $multiplier = 1 / $multiple;
+                return round($number * $multiplier) / $multiplier;
+            }
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * MULTINOMIAL
+     *
+     * Returns the ratio of the factorial of a sum of values to the product of factorials.
+     *
+     * @param    array of mixed        Data Series
+     * @return    float
+     */
+    public static function MULTINOMIAL()
+    {
+        $summer = 0;
+        $divisor = 1;
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
+            // Is it a numeric value?
+            if (is_numeric($arg)) {
+                if ($arg < 1) {
+                    return PHPExcel_Calculation_Functions::NaN();
+                }
+                $summer += floor($arg);
+                $divisor *= self::FACT($arg);
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+
+        // Return
+        if ($summer > 0) {
+            $summer = self::FACT($summer);
+            return $summer / $divisor;
+        }
+        return 0;
+    }
+
+
+    /**
+     * ODD
+     *
+     * Returns number rounded up to the nearest odd integer.
+     *
+     * @param    float    $number            Number to round
+     * @return    int        Rounded Number
+     */
+    public static function ODD($number)
+    {
+        $number = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+
+        if (is_null($number)) {
+            return 1;
+        } elseif (is_bool($number)) {
+            return 1;
+        } elseif (is_numeric($number)) {
+            $significance = self::SIGN($number);
+            if ($significance == 0) {
+                return 1;
+            }
+
+            $result = self::CEILING($number, $significance);
+            if ($result == self::EVEN($result)) {
+                $result += $significance;
+            }
+
+            return (int) $result;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * POWER
+     *
+     * Computes x raised to the power y.
+     *
+     * @param    float        $x
+     * @param    float        $y
+     * @return    float
+     */
+    public static function POWER($x = 0, $y = 2)
+    {
+        $x    = PHPExcel_Calculation_Functions::flattenSingleValue($x);
+        $y    = PHPExcel_Calculation_Functions::flattenSingleValue($y);
+
+        // Validate parameters
+        if ($x == 0.0 && $y == 0.0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        } elseif ($x == 0.0 && $y < 0.0) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        // Return
+        $result = pow($x, $y);
+        return (!is_nan($result) && !is_infinite($result)) ? $result : PHPExcel_Calculation_Functions::NaN();
+    }
+
+
+    /**
+     * PRODUCT
+     *
+     * PRODUCT returns the product of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        PRODUCT(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function PRODUCT()
+    {
+        // Return value
+        $returnValue = null;
+
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if (is_null($returnValue)) {
+                    $returnValue = $arg;
+                } else {
+                    $returnValue *= $arg;
+                }
+            }
+        }
+
+        // Return
+        if (is_null($returnValue)) {
+            return 0;
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * QUOTIENT
+     *
+     * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
+     *        and denominator is the divisor.
+     *
+     * Excel Function:
+     *        QUOTIENT(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function QUOTIENT()
+    {
+        // Return value
+        $returnValue = null;
+
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if (is_null($returnValue)) {
+                    $returnValue = ($arg == 0) ? 0 : $arg;
+                } else {
+                    if (($returnValue == 0) || ($arg == 0)) {
+                        $returnValue = 0;
+                    } else {
+                        $returnValue /= $arg;
+                    }
+                }
+            }
+        }
+
+        // Return
+        return intval($returnValue);
+    }
+
+
+    /**
+     * RAND
+     *
+     * @param    int        $min    Minimal value
+     * @param    int        $max    Maximal value
+     * @return    int        Random number
+     */
+    public static function RAND($min = 0, $max = 0)
+    {
+        $min = PHPExcel_Calculation_Functions::flattenSingleValue($min);
+        $max = PHPExcel_Calculation_Functions::flattenSingleValue($max);
+
+        if ($min == 0 && $max == 0) {
+            return (mt_rand(0, 10000000)) / 10000000;
+        } else {
+            return mt_rand($min, $max);
+        }
+    }
+
+
+    public static function ROMAN($aValue, $style = 0)
+    {
+        $aValue    = PHPExcel_Calculation_Functions::flattenSingleValue($aValue);
+        $style    = (is_null($style))    ? 0 :    (integer) PHPExcel_Calculation_Functions::flattenSingleValue($style);
+        if ((!is_numeric($aValue)) || ($aValue < 0) || ($aValue >= 4000)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $aValue = (integer) $aValue;
+        if ($aValue == 0) {
+            return '';
+        }
+
+        $mill = array('', 'M', 'MM', 'MMM', 'MMMM', 'MMMMM');
+        $cent = array('', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM');
+        $tens = array('', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC');
+        $ones = array('', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX');
+
+        $roman = '';
+        while ($aValue > 5999) {
+            $roman .= 'M';
+            $aValue -= 1000;
+        }
+        $m = self::romanCut($aValue, 1000);
+        $aValue %= 1000;
+        $c = self::romanCut($aValue, 100);
+        $aValue %= 100;
+        $t = self::romanCut($aValue, 10);
+        $aValue %= 10;
+
+        return $roman.$mill[$m].$cent[$c].$tens[$t].$ones[$aValue];
+    }
+
+
+    /**
+     * ROUNDUP
+     *
+     * Rounds a number up to a specified number of decimal places
+     *
+     * @param    float    $number            Number to round
+     * @param    int        $digits            Number of digits to which you want to round $number
+     * @return    float    Rounded Number
+     */
+    public static function ROUNDUP($number, $digits)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $digits    = PHPExcel_Calculation_Functions::flattenSingleValue($digits);
+
+        if ((is_numeric($number)) && (is_numeric($digits))) {
+            $significance = pow(10, (int) $digits);
+            if ($number < 0.0) {
+                return floor($number * $significance) / $significance;
+            } else {
+                return ceil($number * $significance) / $significance;
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * ROUNDDOWN
+     *
+     * Rounds a number down to a specified number of decimal places
+     *
+     * @param    float    $number            Number to round
+     * @param    int        $digits            Number of digits to which you want to round $number
+     * @return    float    Rounded Number
+     */
+    public static function ROUNDDOWN($number, $digits)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+        $digits    = PHPExcel_Calculation_Functions::flattenSingleValue($digits);
+
+        if ((is_numeric($number)) && (is_numeric($digits))) {
+            $significance = pow(10, (int) $digits);
+            if ($number < 0.0) {
+                return ceil($number * $significance) / $significance;
+            } else {
+                return floor($number * $significance) / $significance;
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SERIESSUM
+     *
+     * Returns the sum of a power series
+     *
+     * @param    float            $x    Input value to the power series
+     * @param    float            $n    Initial power to which you want to raise $x
+     * @param    float            $m    Step by which to increase $n for each term in the series
+     * @param    array of mixed        Data Series
+     * @return    float
+     */
+    public static function SERIESSUM()
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        $x = array_shift($aArgs);
+        $n = array_shift($aArgs);
+        $m = array_shift($aArgs);
+
+        if ((is_numeric($x)) && (is_numeric($n)) && (is_numeric($m))) {
+            // Calculate
+            $i = 0;
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $returnValue += $arg * pow($x, $n + ($m * $i++));
+                } else {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+            }
+            return $returnValue;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SIGN
+     *
+     * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
+     *        if the number is 0, and -1 if the number is negative.
+     *
+     * @param    float    $number            Number to round
+     * @return    int        sign value
+     */
+    public static function SIGN($number)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+
+        if (is_bool($number)) {
+            return (int) $number;
+        }
+        if (is_numeric($number)) {
+            if ($number == 0.0) {
+                return 0;
+            }
+            return $number / abs($number);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SQRTPI
+     *
+     * Returns the square root of (number * pi).
+     *
+     * @param    float    $number        Number
+     * @return    float    Square Root of Number * Pi
+     */
+    public static function SQRTPI($number)
+    {
+        $number    = PHPExcel_Calculation_Functions::flattenSingleValue($number);
+
+        if (is_numeric($number)) {
+            if ($number < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return sqrt($number * M_PI) ;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SUBTOTAL
+     *
+     * Returns a subtotal in a list or database.
+     *
+     * @param    int        the number 1 to 11 that specifies which function to
+     *                    use in calculating subtotals within a list.
+     * @param    array of mixed        Data Series
+     * @return    float
+     */
+    public static function SUBTOTAL()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $subtotal = array_shift($aArgs);
+
+        if ((is_numeric($subtotal)) && (!is_string($subtotal))) {
+            switch ($subtotal) {
+                case 1:
+                    return PHPExcel_Calculation_Statistical::AVERAGE($aArgs);
+                case 2:
+                    return PHPExcel_Calculation_Statistical::COUNT($aArgs);
+                case 3:
+                    return PHPExcel_Calculation_Statistical::COUNTA($aArgs);
+                case 4:
+                    return PHPExcel_Calculation_Statistical::MAX($aArgs);
+                case 5:
+                    return PHPExcel_Calculation_Statistical::MIN($aArgs);
+                case 6:
+                    return self::PRODUCT($aArgs);
+                case 7:
+                    return PHPExcel_Calculation_Statistical::STDEV($aArgs);
+                case 8:
+                    return PHPExcel_Calculation_Statistical::STDEVP($aArgs);
+                case 9:
+                    return self::SUM($aArgs);
+                case 10:
+                    return PHPExcel_Calculation_Statistical::VARFunc($aArgs);
+                case 11:
+                    return PHPExcel_Calculation_Statistical::VARP($aArgs);
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SUM
+     *
+     * SUM computes the sum of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        SUM(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function SUM()
+    {
+        $returnValue = 0;
+
+        // Loop through the arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue += $arg;
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * SUMIF
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        SUMIF(value1[,value2[, ...]],condition)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    string        $condition        The criteria that defines which cells will be summed.
+     * @return    float
+     */
+    public static function SUMIF($aArgs, $condition, $sumArgs = array())
+    {
+        $returnValue = 0;
+
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
+        $sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
+        if (empty($sumArgs)) {
+            $sumArgs = $aArgs;
+        }
+        $condition = PHPExcel_Calculation_Functions::ifCondition($condition);
+        // Loop through arguments
+        foreach ($aArgs as $key => $arg) {
+            if (!is_numeric($arg)) {
+                $arg = str_replace('"', '""', $arg);
+                $arg = PHPExcel_Calculation::wrapResult(strtoupper($arg));
+            }
+
+            $testCondition = '='.$arg.$condition;
+            if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+                // Is it a value within our criteria
+                $returnValue += $sumArgs[$key];
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+ 	/**
+	 *	SUMIFS
+	 *
+	 *	Counts the number of cells that contain numbers within the list of arguments
+	 *
+	 *	Excel Function:
+	 *		SUMIFS(value1[,value2[, ...]],condition)
+	 *
+	 *	@access	public
+	 *	@category Mathematical and Trigonometric Functions
+	 *	@param	mixed		$arg,...		Data values
+	 *	@param	string		$condition		The criteria that defines which cells will be summed.
+	 *	@return	float
+	 */
+	public static function SUMIFS() {
+		$arrayList = func_get_args();
+
+		$sumArgs = PHPExcel_Calculation_Functions::flattenArray(array_shift($arrayList));
+
+        while (count($arrayList) > 0) {
+            $aArgsArray[] = PHPExcel_Calculation_Functions::flattenArray(array_shift($arrayList));
+            $conditions[] = PHPExcel_Calculation_Functions::ifCondition(array_shift($arrayList));
+        }
+
+        // Loop through each set of arguments and conditions
+        foreach ($conditions as $index => $condition) {
+            $aArgs = $aArgsArray[$index];
+            $wildcard = false;
+            if ((strpos($condition, '*') !== false) || (strpos($condition, '?') !== false)) {
+                // * and ? are wildcard characters.
+                // Use ~* and ~? for literal star and question mark
+                // Code logic doesn't yet handle escaping
+                $condition = trim(ltrim($condition, '=<>'), '"');
+                $wildcard = true;
+            }
+            // Loop through arguments
+            foreach ($aArgs as $key => $arg) {
+                if ($wildcard) {
+                    if (!fnmatch($condition, $arg, FNM_CASEFOLD)) {
+                        // Is it a value within our criteria
+                        $sumArgs[$key] = 0.0;
+                    }
+                } else {
+                    if (!is_numeric($arg)) {
+                        $arg = PHPExcel_Calculation::wrapResult(strtoupper($arg));
+                    }
+                    $testCondition = '='.$arg.$condition;
+                    if (!PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+                        // Is it a value within our criteria
+                        $sumArgs[$key] = 0.0;
+                    }
+                }
+            }
+        }
+
+		// Return
+		return array_sum($sumArgs);
+	}
+
+
+    /**
+     * SUMPRODUCT
+     *
+     * Excel Function:
+     *        SUMPRODUCT(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function SUMPRODUCT()
+    {
+        $arrayList = func_get_args();
+
+        $wrkArray = PHPExcel_Calculation_Functions::flattenArray(array_shift($arrayList));
+        $wrkCellCount = count($wrkArray);
+
+        for ($i=0; $i< $wrkCellCount; ++$i) {
+            if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
+                $wrkArray[$i] = 0;
+            }
+        }
+
+        foreach ($arrayList as $matrixData) {
+            $array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData);
+            $count = count($array2);
+            if ($wrkCellCount != $count) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+
+            foreach ($array2 as $i => $val) {
+                if ((!is_numeric($val)) || (is_string($val))) {
+                    $val = 0;
+                }
+                $wrkArray[$i] *= $val;
+            }
+        }
+
+        return array_sum($wrkArray);
+    }
+
+
+    /**
+     * SUMSQ
+     *
+     * SUMSQ returns the sum of the squares of the arguments
+     *
+     * Excel Function:
+     *        SUMSQ(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function SUMSQ()
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue += ($arg * $arg);
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * SUMX2MY2
+     *
+     * @param    mixed[]    $matrixData1    Matrix #1
+     * @param    mixed[]    $matrixData2    Matrix #2
+     * @return    float
+     */
+    public static function SUMX2MY2($matrixData1, $matrixData2)
+    {
+        $array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
+        $array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
+        $count = min(count($array1), count($array2));
+
+        $result = 0;
+        for ($i = 0; $i < $count; ++$i) {
+            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
+                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
+                $result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
+            }
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * SUMX2PY2
+     *
+     * @param    mixed[]    $matrixData1    Matrix #1
+     * @param    mixed[]    $matrixData2    Matrix #2
+     * @return    float
+     */
+    public static function SUMX2PY2($matrixData1, $matrixData2)
+    {
+        $array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
+        $array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
+        $count = min(count($array1), count($array2));
+
+        $result = 0;
+        for ($i = 0; $i < $count; ++$i) {
+            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
+                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
+                $result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
+            }
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * SUMXMY2
+     *
+     * @param    mixed[]    $matrixData1    Matrix #1
+     * @param    mixed[]    $matrixData2    Matrix #2
+     * @return    float
+     */
+    public static function SUMXMY2($matrixData1, $matrixData2)
+    {
+        $array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
+        $array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
+        $count = min(count($array1), count($array2));
+
+        $result = 0;
+        for ($i = 0; $i < $count; ++$i) {
+            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
+                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
+                $result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
+            }
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * TRUNC
+     *
+     * Truncates value to the number of fractional digits by number_digits.
+     *
+     * @param    float        $value
+     * @param    int            $digits
+     * @return    float        Truncated value
+     */
+    public static function TRUNC($value = 0, $digits = 0)
+    {
+        $value    = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $digits    = PHPExcel_Calculation_Functions::flattenSingleValue($digits);
+
+        // Validate parameters
+        if ((!is_numeric($value)) || (!is_numeric($digits))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $digits = floor($digits);
+
+        // Truncate
+        $adjust = pow(10, $digits);
+
+        if (($digits > 0) && (rtrim(intval((abs($value) - abs(intval($value))) * $adjust), '0') < $adjust/10)) {
+            return $value;
+        }
+
+        return (intval($value * $adjust)) / $adjust;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Statistical.php b/lib/PHPExcel/Calculation/Statistical.php
new file mode 100644
index 000000000..1a33610fc
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Statistical.php
@@ -0,0 +1,3745 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/trendClass.php';
+
+
+/** LOG_GAMMA_X_MAX_VALUE */
+define('LOG_GAMMA_X_MAX_VALUE', 2.55e305);
+
+/** XMININ */
+define('XMININ', 2.23e-308);
+
+/** EPS */
+define('EPS', 2.22e-16);
+
+/** SQRT2PI */
+define('SQRT2PI', 2.5066282746310005024157652848110452530069867406099);
+
+/**
+ * PHPExcel_Calculation_Statistical
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Statistical
+{
+    private static function checkTrendArrays(&$array1, &$array2)
+    {
+        if (!is_array($array1)) {
+            $array1 = array($array1);
+        }
+        if (!is_array($array2)) {
+            $array2 = array($array2);
+        }
+
+        $array1 = PHPExcel_Calculation_Functions::flattenArray($array1);
+        $array2 = PHPExcel_Calculation_Functions::flattenArray($array2);
+        foreach ($array1 as $key => $value) {
+            if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
+                unset($array1[$key]);
+                unset($array2[$key]);
+            }
+        }
+        foreach ($array2 as $key => $value) {
+            if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
+                unset($array1[$key]);
+                unset($array2[$key]);
+            }
+        }
+        $array1 = array_merge($array1);
+        $array2 = array_merge($array2);
+
+        return true;
+    }
+
+
+    /**
+     * Beta function.
+     *
+     * @author Jaco van Kooten
+     *
+     * @param p require p>0
+     * @param q require q>0
+     * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+     */
+    private static function beta($p, $q)
+    {
+        if ($p <= 0.0 || $q <= 0.0 || ($p + $q) > LOG_GAMMA_X_MAX_VALUE) {
+            return 0.0;
+        } else {
+            return exp(self::logBeta($p, $q));
+        }
+    }
+
+
+    /**
+     * Incomplete beta function
+     *
+     * @author Jaco van Kooten
+     * @author Paul Meagher
+     *
+     * The computation is based on formulas from Numerical Recipes, Chapter 6.4 (W.H. Press et al, 1992).
+     * @param x require 0<=x<=1
+     * @param p require p>0
+     * @param q require q>0
+     * @return 0 if x<0, p<=0, q<=0 or p+q>2.55E305 and 1 if x>1 to avoid errors and over/underflow
+     */
+    private static function incompleteBeta($x, $p, $q)
+    {
+        if ($x <= 0.0) {
+            return 0.0;
+        } elseif ($x >= 1.0) {
+            return 1.0;
+        } elseif (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > LOG_GAMMA_X_MAX_VALUE)) {
+            return 0.0;
+        }
+        $beta_gam = exp((0 - self::logBeta($p, $q)) + $p * log($x) + $q * log(1.0 - $x));
+        if ($x < ($p + 1.0) / ($p + $q + 2.0)) {
+            return $beta_gam * self::betaFraction($x, $p, $q) / $p;
+        } else {
+            return 1.0 - ($beta_gam * self::betaFraction(1 - $x, $q, $p) / $q);
+        }
+    }
+
+
+    // Function cache for logBeta function
+    private static $logBetaCacheP      = 0.0;
+    private static $logBetaCacheQ      = 0.0;
+    private static $logBetaCacheResult = 0.0;
+
+    /**
+     * The natural logarithm of the beta function.
+     *
+     * @param p require p>0
+     * @param q require q>0
+     * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+     * @author Jaco van Kooten
+     */
+    private static function logBeta($p, $q)
+    {
+        if ($p != self::$logBetaCacheP || $q != self::$logBetaCacheQ) {
+            self::$logBetaCacheP = $p;
+            self::$logBetaCacheQ = $q;
+            if (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > LOG_GAMMA_X_MAX_VALUE)) {
+                self::$logBetaCacheResult = 0.0;
+            } else {
+                self::$logBetaCacheResult = self::logGamma($p) + self::logGamma($q) - self::logGamma($p + $q);
+            }
+        }
+        return self::$logBetaCacheResult;
+    }
+
+
+    /**
+     * Evaluates of continued fraction part of incomplete beta function.
+     * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
+     * @author Jaco van Kooten
+     */
+    private static function betaFraction($x, $p, $q)
+    {
+        $c = 1.0;
+        $sum_pq = $p + $q;
+        $p_plus = $p + 1.0;
+        $p_minus = $p - 1.0;
+        $h = 1.0 - $sum_pq * $x / $p_plus;
+        if (abs($h) < XMININ) {
+            $h = XMININ;
+        }
+        $h = 1.0 / $h;
+        $frac = $h;
+        $m     = 1;
+        $delta = 0.0;
+        while ($m <= MAX_ITERATIONS && abs($delta-1.0) > PRECISION) {
+            $m2 = 2 * $m;
+            // even index for d
+            $d = $m * ($q - $m) * $x / ( ($p_minus + $m2) * ($p + $m2));
+            $h = 1.0 + $d * $h;
+            if (abs($h) < XMININ) {
+                $h = XMININ;
+            }
+            $h = 1.0 / $h;
+            $c = 1.0 + $d / $c;
+            if (abs($c) < XMININ) {
+                $c = XMININ;
+            }
+            $frac *= $h * $c;
+            // odd index for d
+            $d = -($p + $m) * ($sum_pq + $m) * $x / (($p + $m2) * ($p_plus + $m2));
+            $h = 1.0 + $d * $h;
+            if (abs($h) < XMININ) {
+                $h = XMININ;
+            }
+            $h = 1.0 / $h;
+            $c = 1.0 + $d / $c;
+            if (abs($c) < XMININ) {
+                $c = XMININ;
+            }
+            $delta = $h * $c;
+            $frac *= $delta;
+            ++$m;
+        }
+        return $frac;
+    }
+
+
+    /**
+     * logGamma function
+     *
+     * @version 1.1
+     * @author Jaco van Kooten
+     *
+     * Original author was Jaco van Kooten. Ported to PHP by Paul Meagher.
+     *
+     * The natural logarithm of the gamma function. <br />
+     * Based on public domain NETLIB (Fortran) code by W. J. Cody and L. Stoltz <br />
+     * Applied Mathematics Division <br />
+     * Argonne National Laboratory <br />
+     * Argonne, IL 60439 <br />
+     * <p>
+     * References:
+     * <ol>
+     * <li>W. J. Cody and K. E. Hillstrom, 'Chebyshev Approximations for the Natural
+     *     Logarithm of the Gamma Function,' Math. Comp. 21, 1967, pp. 198-203.</li>
+     * <li>K. E. Hillstrom, ANL/AMD Program ANLC366S, DGAMMA/DLGAMA, May, 1969.</li>
+     * <li>Hart, Et. Al., Computer Approximations, Wiley and sons, New York, 1968.</li>
+     * </ol>
+     * </p>
+     * <p>
+     * From the original documentation:
+     * </p>
+     * <p>
+     * This routine calculates the LOG(GAMMA) function for a positive real argument X.
+     * Computation is based on an algorithm outlined in references 1 and 2.
+     * The program uses rational functions that theoretically approximate LOG(GAMMA)
+     * to at least 18 significant decimal digits. The approximation for X > 12 is from
+     * reference 3, while approximations for X < 12.0 are similar to those in reference
+     * 1, but are unpublished. The accuracy achieved depends on the arithmetic system,
+     * the compiler, the intrinsic functions, and proper selection of the
+     * machine-dependent constants.
+     * </p>
+     * <p>
+     * Error returns: <br />
+     * The program returns the value XINF for X .LE. 0.0 or when overflow would occur.
+     * The computation is believed to be free of underflow and overflow.
+     * </p>
+     * @return MAX_VALUE for x < 0.0 or when overflow would occur, i.e. x > 2.55E305
+     */
+
+    // Function cache for logGamma
+    private static $logGammaCacheResult = 0.0;
+    private static $logGammaCacheX      = 0.0;
+
+    private static function logGamma($x)
+    {
+        // Log Gamma related constants
+        static $lg_d1 = -0.5772156649015328605195174;
+        static $lg_d2 = 0.4227843350984671393993777;
+        static $lg_d4 = 1.791759469228055000094023;
+
+        static $lg_p1 = array(
+            4.945235359296727046734888,
+            201.8112620856775083915565,
+            2290.838373831346393026739,
+            11319.67205903380828685045,
+            28557.24635671635335736389,
+            38484.96228443793359990269,
+            26377.48787624195437963534,
+            7225.813979700288197698961
+        );
+        static $lg_p2 = array(
+            4.974607845568932035012064,
+            542.4138599891070494101986,
+            15506.93864978364947665077,
+            184793.2904445632425417223,
+            1088204.76946882876749847,
+            3338152.967987029735917223,
+            5106661.678927352456275255,
+            3074109.054850539556250927
+        );
+        static $lg_p4 = array(
+            14745.02166059939948905062,
+            2426813.369486704502836312,
+            121475557.4045093227939592,
+            2663432449.630976949898078,
+            29403789566.34553899906876,
+            170266573776.5398868392998,
+            492612579337.743088758812,
+            560625185622.3951465078242
+        );
+        static $lg_q1 = array(
+            67.48212550303777196073036,
+            1113.332393857199323513008,
+            7738.757056935398733233834,
+            27639.87074403340708898585,
+            54993.10206226157329794414,
+            61611.22180066002127833352,
+            36351.27591501940507276287,
+            8785.536302431013170870835
+        );
+        static $lg_q2 = array(
+            183.0328399370592604055942,
+            7765.049321445005871323047,
+            133190.3827966074194402448,
+            1136705.821321969608938755,
+            5267964.117437946917577538,
+            13467014.54311101692290052,
+            17827365.30353274213975932,
+            9533095.591844353613395747
+        );
+        static $lg_q4 = array(
+            2690.530175870899333379843,
+            639388.5654300092398984238,
+            41355999.30241388052042842,
+            1120872109.61614794137657,
+            14886137286.78813811542398,
+            101680358627.2438228077304,
+            341747634550.7377132798597,
+            446315818741.9713286462081
+        );
+        static $lg_c  = array(
+            -0.001910444077728,
+            8.4171387781295e-4,
+            -5.952379913043012e-4,
+            7.93650793500350248e-4,
+            -0.002777777777777681622553,
+            0.08333333333333333331554247,
+            0.0057083835261
+        );
+
+        // Rough estimate of the fourth root of logGamma_xBig
+        static $lg_frtbig = 2.25e76;
+        static $pnt68     = 0.6796875;
+
+
+        if ($x == self::$logGammaCacheX) {
+            return self::$logGammaCacheResult;
+        }
+        $y = $x;
+        if ($y > 0.0 && $y <= LOG_GAMMA_X_MAX_VALUE) {
+            if ($y <= EPS) {
+                $res = -log(y);
+            } elseif ($y <= 1.5) {
+                // ---------------------
+                //    EPS .LT. X .LE. 1.5
+                // ---------------------
+                if ($y < $pnt68) {
+                    $corr = -log($y);
+                    $xm1 = $y;
+                } else {
+                    $corr = 0.0;
+                    $xm1 = $y - 1.0;
+                }
+                if ($y <= 0.5 || $y >= $pnt68) {
+                    $xden = 1.0;
+                    $xnum = 0.0;
+                    for ($i = 0; $i < 8; ++$i) {
+                        $xnum = $xnum * $xm1 + $lg_p1[$i];
+                        $xden = $xden * $xm1 + $lg_q1[$i];
+                    }
+                    $res = $corr + $xm1 * ($lg_d1 + $xm1 * ($xnum / $xden));
+                } else {
+                    $xm2 = $y - 1.0;
+                    $xden = 1.0;
+                    $xnum = 0.0;
+                    for ($i = 0; $i < 8; ++$i) {
+                        $xnum = $xnum * $xm2 + $lg_p2[$i];
+                        $xden = $xden * $xm2 + $lg_q2[$i];
+                    }
+                    $res = $corr + $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
+                }
+            } elseif ($y <= 4.0) {
+                // ---------------------
+                //    1.5 .LT. X .LE. 4.0
+                // ---------------------
+                $xm2 = $y - 2.0;
+                $xden = 1.0;
+                $xnum = 0.0;
+                for ($i = 0; $i < 8; ++$i) {
+                    $xnum = $xnum * $xm2 + $lg_p2[$i];
+                    $xden = $xden * $xm2 + $lg_q2[$i];
+                }
+                $res = $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
+            } elseif ($y <= 12.0) {
+                // ----------------------
+                //    4.0 .LT. X .LE. 12.0
+                // ----------------------
+                $xm4 = $y - 4.0;
+                $xden = -1.0;
+                $xnum = 0.0;
+                for ($i = 0; $i < 8; ++$i) {
+                    $xnum = $xnum * $xm4 + $lg_p4[$i];
+                    $xden = $xden * $xm4 + $lg_q4[$i];
+                }
+                $res = $lg_d4 + $xm4 * ($xnum / $xden);
+            } else {
+                // ---------------------------------
+                //    Evaluate for argument .GE. 12.0
+                // ---------------------------------
+                $res = 0.0;
+                if ($y <= $lg_frtbig) {
+                    $res = $lg_c[6];
+                    $ysq = $y * $y;
+                    for ($i = 0; $i < 6; ++$i) {
+                        $res = $res / $ysq + $lg_c[$i];
+                    }
+                    $res /= $y;
+                    $corr = log($y);
+                    $res = $res + log(SQRT2PI) - 0.5 * $corr;
+                    $res += $y * ($corr - 1.0);
+                }
+            }
+        } else {
+            // --------------------------
+            //    Return for bad arguments
+            // --------------------------
+            $res = MAX_VALUE;
+        }
+        // ------------------------------
+        //    Final adjustments and return
+        // ------------------------------
+        self::$logGammaCacheX = $x;
+        self::$logGammaCacheResult = $res;
+        return $res;
+    }
+
+
+    //
+    //    Private implementation of the incomplete Gamma function
+    //
+    private static function incompleteGamma($a, $x)
+    {
+        static $max = 32;
+        $summer = 0;
+        for ($n=0; $n<=$max; ++$n) {
+            $divisor = $a;
+            for ($i=1; $i<=$n; ++$i) {
+                $divisor *= ($a + $i);
+            }
+            $summer += (pow($x, $n) / $divisor);
+        }
+        return pow($x, $a) * exp(0-$x) * $summer;
+    }
+
+
+    //
+    //    Private implementation of the Gamma function
+    //
+    private static function gamma($data)
+    {
+        if ($data == 0.0) {
+            return 0;
+        }
+
+        static $p0 = 1.000000000190015;
+        static $p = array(
+            1 => 76.18009172947146,
+            2 => -86.50532032941677,
+            3 => 24.01409824083091,
+            4 => -1.231739572450155,
+            5 => 1.208650973866179e-3,
+            6 => -5.395239384953e-6
+        );
+
+        $y = $x = $data;
+        $tmp = $x + 5.5;
+        $tmp -= ($x + 0.5) * log($tmp);
+
+        $summer = $p0;
+        for ($j=1; $j<=6; ++$j) {
+            $summer += ($p[$j] / ++$y);
+        }
+        return exp(0 - $tmp + log(SQRT2PI * $summer / $x));
+    }
+
+
+    /***************************************************************************
+     *                                inverse_ncdf.php
+     *                            -------------------
+     *    begin                : Friday, January 16, 2004
+     *    copyright            : (C) 2004 Michael Nickerson
+     *    email                : nickersonm@yahoo.com
+     *
+     ***************************************************************************/
+    private static function inverseNcdf($p)
+    {
+        //    Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
+        //    PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
+        //    a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
+        //    I have not checked the accuracy of this implementation. Be aware that PHP
+        //    will truncate the coeficcients to 14 digits.
+
+        //    You have permission to use and distribute this function freely for
+        //    whatever purpose you want, but please show common courtesy and give credit
+        //    where credit is due.
+
+        //    Input paramater is $p - probability - where 0 < p < 1.
+
+        //    Coefficients in rational approximations
+        static $a = array(
+            1 => -3.969683028665376e+01,
+            2 => 2.209460984245205e+02,
+            3 => -2.759285104469687e+02,
+            4 => 1.383577518672690e+02,
+            5 => -3.066479806614716e+01,
+            6 => 2.506628277459239e+00
+        );
+
+        static $b = array(
+            1 => -5.447609879822406e+01,
+            2 => 1.615858368580409e+02,
+            3 => -1.556989798598866e+02,
+            4 => 6.680131188771972e+01,
+            5 => -1.328068155288572e+01
+        );
+
+        static $c = array(
+            1 => -7.784894002430293e-03,
+            2 => -3.223964580411365e-01,
+            3 => -2.400758277161838e+00,
+            4 => -2.549732539343734e+00,
+            5 => 4.374664141464968e+00,
+            6 => 2.938163982698783e+00
+        );
+
+        static $d = array(
+            1 => 7.784695709041462e-03,
+            2 => 3.224671290700398e-01,
+            3 => 2.445134137142996e+00,
+            4 => 3.754408661907416e+00
+        );
+
+        //    Define lower and upper region break-points.
+        $p_low = 0.02425;            //Use lower region approx. below this
+        $p_high = 1 - $p_low;        //Use upper region approx. above this
+
+        if (0 < $p && $p < $p_low) {
+            //    Rational approximation for lower region.
+            $q = sqrt(-2 * log($p));
+            return ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
+                    (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
+        } elseif ($p_low <= $p && $p <= $p_high) {
+            //    Rational approximation for central region.
+            $q = $p - 0.5;
+            $r = $q * $q;
+            return ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) * $r + $a[6]) * $q /
+                   ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r + $b[4]) * $r + $b[5]) * $r + 1);
+        } elseif ($p_high < $p && $p < 1) {
+            //    Rational approximation for upper region.
+            $q = sqrt(-2 * log(1 - $p));
+            return -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
+                     (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
+        }
+        //    If 0 < p < 1, return a null value
+        return PHPExcel_Calculation_Functions::NULL();
+    }
+
+
+    private static function inverseNcdf2($prob)
+    {
+        //    Approximation of inverse standard normal CDF developed by
+        //    B. Moro, "The Full Monte," Risk 8(2), Feb 1995, 57-58.
+
+        $a1 = 2.50662823884;
+        $a2 = -18.61500062529;
+        $a3 = 41.39119773534;
+        $a4 = -25.44106049637;
+
+        $b1 = -8.4735109309;
+        $b2 = 23.08336743743;
+        $b3 = -21.06224101826;
+        $b4 = 3.13082909833;
+
+        $c1 = 0.337475482272615;
+        $c2 = 0.976169019091719;
+        $c3 = 0.160797971491821;
+        $c4 = 2.76438810333863E-02;
+        $c5 = 3.8405729373609E-03;
+        $c6 = 3.951896511919E-04;
+        $c7 = 3.21767881768E-05;
+        $c8 = 2.888167364E-07;
+        $c9 = 3.960315187E-07;
+
+        $y = $prob - 0.5;
+        if (abs($y) < 0.42) {
+            $z = ($y * $y);
+            $z = $y * ((($a4 * $z + $a3) * $z + $a2) * $z + $a1) / (((($b4 * $z + $b3) * $z + $b2) * $z + $b1) * $z + 1);
+        } else {
+            if ($y > 0) {
+                $z = log(-log(1 - $prob));
+            } else {
+                $z = log(-log($prob));
+            }
+            $z = $c1 + $z * ($c2 + $z * ($c3 + $z * ($c4 + $z * ($c5 + $z * ($c6 + $z * ($c7 + $z * ($c8 + $z * $c9)))))));
+            if ($y < 0) {
+                $z = -$z;
+            }
+        }
+        return $z;
+    }    //    function inverseNcdf2()
+
+
+    private static function inverseNcdf3($p)
+    {
+        //    ALGORITHM AS241 APPL. STATIST. (1988) VOL. 37, NO. 3.
+        //    Produces the normal deviate Z corresponding to a given lower
+        //    tail area of P; Z is accurate to about 1 part in 10**16.
+        //
+        //    This is a PHP version of the original FORTRAN code that can
+        //    be found at http://lib.stat.cmu.edu/apstat/
+        $split1 = 0.425;
+        $split2 = 5;
+        $const1 = 0.180625;
+        $const2 = 1.6;
+
+        //    coefficients for p close to 0.5
+        $a0 = 3.3871328727963666080;
+        $a1 = 1.3314166789178437745E+2;
+        $a2 = 1.9715909503065514427E+3;
+        $a3 = 1.3731693765509461125E+4;
+        $a4 = 4.5921953931549871457E+4;
+        $a5 = 6.7265770927008700853E+4;
+        $a6 = 3.3430575583588128105E+4;
+        $a7 = 2.5090809287301226727E+3;
+
+        $b1 = 4.2313330701600911252E+1;
+        $b2 = 6.8718700749205790830E+2;
+        $b3 = 5.3941960214247511077E+3;
+        $b4 = 2.1213794301586595867E+4;
+        $b5 = 3.9307895800092710610E+4;
+        $b6 = 2.8729085735721942674E+4;
+        $b7 = 5.2264952788528545610E+3;
+
+        //    coefficients for p not close to 0, 0.5 or 1.
+        $c0 = 1.42343711074968357734;
+        $c1 = 4.63033784615654529590;
+        $c2 = 5.76949722146069140550;
+        $c3 = 3.64784832476320460504;
+        $c4 = 1.27045825245236838258;
+        $c5 = 2.41780725177450611770E-1;
+        $c6 = 2.27238449892691845833E-2;
+        $c7 = 7.74545014278341407640E-4;
+
+        $d1 = 2.05319162663775882187;
+        $d2 = 1.67638483018380384940;
+        $d3 = 6.89767334985100004550E-1;
+        $d4 = 1.48103976427480074590E-1;
+        $d5 = 1.51986665636164571966E-2;
+        $d6 = 5.47593808499534494600E-4;
+        $d7 = 1.05075007164441684324E-9;
+
+        //    coefficients for p near 0 or 1.
+        $e0 = 6.65790464350110377720;
+        $e1 = 5.46378491116411436990;
+        $e2 = 1.78482653991729133580;
+        $e3 = 2.96560571828504891230E-1;
+        $e4 = 2.65321895265761230930E-2;
+        $e5 = 1.24266094738807843860E-3;
+        $e6 = 2.71155556874348757815E-5;
+        $e7 = 2.01033439929228813265E-7;
+
+        $f1 = 5.99832206555887937690E-1;
+        $f2 = 1.36929880922735805310E-1;
+        $f3 = 1.48753612908506148525E-2;
+        $f4 = 7.86869131145613259100E-4;
+        $f5 = 1.84631831751005468180E-5;
+        $f6 = 1.42151175831644588870E-7;
+        $f7 = 2.04426310338993978564E-15;
+
+        $q = $p - 0.5;
+
+        //    computation for p close to 0.5
+        if (abs($q) <= split1) {
+            $R = $const1 - $q * $q;
+            $z = $q * ((((((($a7 * $R + $a6) * $R + $a5) * $R + $a4) * $R + $a3) * $R + $a2) * $R + $a1) * $R + $a0) /
+                      ((((((($b7 * $R + $b6) * $R + $b5) * $R + $b4) * $R + $b3) * $R + $b2) * $R + $b1) * $R + 1);
+        } else {
+            if ($q < 0) {
+                $R = $p;
+            } else {
+                $R = 1 - $p;
+            }
+            $R = pow(-log($R), 2);
+
+            //    computation for p not close to 0, 0.5 or 1.
+            if ($R <= $split2) {
+                $R = $R - $const2;
+                $z = ((((((($c7 * $R + $c6) * $R + $c5) * $R + $c4) * $R + $c3) * $R + $c2) * $R + $c1) * $R + $c0) /
+                     ((((((($d7 * $R + $d6) * $R + $d5) * $R + $d4) * $R + $d3) * $R + $d2) * $R + $d1) * $R + 1);
+            } else {
+            //    computation for p near 0 or 1.
+                $R = $R - $split2;
+                $z = ((((((($e7 * $R + $e6) * $R + $e5) * $R + $e4) * $R + $e3) * $R + $e2) * $R + $e1) * $R + $e0) /
+                     ((((((($f7 * $R + $f6) * $R + $f5) * $R + $f4) * $R + $f3) * $R + $f2) * $R + $f1) * $R + 1);
+            }
+            if ($q < 0) {
+                $z = -$z;
+            }
+        }
+        return $z;
+    }
+
+
+    /**
+     * AVEDEV
+     *
+     * Returns the average of the absolute deviations of data points from their mean.
+     * AVEDEV is a measure of the variability in a data set.
+     *
+     * Excel Function:
+     *        AVEDEV(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function AVEDEV()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+
+        // Return value
+        $returnValue = null;
+
+        $aMean = self::AVERAGE($aArgs);
+        if ($aMean != PHPExcel_Calculation_Functions::DIV0()) {
+            $aCount = 0;
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) &&
+                    ((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+                    $arg = (integer) $arg;
+                }
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    if (is_null($returnValue)) {
+                        $returnValue = abs($arg - $aMean);
+                    } else {
+                        $returnValue += abs($arg - $aMean);
+                    }
+                    ++$aCount;
+                }
+            }
+
+            // Return
+            if ($aCount == 0) {
+                return PHPExcel_Calculation_Functions::DIV0();
+            }
+            return $returnValue / $aCount;
+        }
+        return PHPExcel_Calculation_Functions::NaN();
+    }
+
+
+    /**
+     * AVERAGE
+     *
+     * Returns the average (arithmetic mean) of the arguments
+     *
+     * Excel Function:
+     *        AVERAGE(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function AVERAGE()
+    {
+        $returnValue = $aCount = 0;
+
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
+            if ((is_bool($arg)) &&
+                ((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+                $arg = (integer) $arg;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if (is_null($returnValue)) {
+                    $returnValue = $arg;
+                } else {
+                    $returnValue += $arg;
+                }
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        } else {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+    }
+
+
+    /**
+     * AVERAGEA
+     *
+     * Returns the average of its arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        AVERAGEA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function AVERAGEA()
+    {
+        $returnValue = null;
+
+        $aCount = 0;
+        // Loop through arguments
+        foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
+            if ((is_bool($arg)) &&
+                (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+            } else {
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                    if (is_bool($arg)) {
+                        $arg = (integer) $arg;
+                    } elseif (is_string($arg)) {
+                        $arg = 0;
+                    }
+                    if (is_null($returnValue)) {
+                        $returnValue = $arg;
+                    } else {
+                        $returnValue += $arg;
+                    }
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        } else {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+    }
+
+
+    /**
+     * AVERAGEIF
+     *
+     * Returns the average value from a range of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        AVERAGEIF(value1[,value2[, ...]],condition)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    string        $condition        The criteria that defines which cells will be checked.
+     * @param    mixed[]        $averageArgs    Data values
+     * @return    float
+     */
+    public static function AVERAGEIF($aArgs, $condition, $averageArgs = array())
+    {
+        $returnValue = 0;
+
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
+        $averageArgs = PHPExcel_Calculation_Functions::flattenArray($averageArgs);
+        if (empty($averageArgs)) {
+            $averageArgs = $aArgs;
+        }
+        $condition = PHPExcel_Calculation_Functions::ifCondition($condition);
+        // Loop through arguments
+        $aCount = 0;
+        foreach ($aArgs as $key => $arg) {
+            if (!is_numeric($arg)) {
+                $arg = PHPExcel_Calculation::wrapResult(strtoupper($arg));
+            }
+            $testCondition = '='.$arg.$condition;
+            if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+                if ((is_null($returnValue)) || ($arg > $returnValue)) {
+                    $returnValue += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * BETADIST
+     *
+     * Returns the beta distribution.
+     *
+     * @param    float        $value            Value at which you want to evaluate the distribution
+     * @param    float        $alpha            Parameter to the distribution
+     * @param    float        $beta            Parameter to the distribution
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function BETADIST($value, $alpha, $beta, $rMin = 0, $rMax = 1)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $alpha = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+        $beta  = PHPExcel_Calculation_Functions::flattenSingleValue($beta);
+        $rMin  = PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
+        $rMax  = PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
+
+        if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
+            if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ($rMin > $rMax) {
+                $tmp = $rMin;
+                $rMin = $rMax;
+                $rMax = $tmp;
+            }
+            $value -= $rMin;
+            $value /= ($rMax - $rMin);
+            return self::incompleteBeta($value, $alpha, $beta);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * BETAINV
+     *
+     * Returns the inverse of the beta distribution.
+     *
+     * @param    float        $probability    Probability at which you want to evaluate the distribution
+     * @param    float        $alpha            Parameter to the distribution
+     * @param    float        $beta            Parameter to the distribution
+     * @param    float        $rMin            Minimum value
+     * @param    float        $rMax            Maximum value
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function BETAINV($probability, $alpha, $beta, $rMin = 0, $rMax = 1)
+    {
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $alpha       = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+        $beta        = PHPExcel_Calculation_Functions::flattenSingleValue($beta);
+        $rMin        = PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
+        $rMax        = PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
+
+        if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
+            if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0) || ($probability > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ($rMin > $rMax) {
+                $tmp = $rMin;
+                $rMin = $rMax;
+                $rMax = $tmp;
+            }
+            $a = 0;
+            $b = 2;
+
+            $i = 0;
+            while ((($b - $a) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
+                $guess = ($a + $b) / 2;
+                $result = self::BETADIST($guess, $alpha, $beta);
+                if (($result == $probability) || ($result == 0)) {
+                    $b = $a;
+                } elseif ($result > $probability) {
+                    $b = $guess;
+                } else {
+                    $a = $guess;
+                }
+            }
+            if ($i == MAX_ITERATIONS) {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            return round($rMin + $guess * ($rMax - $rMin), 12);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * BINOMDIST
+     *
+     * Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
+     *        a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
+     *        when trials are independent, and when the probability of success is constant throughout the
+     *        experiment. For example, BINOMDIST can calculate the probability that two of the next three
+     *        babies born are male.
+     *
+     * @param    float        $value            Number of successes in trials
+     * @param    float        $trials            Number of trials
+     * @param    float        $probability    Probability of success on each trial
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     * @todo    Cumulative distribution function
+     *
+     */
+    public static function BINOMDIST($value, $trials, $probability, $cumulative)
+    {
+        $value       = floor(PHPExcel_Calculation_Functions::flattenSingleValue($value));
+        $trials      = floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+
+        if ((is_numeric($value)) && (is_numeric($trials)) && (is_numeric($probability))) {
+            if (($value < 0) || ($value > $trials)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if (($probability < 0) || ($probability > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
+                if ($cumulative) {
+                    $summer = 0;
+                    for ($i = 0; $i <= $value; ++$i) {
+                        $summer += PHPExcel_Calculation_MathTrig::COMBIN($trials, $i) * pow($probability, $i) * pow(1 - $probability, $trials - $i);
+                    }
+                    return $summer;
+                } else {
+                    return PHPExcel_Calculation_MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value) ;
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * CHIDIST
+     *
+     * Returns the one-tailed probability of the chi-squared distribution.
+     *
+     * @param    float        $value            Value for the function
+     * @param    float        $degrees        degrees of freedom
+     * @return    float
+     */
+    public static function CHIDIST($value, $degrees)
+    {
+        $value   = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $degrees = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+
+        if ((is_numeric($value)) && (is_numeric($degrees))) {
+            if ($degrees < 1) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ($value < 0) {
+                if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                    return 1;
+                }
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return 1 - (self::incompleteGamma($degrees/2, $value/2) / self::gamma($degrees/2));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * CHIINV
+     *
+     * Returns the one-tailed probability of the chi-squared distribution.
+     *
+     * @param    float        $probability    Probability for the function
+     * @param    float        $degrees        degrees of freedom
+     * @return    float
+     */
+    public static function CHIINV($probability, $degrees)
+    {
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $degrees     = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+
+        if ((is_numeric($probability)) && (is_numeric($degrees))) {
+            $xLo = 100;
+            $xHi = 0;
+
+            $x = $xNew = 1;
+            $dx    = 1;
+            $i = 0;
+
+            while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
+                // Apply Newton-Raphson step
+                $result = self::CHIDIST($x, $degrees);
+                $error = $result - $probability;
+                if ($error == 0.0) {
+                    $dx = 0;
+                } elseif ($error < 0.0) {
+                    $xLo = $x;
+                } else {
+                    $xHi = $x;
+                }
+                // Avoid division by zero
+                if ($result != 0.0) {
+                    $dx = $error / $result;
+                    $xNew = $x - $dx;
+                }
+                // If the NR fails to converge (which for example may be the
+                // case if the initial guess is too rough) we apply a bisection
+                // step to determine a more narrow interval around the root.
+                if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
+                    $xNew = ($xLo + $xHi) / 2;
+                    $dx = $xNew - $x;
+                }
+                $x = $xNew;
+            }
+            if ($i == MAX_ITERATIONS) {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            return round($x, 12);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * CONFIDENCE
+     *
+     * Returns the confidence interval for a population mean
+     *
+     * @param    float        $alpha
+     * @param    float        $stdDev        Standard Deviation
+     * @param    float        $size
+     * @return    float
+     *
+     */
+    public static function CONFIDENCE($alpha, $stdDev, $size)
+    {
+        $alpha  = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+        $stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+        $size   = floor(PHPExcel_Calculation_Functions::flattenSingleValue($size));
+
+        if ((is_numeric($alpha)) && (is_numeric($stdDev)) && (is_numeric($size))) {
+            if (($alpha <= 0) || ($alpha >= 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if (($stdDev <= 0) || ($size < 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return self::NORMSINV(1 - $alpha / 2) * $stdDev / sqrt($size);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * CORREL
+     *
+     * Returns covariance, the average of the products of deviations for each data point pair.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function CORREL($yValues, $xValues = null)
+    {
+        if ((is_null($xValues)) || (!is_array($yValues)) || (!is_array($xValues))) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getCorrelation();
+    }
+
+
+    /**
+     * COUNT
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNT(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    int
+     */
+    public static function COUNT()
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+        foreach ($aArgs as $k => $arg) {
+            if ((is_bool($arg)) &&
+                ((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+                $arg = (integer) $arg;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * COUNTA
+     *
+     * Counts the number of cells that are not empty within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    int
+     */
+    public static function COUNTA()
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a numeric, boolean or string value?
+            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * COUNTBLANK
+     *
+     * Counts the number of empty cells within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTBLANK(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    int
+     */
+    public static function COUNTBLANK()
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a blank cell?
+            if ((is_null($arg)) || ((is_string($arg)) && ($arg == ''))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * COUNTIF
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTIF(value1[,value2[, ...]],condition)
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    string        $condition        The criteria that defines which cells will be counted.
+     * @return    int
+     */
+    public static function COUNTIF($aArgs, $condition)
+    {
+        $returnValue = 0;
+
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
+        $condition = PHPExcel_Calculation_Functions::ifCondition($condition);
+        // Loop through arguments
+        foreach ($aArgs as $arg) {
+            if (!is_numeric($arg)) {
+                $arg = PHPExcel_Calculation::wrapResult(strtoupper($arg));
+            }
+            $testCondition = '='.$arg.$condition;
+            if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+                // Is it a value within our criteria
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * COVAR
+     *
+     * Returns covariance, the average of the products of deviations for each data point pair.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function COVAR($yValues, $xValues)
+    {
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getCovariance();
+    }
+
+
+    /**
+     * CRITBINOM
+     *
+     * Returns the smallest value for which the cumulative binomial distribution is greater
+     *        than or equal to a criterion value
+     *
+     * See http://support.microsoft.com/kb/828117/ for details of the algorithm used
+     *
+     * @param    float        $trials            number of Bernoulli trials
+     * @param    float        $probability    probability of a success on each trial
+     * @param    float        $alpha            criterion value
+     * @return    int
+     *
+     * @todo    Warning. This implementation differs from the algorithm detailed on the MS
+     *            web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess
+     *            This eliminates a potential endless loop error, but may have an adverse affect on the
+     *            accuracy of the function (although all my tests have so far returned correct results).
+     *
+     */
+    public static function CRITBINOM($trials, $probability, $alpha)
+    {
+        $trials      = floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $alpha       = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+
+        if ((is_numeric($trials)) && (is_numeric($probability)) && (is_numeric($alpha))) {
+            if ($trials < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            } elseif (($probability < 0) || ($probability > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            } elseif (($alpha < 0) || ($alpha > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            } elseif ($alpha <= 0.5) {
+                $t = sqrt(log(1 / ($alpha * $alpha)));
+                $trialsApprox = 0 - ($t + (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t));
+            } else {
+                $t = sqrt(log(1 / pow(1 - $alpha, 2)));
+                $trialsApprox = $t - (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t);
+            }
+            $Guess = floor($trials * $probability + $trialsApprox * sqrt($trials * $probability * (1 - $probability)));
+            if ($Guess < 0) {
+                $Guess = 0;
+            } elseif ($Guess > $trials) {
+                $Guess = $trials;
+            }
+
+            $TotalUnscaledProbability = $UnscaledPGuess = $UnscaledCumPGuess = 0.0;
+            $EssentiallyZero = 10e-12;
+
+            $m = floor($trials * $probability);
+            ++$TotalUnscaledProbability;
+            if ($m == $Guess) {
+                ++$UnscaledPGuess;
+            }
+            if ($m <= $Guess) {
+                ++$UnscaledCumPGuess;
+            }
+
+            $PreviousValue = 1;
+            $Done = false;
+            $k = $m + 1;
+            while ((!$Done) && ($k <= $trials)) {
+                $CurrentValue = $PreviousValue * ($trials - $k + 1) * $probability / ($k * (1 - $probability));
+                $TotalUnscaledProbability += $CurrentValue;
+                if ($k == $Guess) {
+                    $UnscaledPGuess += $CurrentValue;
+                }
+                if ($k <= $Guess) {
+                    $UnscaledCumPGuess += $CurrentValue;
+                }
+                if ($CurrentValue <= $EssentiallyZero) {
+                    $Done = true;
+                }
+                $PreviousValue = $CurrentValue;
+                ++$k;
+            }
+
+            $PreviousValue = 1;
+            $Done = false;
+            $k = $m - 1;
+            while ((!$Done) && ($k >= 0)) {
+                $CurrentValue = $PreviousValue * $k + 1 * (1 - $probability) / (($trials - $k) * $probability);
+                $TotalUnscaledProbability += $CurrentValue;
+                if ($k == $Guess) {
+                    $UnscaledPGuess += $CurrentValue;
+                }
+                if ($k <= $Guess) {
+                    $UnscaledCumPGuess += $CurrentValue;
+                }
+                if ($CurrentValue <= $EssentiallyZero) {
+                    $Done = true;
+                }
+                $PreviousValue = $CurrentValue;
+                --$k;
+            }
+
+            $PGuess = $UnscaledPGuess / $TotalUnscaledProbability;
+            $CumPGuess = $UnscaledCumPGuess / $TotalUnscaledProbability;
+
+//            $CumPGuessMinus1 = $CumPGuess - $PGuess;
+            $CumPGuessMinus1 = $CumPGuess - 1;
+
+            while (true) {
+                if (($CumPGuessMinus1 < $alpha) && ($CumPGuess >= $alpha)) {
+                    return $Guess;
+                } elseif (($CumPGuessMinus1 < $alpha) && ($CumPGuess < $alpha)) {
+                    $PGuessPlus1 = $PGuess * ($trials - $Guess) * $probability / $Guess / (1 - $probability);
+                    $CumPGuessMinus1 = $CumPGuess;
+                    $CumPGuess = $CumPGuess + $PGuessPlus1;
+                    $PGuess = $PGuessPlus1;
+                    ++$Guess;
+                } elseif (($CumPGuessMinus1 >= $alpha) && ($CumPGuess >= $alpha)) {
+                    $PGuessMinus1 = $PGuess * $Guess * (1 - $probability) / ($trials - $Guess + 1) / $probability;
+                    $CumPGuess = $CumPGuessMinus1;
+                    $CumPGuessMinus1 = $CumPGuessMinus1 - $PGuess;
+                    $PGuess = $PGuessMinus1;
+                    --$Guess;
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * DEVSQ
+     *
+     * Returns the sum of squares of deviations of data points from their sample mean.
+     *
+     * Excel Function:
+     *        DEVSQ(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function DEVSQ()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+
+        // Return value
+        $returnValue = null;
+
+        $aMean = self::AVERAGE($aArgs);
+        if ($aMean != PHPExcel_Calculation_Functions::DIV0()) {
+            $aCount = -1;
+            foreach ($aArgs as $k => $arg) {
+                // Is it a numeric value?
+                if ((is_bool($arg)) &&
+                    ((!PHPExcel_Calculation_Functions::isCellValue($k)) ||
+                    (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+                    $arg = (integer) $arg;
+                }
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    if (is_null($returnValue)) {
+                        $returnValue = pow(($arg - $aMean), 2);
+                    } else {
+                        $returnValue += pow(($arg - $aMean), 2);
+                    }
+                    ++$aCount;
+                }
+            }
+
+            // Return
+            if (is_null($returnValue)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            } else {
+                return $returnValue;
+            }
+        }
+        return self::NA();
+    }
+
+
+    /**
+     * EXPONDIST
+     *
+     *    Returns the exponential distribution. Use EXPONDIST to model the time between events,
+     *        such as how long an automated bank teller takes to deliver cash. For example, you can
+     *        use EXPONDIST to determine the probability that the process takes at most 1 minute.
+     *
+     * @param    float        $value            Value of the function
+     * @param    float        $lambda            The parameter value
+     * @param    boolean        $cumulative
+     * @return    float
+     */
+    public static function EXPONDIST($value, $lambda, $cumulative)
+    {
+        $value    = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $lambda    = PHPExcel_Calculation_Functions::flattenSingleValue($lambda);
+        $cumulative    = PHPExcel_Calculation_Functions::flattenSingleValue($cumulative);
+
+        if ((is_numeric($value)) && (is_numeric($lambda))) {
+            if (($value < 0) || ($lambda < 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
+                if ($cumulative) {
+                    return 1 - exp(0-$value*$lambda);
+                } else {
+                    return $lambda * exp(0-$value*$lambda);
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FISHER
+     *
+     * Returns the Fisher transformation at x. This transformation produces a function that
+     *        is normally distributed rather than skewed. Use this function to perform hypothesis
+     *        testing on the correlation coefficient.
+     *
+     * @param    float        $value
+     * @return    float
+     */
+    public static function FISHER($value)
+    {
+        $value    = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        if (is_numeric($value)) {
+            if (($value <= -1) || ($value >= 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return 0.5 * log((1+$value)/(1-$value));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FISHERINV
+     *
+     * Returns the inverse of the Fisher transformation. Use this transformation when
+     *        analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
+     *        FISHERINV(y) = x.
+     *
+     * @param    float        $value
+     * @return    float
+     */
+    public static function FISHERINV($value)
+    {
+        $value    = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        if (is_numeric($value)) {
+            return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FORECAST
+     *
+     * Calculates, or predicts, a future value by using existing values. The predicted value is a y-value for a given x-value.
+     *
+     * @param    float                Value of X for which we want to find Y
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function FORECAST($xValue, $yValues, $xValues)
+    {
+        $xValue    = PHPExcel_Calculation_Functions::flattenSingleValue($xValue);
+        if (!is_numeric($xValue)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        } elseif (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getValueOfYForX($xValue);
+    }
+
+
+    /**
+     * GAMMADIST
+     *
+     * Returns the gamma distribution.
+     *
+     * @param    float        $value            Value at which you want to evaluate the distribution
+     * @param    float        $a                Parameter to the distribution
+     * @param    float        $b                Parameter to the distribution
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function GAMMADIST($value, $a, $b, $cumulative)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $a     = PHPExcel_Calculation_Functions::flattenSingleValue($a);
+        $b     = PHPExcel_Calculation_Functions::flattenSingleValue($b);
+
+        if ((is_numeric($value)) && (is_numeric($a)) && (is_numeric($b))) {
+            if (($value < 0) || ($a <= 0) || ($b <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
+                if ($cumulative) {
+                    return self::incompleteGamma($a, $value / $b) / self::gamma($a);
+                } else {
+                    return (1 / (pow($b, $a) * self::gamma($a))) * pow($value, $a-1) * exp(0-($value / $b));
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * GAMMAINV
+     *
+     * Returns the inverse of the beta distribution.
+     *
+     * @param    float        $probability    Probability at which you want to evaluate the distribution
+     * @param    float        $alpha            Parameter to the distribution
+     * @param    float        $beta            Parameter to the distribution
+     * @return    float
+     *
+     */
+    public static function GAMMAINV($probability, $alpha, $beta)
+    {
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $alpha       = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+        $beta        = PHPExcel_Calculation_Functions::flattenSingleValue($beta);
+
+        if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta))) {
+            if (($alpha <= 0) || ($beta <= 0) || ($probability < 0) || ($probability > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+
+            $xLo = 0;
+            $xHi = $alpha * $beta * 5;
+
+            $x = $xNew = 1;
+            $error = $pdf = 0;
+            $dx    = 1024;
+            $i = 0;
+
+            while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
+                // Apply Newton-Raphson step
+                $error = self::GAMMADIST($x, $alpha, $beta, true) - $probability;
+                if ($error < 0.0) {
+                    $xLo = $x;
+                } else {
+                    $xHi = $x;
+                }
+                $pdf = self::GAMMADIST($x, $alpha, $beta, false);
+                // Avoid division by zero
+                if ($pdf != 0.0) {
+                    $dx = $error / $pdf;
+                    $xNew = $x - $dx;
+                }
+                // If the NR fails to converge (which for example may be the
+                // case if the initial guess is too rough) we apply a bisection
+                // step to determine a more narrow interval around the root.
+                if (($xNew < $xLo) || ($xNew > $xHi) || ($pdf == 0.0)) {
+                    $xNew = ($xLo + $xHi) / 2;
+                    $dx = $xNew - $x;
+                }
+                $x = $xNew;
+            }
+            if ($i == MAX_ITERATIONS) {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            return $x;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * GAMMALN
+     *
+     * Returns the natural logarithm of the gamma function.
+     *
+     * @param    float        $value
+     * @return    float
+     */
+    public static function GAMMALN($value)
+    {
+        $value    = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        if (is_numeric($value)) {
+            if ($value <= 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return log(self::gamma($value));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * GEOMEAN
+     *
+     * Returns the geometric mean of an array or range of positive data. For example, you
+     *        can use GEOMEAN to calculate average growth rate given compound interest with
+     *        variable rates.
+     *
+     * Excel Function:
+     *        GEOMEAN(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function GEOMEAN()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        $aMean = PHPExcel_Calculation_MathTrig::PRODUCT($aArgs);
+        if (is_numeric($aMean) && ($aMean > 0)) {
+            $aCount = self::COUNT($aArgs) ;
+            if (self::MIN($aArgs) > 0) {
+                return pow($aMean, (1 / $aCount));
+            }
+        }
+        return PHPExcel_Calculation_Functions::NaN();
+    }
+
+
+    /**
+     * GROWTH
+     *
+     * Returns values along a predicted emponential trend
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @param    array of mixed        Values of X for which we want to find Y
+     * @param    boolean                A logical value specifying whether to force the intersect to equal 0.
+     * @return    array of float
+     */
+    public static function GROWTH($yValues, $xValues = array(), $newValues = array(), $const = true)
+    {
+        $yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
+        $xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
+        $newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
+        $const = (is_null($const)) ? true : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+
+        $bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL, $yValues, $xValues, $const);
+        if (empty($newValues)) {
+            $newValues = $bestFitExponential->getXValues();
+        }
+
+        $returnArray = array();
+        foreach ($newValues as $xValue) {
+            $returnArray[0][] = $bestFitExponential->getValueOfYForX($xValue);
+        }
+
+        return $returnArray;
+    }
+
+
+    /**
+     * HARMEAN
+     *
+     * Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
+     *        arithmetic mean of reciprocals.
+     *
+     * Excel Function:
+     *        HARMEAN(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function HARMEAN()
+    {
+        // Return value
+        $returnValue = PHPExcel_Calculation_Functions::NA();
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        if (self::MIN($aArgs) < 0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if ($arg <= 0) {
+                    return PHPExcel_Calculation_Functions::NaN();
+                }
+                if (is_null($returnValue)) {
+                    $returnValue = (1 / $arg);
+                } else {
+                    $returnValue += (1 / $arg);
+                }
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount > 0) {
+            return 1 / ($returnValue / $aCount);
+        } else {
+            return $returnValue;
+        }
+    }
+
+
+    /**
+     * HYPGEOMDIST
+     *
+     * Returns the hypergeometric distribution. HYPGEOMDIST returns the probability of a given number of
+     * sample successes, given the sample size, population successes, and population size.
+     *
+     * @param    float        $sampleSuccesses        Number of successes in the sample
+     * @param    float        $sampleNumber            Size of the sample
+     * @param    float        $populationSuccesses    Number of successes in the population
+     * @param    float        $populationNumber        Population size
+     * @return    float
+     *
+     */
+    public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber)
+    {
+        $sampleSuccesses     = floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleSuccesses));
+        $sampleNumber        = floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleNumber));
+        $populationSuccesses = floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationSuccesses));
+        $populationNumber    = floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationNumber));
+
+        if ((is_numeric($sampleSuccesses)) && (is_numeric($sampleNumber)) && (is_numeric($populationSuccesses)) && (is_numeric($populationNumber))) {
+            if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return PHPExcel_Calculation_MathTrig::COMBIN($populationSuccesses, $sampleSuccesses) *
+                   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber - $populationSuccesses, $sampleNumber - $sampleSuccesses) /
+                   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber, $sampleNumber);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * INTERCEPT
+     *
+     * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function INTERCEPT($yValues, $xValues)
+    {
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getIntersect();
+    }
+
+
+    /**
+     * KURT
+     *
+     * Returns the kurtosis of a data set. Kurtosis characterizes the relative peakedness
+     * or flatness of a distribution compared with the normal distribution. Positive
+     * kurtosis indicates a relatively peaked distribution. Negative kurtosis indicates a
+     * relatively flat distribution.
+     *
+     * @param    array    Data Series
+     * @return    float
+     */
+    public static function KURT()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+        $mean = self::AVERAGE($aArgs);
+        $stdDev = self::STDEV($aArgs);
+
+        if ($stdDev > 0) {
+            $count = $summer = 0;
+            // Loop through arguments
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) &&
+                    (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+                } else {
+                    // Is it a numeric value?
+                    if ((is_numeric($arg)) && (!is_string($arg))) {
+                        $summer += pow((($arg - $mean) / $stdDev), 4);
+                        ++$count;
+                    }
+                }
+            }
+
+            // Return
+            if ($count > 3) {
+                return $summer * ($count * ($count+1) / (($count-1) * ($count-2) * ($count-3))) - (3 * pow($count-1, 2) / (($count-2) * ($count-3)));
+            }
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * LARGE
+     *
+     * Returns the nth largest value in a data set. You can use this function to
+     *        select a value based on its relative standing.
+     *
+     * Excel Function:
+     *        LARGE(value1[,value2[, ...]],entry)
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    int            $entry            Position (ordered from the largest) in the array or range of data to return
+     * @return    float
+     *
+     */
+    public static function LARGE()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $entry = floor(array_pop($aArgs));
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $mArgs = array();
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $mArgs[] = $arg;
+                }
+            }
+            $count = self::COUNT($mArgs);
+            $entry = floor(--$entry);
+            if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            rsort($mArgs);
+            return $mArgs[$entry];
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * LINEST
+     *
+     * Calculates the statistics for a line by using the "least squares" method to calculate a straight line that best fits your data,
+     *        and then returns an array that describes the line.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @param    boolean                A logical value specifying whether to force the intersect to equal 0.
+     * @param    boolean                A logical value specifying whether to return additional regression statistics.
+     * @return    array
+     */
+    public static function LINEST($yValues, $xValues = null, $const = true, $stats = false)
+    {
+        $const = (is_null($const)) ? true : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+        $stats = (is_null($stats)) ? false : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
+        if (is_null($xValues)) {
+            $xValues = range(1, count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+        }
+
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return 0;
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues, $const);
+        if ($stats) {
+            return array(
+                array(
+                    $bestFitLinear->getSlope(),
+                    $bestFitLinear->getSlopeSE(),
+                    $bestFitLinear->getGoodnessOfFit(),
+                    $bestFitLinear->getF(),
+                    $bestFitLinear->getSSRegression(),
+                ),
+                array(
+                    $bestFitLinear->getIntersect(),
+                    $bestFitLinear->getIntersectSE(),
+                    $bestFitLinear->getStdevOfResiduals(),
+                    $bestFitLinear->getDFResiduals(),
+                    $bestFitLinear->getSSResiduals()
+                )
+            );
+        } else {
+            return array(
+                $bestFitLinear->getSlope(),
+                $bestFitLinear->getIntersect()
+            );
+        }
+    }
+
+
+    /**
+     * LOGEST
+     *
+     * Calculates an exponential curve that best fits the X and Y data series,
+     *        and then returns an array that describes the line.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @param    boolean                A logical value specifying whether to force the intersect to equal 0.
+     * @param    boolean                A logical value specifying whether to return additional regression statistics.
+     * @return    array
+     */
+    public static function LOGEST($yValues, $xValues = null, $const = true, $stats = false)
+    {
+        $const = (is_null($const)) ? true : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+        $stats = (is_null($stats)) ? false : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
+        if (is_null($xValues)) {
+            $xValues = range(1, count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
+        }
+
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        foreach ($yValues as $value) {
+            if ($value <= 0.0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+        }
+
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return 1;
+        }
+
+        $bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL, $yValues, $xValues, $const);
+        if ($stats) {
+            return array(
+                array(
+                    $bestFitExponential->getSlope(),
+                    $bestFitExponential->getSlopeSE(),
+                    $bestFitExponential->getGoodnessOfFit(),
+                    $bestFitExponential->getF(),
+                    $bestFitExponential->getSSRegression(),
+                ),
+                array(
+                    $bestFitExponential->getIntersect(),
+                    $bestFitExponential->getIntersectSE(),
+                    $bestFitExponential->getStdevOfResiduals(),
+                    $bestFitExponential->getDFResiduals(),
+                    $bestFitExponential->getSSResiduals()
+                )
+            );
+        } else {
+            return array(
+                $bestFitExponential->getSlope(),
+                $bestFitExponential->getIntersect()
+            );
+        }
+    }
+
+
+    /**
+     * LOGINV
+     *
+     * Returns the inverse of the normal cumulative distribution
+     *
+     * @param    float        $probability
+     * @param    float        $mean
+     * @param    float        $stdDev
+     * @return    float
+     *
+     * @todo    Try implementing P J Acklam's refinement algorithm for greater
+     *            accuracy if I can get my head round the mathematics
+     *            (as described at) http://home.online.no/~pjacklam/notes/invnorm/
+     */
+    public static function LOGINV($probability, $mean, $stdDev)
+    {
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $mean        = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+        $stdDev      = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+
+        if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
+            if (($probability < 0) || ($probability > 1) || ($stdDev <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return exp($mean + $stdDev * self::NORMSINV($probability));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * LOGNORMDIST
+     *
+     * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
+     * with parameters mean and standard_dev.
+     *
+     * @param    float        $value
+     * @param    float        $mean
+     * @param    float        $stdDev
+     * @return    float
+     */
+    public static function LOGNORMDIST($value, $mean, $stdDev)
+    {
+        $value  = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $mean   = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+        $stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+
+        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
+            if (($value <= 0) || ($stdDev <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return self::NORMSDIST((log($value) - $mean) / $stdDev);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * MAX
+     *
+     * MAX returns the value of the element of the values passed that has the highest value,
+     *        with negative numbers considered smaller than positive numbers.
+     *
+     * Excel Function:
+     *        MAX(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function MAX()
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if ((is_null($returnValue)) || ($arg > $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if (is_null($returnValue)) {
+            return 0;
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * MAXA
+     *
+     * Returns the greatest value in a list of arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        MAXA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function MAXA()
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                if (is_bool($arg)) {
+                    $arg = (integer) $arg;
+                } elseif (is_string($arg)) {
+                    $arg = 0;
+                }
+                if ((is_null($returnValue)) || ($arg > $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if (is_null($returnValue)) {
+            return 0;
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * MAXIF
+     *
+     * Counts the maximum value within a range of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        MAXIF(value1[,value2[, ...]],condition)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    string        $condition        The criteria that defines which cells will be checked.
+     * @return    float
+     */
+    public static function MAXIF($aArgs, $condition, $sumArgs = array())
+    {
+        $returnValue = null;
+
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
+        $sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
+        if (empty($sumArgs)) {
+            $sumArgs = $aArgs;
+        }
+        $condition = PHPExcel_Calculation_Functions::ifCondition($condition);
+        // Loop through arguments
+        foreach ($aArgs as $key => $arg) {
+            if (!is_numeric($arg)) {
+                $arg = PHPExcel_Calculation::wrapResult(strtoupper($arg));
+            }
+            $testCondition = '='.$arg.$condition;
+            if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+                if ((is_null($returnValue)) || ($arg > $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MEDIAN
+     *
+     * Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
+     *
+     * Excel Function:
+     *        MEDIAN(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function MEDIAN()
+    {
+        $returnValue = PHPExcel_Calculation_Functions::NaN();
+
+        $mArgs = array();
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $mArgs[] = $arg;
+            }
+        }
+
+        $mValueCount = count($mArgs);
+        if ($mValueCount > 0) {
+            sort($mArgs, SORT_NUMERIC);
+            $mValueCount = $mValueCount / 2;
+            if ($mValueCount == floor($mValueCount)) {
+                $returnValue = ($mArgs[$mValueCount--] + $mArgs[$mValueCount]) / 2;
+            } else {
+                $mValueCount = floor($mValueCount);
+                $returnValue = $mArgs[$mValueCount];
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * MIN
+     *
+     * MIN returns the value of the element of the values passed that has the smallest value,
+     *        with negative numbers considered smaller than positive numbers.
+     *
+     * Excel Function:
+     *        MIN(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function MIN()
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if ((is_null($returnValue)) || ($arg < $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if (is_null($returnValue)) {
+            return 0;
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * MINA
+     *
+     * Returns the smallest value in a list of arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        MINA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function MINA()
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                if (is_bool($arg)) {
+                    $arg = (integer) $arg;
+                } elseif (is_string($arg)) {
+                    $arg = 0;
+                }
+                if ((is_null($returnValue)) || ($arg < $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if (is_null($returnValue)) {
+            return 0;
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * MINIF
+     *
+     * Returns the minimum value within a range of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        MINIF(value1[,value2[, ...]],condition)
+     *
+     * @access    public
+     * @category Mathematical and Trigonometric Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    string        $condition        The criteria that defines which cells will be checked.
+     * @return    float
+     */
+    public static function MINIF($aArgs, $condition, $sumArgs = array())
+    {
+        $returnValue = null;
+
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
+        $sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
+        if (empty($sumArgs)) {
+            $sumArgs = $aArgs;
+        }
+        $condition = PHPExcel_Calculation_Functions::ifCondition($condition);
+        // Loop through arguments
+        foreach ($aArgs as $key => $arg) {
+            if (!is_numeric($arg)) {
+                $arg = PHPExcel_Calculation::wrapResult(strtoupper($arg));
+            }
+            $testCondition = '='.$arg.$condition;
+            if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+                if ((is_null($returnValue)) || ($arg < $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
+
+    //
+    //    Special variant of array_count_values that isn't limited to strings and integers,
+    //        but can work with floating point numbers as values
+    //
+    private static function modeCalc($data)
+    {
+        $frequencyArray = array();
+        foreach ($data as $datum) {
+            $found = false;
+            foreach ($frequencyArray as $key => $value) {
+                if ((string) $value['value'] == (string) $datum) {
+                    ++$frequencyArray[$key]['frequency'];
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
+                $frequencyArray[] = array(
+                    'value'     => $datum,
+                    'frequency' => 1
+                );
+            }
+        }
+
+        foreach ($frequencyArray as $key => $value) {
+            $frequencyList[$key] = $value['frequency'];
+            $valueList[$key] = $value['value'];
+        }
+        array_multisort($frequencyList, SORT_DESC, $valueList, SORT_ASC, SORT_NUMERIC, $frequencyArray);
+
+        if ($frequencyArray[0]['frequency'] == 1) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+        return $frequencyArray[0]['value'];
+    }
+
+
+    /**
+     * MODE
+     *
+     * Returns the most frequently occurring, or repetitive, value in an array or range of data
+     *
+     * Excel Function:
+     *        MODE(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function MODE()
+    {
+        $returnValue = PHPExcel_Calculation_Functions::NA();
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        $mArgs = array();
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $mArgs[] = $arg;
+            }
+        }
+
+        if (!empty($mArgs)) {
+            return self::modeCalc($mArgs);
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * NEGBINOMDIST
+     *
+     * Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
+     *        there will be number_f failures before the number_s-th success, when the constant
+     *        probability of a success is probability_s. This function is similar to the binomial
+     *        distribution, except that the number of successes is fixed, and the number of trials is
+     *        variable. Like the binomial, trials are assumed to be independent.
+     *
+     * @param    float        $failures        Number of Failures
+     * @param    float        $successes        Threshold number of Successes
+     * @param    float        $probability    Probability of success on each trial
+     * @return    float
+     *
+     */
+    public static function NEGBINOMDIST($failures, $successes, $probability)
+    {
+        $failures    = floor(PHPExcel_Calculation_Functions::flattenSingleValue($failures));
+        $successes   = floor(PHPExcel_Calculation_Functions::flattenSingleValue($successes));
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+
+        if ((is_numeric($failures)) && (is_numeric($successes)) && (is_numeric($probability))) {
+            if (($failures < 0) || ($successes < 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            } elseif (($probability < 0) || ($probability > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
+                if (($failures + $successes - 1) <= 0) {
+                    return PHPExcel_Calculation_Functions::NaN();
+                }
+            }
+            return (PHPExcel_Calculation_MathTrig::COMBIN($failures + $successes - 1, $successes - 1)) * (pow($probability, $successes)) * (pow(1 - $probability, $failures));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * NORMDIST
+     *
+     * Returns the normal distribution for the specified mean and standard deviation. This
+     * function has a very wide range of applications in statistics, including hypothesis
+     * testing.
+     *
+     * @param    float        $value
+     * @param    float        $mean        Mean Value
+     * @param    float        $stdDev        Standard Deviation
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function NORMDIST($value, $mean, $stdDev, $cumulative)
+    {
+        $value  = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $mean   = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+        $stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+
+        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
+            if ($stdDev < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
+                if ($cumulative) {
+                    return 0.5 * (1 + PHPExcel_Calculation_Engineering::erfVal(($value - $mean) / ($stdDev * sqrt(2))));
+                } else {
+                    return (1 / (SQRT2PI * $stdDev)) * exp(0 - (pow($value - $mean, 2) / (2 * ($stdDev * $stdDev))));
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * NORMINV
+     *
+     * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
+     *
+     * @param    float        $value
+     * @param    float        $mean        Mean Value
+     * @param    float        $stdDev        Standard Deviation
+     * @return    float
+     *
+     */
+    public static function NORMINV($probability, $mean, $stdDev)
+    {
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $mean        = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+        $stdDev      = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+
+        if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
+            if (($probability < 0) || ($probability > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ($stdDev < 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return (self::inverseNcdf($probability) * $stdDev) + $mean;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * NORMSDIST
+     *
+     * Returns the standard normal cumulative distribution function. The distribution has
+     * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
+     * table of standard normal curve areas.
+     *
+     * @param    float        $value
+     * @return    float
+     */
+    public static function NORMSDIST($value)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        return self::NORMDIST($value, 0, 1, true);
+    }
+
+
+    /**
+     * NORMSINV
+     *
+     * Returns the inverse of the standard normal cumulative distribution
+     *
+     * @param    float        $value
+     * @return    float
+     */
+    public static function NORMSINV($value)
+    {
+        return self::NORMINV($value, 0, 1);
+    }
+
+
+    /**
+     * PERCENTILE
+     *
+     * Returns the nth percentile of values in a range..
+     *
+     * Excel Function:
+     *        PERCENTILE(value1[,value2[, ...]],entry)
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    float        $entry            Percentile value in the range 0..1, inclusive.
+     * @return    float
+     */
+    public static function PERCENTILE()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $entry = array_pop($aArgs);
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            if (($entry < 0) || ($entry > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $mArgs = array();
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $mArgs[] = $arg;
+                }
+            }
+            $mValueCount = count($mArgs);
+            if ($mValueCount > 0) {
+                sort($mArgs);
+                $count = self::COUNT($mArgs);
+                $index = $entry * ($count-1);
+                $iBase = floor($index);
+                if ($index == $iBase) {
+                    return $mArgs[$index];
+                } else {
+                    $iNext = $iBase + 1;
+                    $iProportion = $index - $iBase;
+                    return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion) ;
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * PERCENTRANK
+     *
+     * Returns the rank of a value in a data set as a percentage of the data set.
+     *
+     * @param    array of number        An array of, or a reference to, a list of numbers.
+     * @param    number                The number whose rank you want to find.
+     * @param    number                The number of significant digits for the returned percentage value.
+     * @return    float
+     */
+    public static function PERCENTRANK($valueSet, $value, $significance = 3)
+    {
+        $valueSet     = PHPExcel_Calculation_Functions::flattenArray($valueSet);
+        $value        = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $significance = (is_null($significance)) ? 3 : (integer) PHPExcel_Calculation_Functions::flattenSingleValue($significance);
+
+        foreach ($valueSet as $key => $valueEntry) {
+            if (!is_numeric($valueEntry)) {
+                unset($valueSet[$key]);
+            }
+        }
+        sort($valueSet, SORT_NUMERIC);
+        $valueCount = count($valueSet);
+        if ($valueCount == 0) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+
+        $valueAdjustor = $valueCount - 1;
+        if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+
+        $pos = array_search($value, $valueSet);
+        if ($pos === false) {
+            $pos = 0;
+            $testValue = $valueSet[0];
+            while ($testValue < $value) {
+                $testValue = $valueSet[++$pos];
+            }
+            --$pos;
+            $pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
+        }
+
+        return round($pos / $valueAdjustor, $significance);
+    }
+
+
+    /**
+     * PERMUT
+     *
+     * Returns the number of permutations for a given number of objects that can be
+     *        selected from number objects. A permutation is any set or subset of objects or
+     *        events where internal order is significant. Permutations are different from
+     *        combinations, for which the internal order is not significant. Use this function
+     *        for lottery-style probability calculations.
+     *
+     * @param    int        $numObjs    Number of different objects
+     * @param    int        $numInSet    Number of objects in each permutation
+     * @return    int        Number of permutations
+     */
+    public static function PERMUT($numObjs, $numInSet)
+    {
+        $numObjs  = PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
+        $numInSet = PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
+
+        if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
+            $numInSet = floor($numInSet);
+            if ($numObjs < $numInSet) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return round(PHPExcel_Calculation_MathTrig::FACT($numObjs) / PHPExcel_Calculation_MathTrig::FACT($numObjs - $numInSet));
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * POISSON
+     *
+     * Returns the Poisson distribution. A common application of the Poisson distribution
+     * is predicting the number of events over a specific time, such as the number of
+     * cars arriving at a toll plaza in 1 minute.
+     *
+     * @param    float        $value
+     * @param    float        $mean        Mean Value
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function POISSON($value, $mean, $cumulative)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $mean  = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+
+        if ((is_numeric($value)) && (is_numeric($mean))) {
+            if (($value < 0) || ($mean <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
+                if ($cumulative) {
+                    $summer = 0;
+                    for ($i = 0; $i <= floor($value); ++$i) {
+                        $summer += pow($mean, $i) / PHPExcel_Calculation_MathTrig::FACT($i);
+                    }
+                    return exp(0-$mean) * $summer;
+                } else {
+                    return (exp(0-$mean) * pow($mean, $value)) / PHPExcel_Calculation_MathTrig::FACT($value);
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * QUARTILE
+     *
+     * Returns the quartile of a data set.
+     *
+     * Excel Function:
+     *        QUARTILE(value1[,value2[, ...]],entry)
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    int            $entry            Quartile value in the range 1..3, inclusive.
+     * @return    float
+     */
+    public static function QUARTILE()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $entry = floor(array_pop($aArgs));
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry /= 4;
+            if (($entry < 0) || ($entry > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return self::PERCENTILE($aArgs, $entry);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * RANK
+     *
+     * Returns the rank of a number in a list of numbers.
+     *
+     * @param    number                The number whose rank you want to find.
+     * @param    array of number        An array of, or a reference to, a list of numbers.
+     * @param    mixed                Order to sort the values in the value set
+     * @return    float
+     */
+    public static function RANK($value, $valueSet, $order = 0)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $valueSet = PHPExcel_Calculation_Functions::flattenArray($valueSet);
+        $order = (is_null($order)) ? 0 : (integer) PHPExcel_Calculation_Functions::flattenSingleValue($order);
+
+        foreach ($valueSet as $key => $valueEntry) {
+            if (!is_numeric($valueEntry)) {
+                unset($valueSet[$key]);
+            }
+        }
+
+        if ($order == 0) {
+            rsort($valueSet, SORT_NUMERIC);
+        } else {
+            sort($valueSet, SORT_NUMERIC);
+        }
+        $pos = array_search($value, $valueSet);
+        if ($pos === false) {
+            return PHPExcel_Calculation_Functions::NA();
+        }
+
+        return ++$pos;
+    }
+
+
+    /**
+     * RSQ
+     *
+     * Returns the square of the Pearson product moment correlation coefficient through data points in known_y's and known_x's.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function RSQ($yValues, $xValues)
+    {
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getGoodnessOfFit();
+    }
+
+
+    /**
+     * SKEW
+     *
+     * Returns the skewness of a distribution. Skewness characterizes the degree of asymmetry
+     * of a distribution around its mean. Positive skewness indicates a distribution with an
+     * asymmetric tail extending toward more positive values. Negative skewness indicates a
+     * distribution with an asymmetric tail extending toward more negative values.
+     *
+     * @param    array    Data Series
+     * @return    float
+     */
+    public static function SKEW()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+        $mean = self::AVERAGE($aArgs);
+        $stdDev = self::STDEV($aArgs);
+
+        $count = $summer = 0;
+        // Loop through arguments
+        foreach ($aArgs as $k => $arg) {
+            if ((is_bool($arg)) &&
+                (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $summer += pow((($arg - $mean) / $stdDev), 3);
+                    ++$count;
+                }
+            }
+        }
+
+        if ($count > 2) {
+            return $summer * ($count / (($count-1) * ($count-2)));
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * SLOPE
+     *
+     * Returns the slope of the linear regression line through data points in known_y's and known_x's.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function SLOPE($yValues, $xValues)
+    {
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getSlope();
+    }
+
+
+    /**
+     * SMALL
+     *
+     * Returns the nth smallest value in a data set. You can use this function to
+     *        select a value based on its relative standing.
+     *
+     * Excel Function:
+     *        SMALL(value1[,value2[, ...]],entry)
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    int            $entry            Position (ordered from the smallest) in the array or range of data to return
+     * @return    float
+     */
+    public static function SMALL()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $entry = array_pop($aArgs);
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $mArgs = array();
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $mArgs[] = $arg;
+                }
+            }
+            $count = self::COUNT($mArgs);
+            $entry = floor(--$entry);
+            if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            sort($mArgs);
+            return $mArgs[$entry];
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * STANDARDIZE
+     *
+     * Returns a normalized value from a distribution characterized by mean and standard_dev.
+     *
+     * @param    float    $value        Value to normalize
+     * @param    float    $mean        Mean Value
+     * @param    float    $stdDev        Standard Deviation
+     * @return    float    Standardized value
+     */
+    public static function STANDARDIZE($value, $mean, $stdDev)
+    {
+        $value  = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $mean   = PHPExcel_Calculation_Functions::flattenSingleValue($mean);
+        $stdDev = PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
+
+        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
+            if ($stdDev <= 0) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            return ($value - $mean) / $stdDev ;
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * STDEV
+     *
+     * Estimates standard deviation based on a sample. The standard deviation is a measure of how
+     *        widely values are dispersed from the average value (the mean).
+     *
+     * Excel Function:
+     *        STDEV(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function STDEV()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+
+        // Return value
+        $returnValue = null;
+
+        $aMean = self::AVERAGE($aArgs);
+        if (!is_null($aMean)) {
+            $aCount = -1;
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) &&
+                    ((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+                    $arg = (integer) $arg;
+                }
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    if (is_null($returnValue)) {
+                        $returnValue = pow(($arg - $aMean), 2);
+                    } else {
+                        $returnValue += pow(($arg - $aMean), 2);
+                    }
+                    ++$aCount;
+                }
+            }
+
+            // Return
+            if (($aCount > 0) && ($returnValue >= 0)) {
+                return sqrt($returnValue / $aCount);
+            }
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * STDEVA
+     *
+     * Estimates standard deviation based on a sample, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        STDEVA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function STDEVA()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+
+        $returnValue = null;
+
+        $aMean = self::AVERAGEA($aArgs);
+        if (!is_null($aMean)) {
+            $aCount = -1;
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) &&
+                    (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+                } else {
+                    // Is it a numeric value?
+                    if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
+                        if (is_bool($arg)) {
+                            $arg = (integer) $arg;
+                        } elseif (is_string($arg)) {
+                            $arg = 0;
+                        }
+                        if (is_null($returnValue)) {
+                            $returnValue = pow(($arg - $aMean), 2);
+                        } else {
+                            $returnValue += pow(($arg - $aMean), 2);
+                        }
+                        ++$aCount;
+                    }
+                }
+            }
+
+            if (($aCount > 0) && ($returnValue >= 0)) {
+                return sqrt($returnValue / $aCount);
+            }
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * STDEVP
+     *
+     * Calculates standard deviation based on the entire population
+     *
+     * Excel Function:
+     *        STDEVP(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function STDEVP()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+
+        $returnValue = null;
+
+        $aMean = self::AVERAGE($aArgs);
+        if (!is_null($aMean)) {
+            $aCount = 0;
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) &&
+                    ((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
+                    $arg = (integer) $arg;
+                }
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    if (is_null($returnValue)) {
+                        $returnValue = pow(($arg - $aMean), 2);
+                    } else {
+                        $returnValue += pow(($arg - $aMean), 2);
+                    }
+                    ++$aCount;
+                }
+            }
+
+            if (($aCount > 0) && ($returnValue >= 0)) {
+                return sqrt($returnValue / $aCount);
+            }
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * STDEVPA
+     *
+     * Calculates standard deviation based on the entire population, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        STDEVPA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function STDEVPA()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+
+        $returnValue = null;
+
+        $aMean = self::AVERAGEA($aArgs);
+        if (!is_null($aMean)) {
+            $aCount = 0;
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) &&
+                    (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+                } else {
+                    // Is it a numeric value?
+                    if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
+                        if (is_bool($arg)) {
+                            $arg = (integer) $arg;
+                        } elseif (is_string($arg)) {
+                            $arg = 0;
+                        }
+                        if (is_null($returnValue)) {
+                            $returnValue = pow(($arg - $aMean), 2);
+                        } else {
+                            $returnValue += pow(($arg - $aMean), 2);
+                        }
+                        ++$aCount;
+                    }
+                }
+            }
+
+            if (($aCount > 0) && ($returnValue >= 0)) {
+                return sqrt($returnValue / $aCount);
+            }
+        }
+        return PHPExcel_Calculation_Functions::DIV0();
+    }
+
+
+    /**
+     * STEYX
+     *
+     * Returns the standard error of the predicted y-value for each x in the regression.
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @return    float
+     */
+    public static function STEYX($yValues, $xValues)
+    {
+        if (!self::checkTrendArrays($yValues, $xValues)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
+            return PHPExcel_Calculation_Functions::NA();
+        } elseif ($yValueCount == 1) {
+            return PHPExcel_Calculation_Functions::DIV0();
+        }
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues);
+        return $bestFitLinear->getStdevOfResiduals();
+    }
+
+
+    /**
+     * TDIST
+     *
+     * Returns the probability of Student's T distribution.
+     *
+     * @param    float        $value            Value for the function
+     * @param    float        $degrees        degrees of freedom
+     * @param    float        $tails            number of tails (1 or 2)
+     * @return    float
+     */
+    public static function TDIST($value, $degrees, $tails)
+    {
+        $value        = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $degrees    = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+        $tails        = floor(PHPExcel_Calculation_Functions::flattenSingleValue($tails));
+
+        if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
+            if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            //    tdist, which finds the probability that corresponds to a given value
+            //    of t with k degrees of freedom. This algorithm is translated from a
+            //    pascal function on p81 of "Statistical Computing in Pascal" by D
+            //    Cooke, A H Craven & G M Clark (1985: Edward Arnold (Pubs.) Ltd:
+            //    London). The above Pascal algorithm is itself a translation of the
+            //    fortran algoritm "AS 3" by B E Cooper of the Atlas Computer
+            //    Laboratory as reported in (among other places) "Applied Statistics
+            //    Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
+            //    Horwood Ltd.; W. Sussex, England).
+            $tterm = $degrees;
+            $ttheta = atan2($value, sqrt($tterm));
+            $tc = cos($ttheta);
+            $ts = sin($ttheta);
+            $tsum = 0;
+
+            if (($degrees % 2) == 1) {
+                $ti = 3;
+                $tterm = $tc;
+            } else {
+                $ti = 2;
+                $tterm = 1;
+            }
+
+            $tsum = $tterm;
+            while ($ti < $degrees) {
+                $tterm *= $tc * $tc * ($ti - 1) / $ti;
+                $tsum += $tterm;
+                $ti += 2;
+            }
+            $tsum *= $ts;
+            if (($degrees % 2) == 1) {
+                $tsum = M_2DIVPI * ($tsum + $ttheta);
+            }
+            $tValue = 0.5 * (1 + $tsum);
+            if ($tails == 1) {
+                return 1 - abs($tValue);
+            } else {
+                return 1 - abs((1 - $tValue) - $tValue);
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * TINV
+     *
+     * Returns the one-tailed probability of the chi-squared distribution.
+     *
+     * @param    float        $probability    Probability for the function
+     * @param    float        $degrees        degrees of freedom
+     * @return    float
+     */
+    public static function TINV($probability, $degrees)
+    {
+        $probability = PHPExcel_Calculation_Functions::flattenSingleValue($probability);
+        $degrees     = floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
+
+        if ((is_numeric($probability)) && (is_numeric($degrees))) {
+            $xLo = 100;
+            $xHi = 0;
+
+            $x = $xNew = 1;
+            $dx    = 1;
+            $i = 0;
+
+            while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
+                // Apply Newton-Raphson step
+                $result = self::TDIST($x, $degrees, 2);
+                $error = $result - $probability;
+                if ($error == 0.0) {
+                    $dx = 0;
+                } elseif ($error < 0.0) {
+                    $xLo = $x;
+                } else {
+                    $xHi = $x;
+                }
+                // Avoid division by zero
+                if ($result != 0.0) {
+                    $dx = $error / $result;
+                    $xNew = $x - $dx;
+                }
+                // If the NR fails to converge (which for example may be the
+                // case if the initial guess is too rough) we apply a bisection
+                // step to determine a more narrow interval around the root.
+                if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
+                    $xNew = ($xLo + $xHi) / 2;
+                    $dx = $xNew - $x;
+                }
+                $x = $xNew;
+            }
+            if ($i == MAX_ITERATIONS) {
+                return PHPExcel_Calculation_Functions::NA();
+            }
+            return round($x, 12);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * TREND
+     *
+     * Returns values along a linear trend
+     *
+     * @param    array of mixed        Data Series Y
+     * @param    array of mixed        Data Series X
+     * @param    array of mixed        Values of X for which we want to find Y
+     * @param    boolean                A logical value specifying whether to force the intersect to equal 0.
+     * @return    array of float
+     */
+    public static function TREND($yValues, $xValues = array(), $newValues = array(), $const = true)
+    {
+        $yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
+        $xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
+        $newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
+        $const = (is_null($const)) ? true : (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
+
+        $bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR, $yValues, $xValues, $const);
+        if (empty($newValues)) {
+            $newValues = $bestFitLinear->getXValues();
+        }
+
+        $returnArray = array();
+        foreach ($newValues as $xValue) {
+            $returnArray[0][] = $bestFitLinear->getValueOfYForX($xValue);
+        }
+
+        return $returnArray;
+    }
+
+
+    /**
+     * TRIMMEAN
+     *
+     * Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
+     *        taken by excluding a percentage of data points from the top and bottom tails
+     *        of a data set.
+     *
+     * Excel Function:
+     *        TRIMEAN(value1[,value2[, ...]], $discard)
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @param    float        $discard        Percentage to discard
+     * @return    float
+     */
+    public static function TRIMMEAN()
+    {
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+
+        // Calculate
+        $percent = array_pop($aArgs);
+
+        if ((is_numeric($percent)) && (!is_string($percent))) {
+            if (($percent < 0) || ($percent > 1)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            $mArgs = array();
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $mArgs[] = $arg;
+                }
+            }
+            $discard = floor(self::COUNT($mArgs) * $percent / 2);
+            sort($mArgs);
+            for ($i=0; $i < $discard; ++$i) {
+                array_pop($mArgs);
+                array_shift($mArgs);
+            }
+            return self::AVERAGE($mArgs);
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * VARFunc
+     *
+     * Estimates variance based on a sample.
+     *
+     * Excel Function:
+     *        VAR(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function VARFunc()
+    {
+        $returnValue = PHPExcel_Calculation_Functions::DIV0();
+
+        $summerA = $summerB = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            if (is_bool($arg)) {
+                $arg = (integer) $arg;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $summerA += ($arg * $arg);
+                $summerB += $arg;
+                ++$aCount;
+            }
+        }
+
+        if ($aCount > 1) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+            $returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * VARA
+     *
+     * Estimates variance based on a sample, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        VARA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function VARA()
+    {
+        $returnValue = PHPExcel_Calculation_Functions::DIV0();
+
+        $summerA = $summerB = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            if ((is_string($arg)) &&
+                (PHPExcel_Calculation_Functions::isValue($k))) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            } elseif ((is_string($arg)) &&
+                (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
+                    if (is_bool($arg)) {
+                        $arg = (integer) $arg;
+                    } elseif (is_string($arg)) {
+                        $arg = 0;
+                    }
+                    $summerA += ($arg * $arg);
+                    $summerB += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 1) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+            $returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * VARP
+     *
+     * Calculates variance based on the entire population
+     *
+     * Excel Function:
+     *        VARP(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function VARP()
+    {
+        // Return value
+        $returnValue = PHPExcel_Calculation_Functions::DIV0();
+
+        $summerA = $summerB = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            if (is_bool($arg)) {
+                $arg = (integer) $arg;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $summerA += ($arg * $arg);
+                $summerB += $arg;
+                ++$aCount;
+            }
+        }
+
+        if ($aCount > 0) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+            $returnValue = ($summerA - $summerB) / ($aCount * $aCount);
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * VARPA
+     *
+     * Calculates variance based on the entire population, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        VARPA(value1[,value2[, ...]])
+     *
+     * @access    public
+     * @category Statistical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    float
+     */
+    public static function VARPA()
+    {
+        $returnValue = PHPExcel_Calculation_Functions::DIV0();
+
+        $summerA = $summerB = 0;
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            if ((is_string($arg)) &&
+                (PHPExcel_Calculation_Functions::isValue($k))) {
+                return PHPExcel_Calculation_Functions::VALUE();
+            } elseif ((is_string($arg)) &&
+                (!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
+                    if (is_bool($arg)) {
+                        $arg = (integer) $arg;
+                    } elseif (is_string($arg)) {
+                        $arg = 0;
+                    }
+                    $summerA += ($arg * $arg);
+                    $summerB += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 0) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+            $returnValue = ($summerA - $summerB) / ($aCount * $aCount);
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * WEIBULL
+     *
+     * Returns the Weibull distribution. Use this distribution in reliability
+     * analysis, such as calculating a device's mean time to failure.
+     *
+     * @param    float        $value
+     * @param    float        $alpha        Alpha Parameter
+     * @param    float        $beta        Beta Parameter
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function WEIBULL($value, $alpha, $beta, $cumulative)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $alpha = PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
+        $beta  = PHPExcel_Calculation_Functions::flattenSingleValue($beta);
+
+        if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta))) {
+            if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
+                return PHPExcel_Calculation_Functions::NaN();
+            }
+            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
+                if ($cumulative) {
+                    return 1 - exp(0 - pow($value / $beta, $alpha));
+                } else {
+                    return ($alpha / pow($beta, $alpha)) * pow($value, $alpha - 1) * exp(0 - pow($value / $beta, $alpha));
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * ZTEST
+     *
+     * Returns the Weibull distribution. Use this distribution in reliability
+     * analysis, such as calculating a device's mean time to failure.
+     *
+     * @param    float        $dataSet
+     * @param    float        $m0        Alpha Parameter
+     * @param    float        $sigma    Beta Parameter
+     * @param    boolean        $cumulative
+     * @return    float
+     *
+     */
+    public static function ZTEST($dataSet, $m0, $sigma = null)
+    {
+        $dataSet = PHPExcel_Calculation_Functions::flattenArrayIndexed($dataSet);
+        $m0      = PHPExcel_Calculation_Functions::flattenSingleValue($m0);
+        $sigma   = PHPExcel_Calculation_Functions::flattenSingleValue($sigma);
+
+        if (is_null($sigma)) {
+            $sigma = self::STDEV($dataSet);
+        }
+        $n = count($dataSet);
+
+        return 1 - self::NORMSDIST((self::AVERAGE($dataSet) - $m0) / ($sigma / SQRT($n)));
+    }
+}
diff --git a/lib/PHPExcel/Calculation/TextData.php b/lib/PHPExcel/Calculation/TextData.php
new file mode 100644
index 000000000..b5eeec7f2
--- /dev/null
+++ b/lib/PHPExcel/Calculation/TextData.php
@@ -0,0 +1,651 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_TextData
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Calculation
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_TextData
+{
+    private static $invalidChars;
+
+    private static function unicodeToOrd($c)
+    {
+        if (ord($c[0]) >=0 && ord($c[0]) <= 127) {
+            return ord($c[0]);
+        } elseif (ord($c[0]) >= 192 && ord($c[0]) <= 223) {
+            return (ord($c[0])-192)*64 + (ord($c[1])-128);
+        } elseif (ord($c[0]) >= 224 && ord($c[0]) <= 239) {
+            return (ord($c[0])-224)*4096 + (ord($c[1])-128)*64 + (ord($c[2])-128);
+        } elseif (ord($c[0]) >= 240 && ord($c[0]) <= 247) {
+            return (ord($c[0])-240)*262144 + (ord($c[1])-128)*4096 + (ord($c[2])-128)*64 + (ord($c[3])-128);
+        } elseif (ord($c[0]) >= 248 && ord($c[0]) <= 251) {
+            return (ord($c[0])-248)*16777216 + (ord($c[1])-128)*262144 + (ord($c[2])-128)*4096 + (ord($c[3])-128)*64 + (ord($c[4])-128);
+        } elseif (ord($c[0]) >= 252 && ord($c[0]) <= 253) {
+            return (ord($c[0])-252)*1073741824 + (ord($c[1])-128)*16777216 + (ord($c[2])-128)*262144 + (ord($c[3])-128)*4096 + (ord($c[4])-128)*64 + (ord($c[5])-128);
+        } elseif (ord($c[0]) >= 254 && ord($c[0]) <= 255) {
+            // error
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return 0;
+    }
+
+    /**
+     * CHARACTER
+     *
+     * @param    string    $character    Value
+     * @return    int
+     */
+    public static function CHARACTER($character)
+    {
+        $character = PHPExcel_Calculation_Functions::flattenSingleValue($character);
+
+        if ((!is_numeric($character)) || ($character < 0)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding('&#'.intval($character).';', 'UTF-8', 'HTML-ENTITIES');
+        } else {
+            return chr(intval($character));
+        }
+    }
+
+
+    /**
+     * TRIMNONPRINTABLE
+     *
+     * @param    mixed    $stringValue    Value to check
+     * @return    string
+     */
+    public static function TRIMNONPRINTABLE($stringValue = '')
+    {
+        $stringValue    = PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
+
+        if (is_bool($stringValue)) {
+            return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        if (self::$invalidChars == null) {
+            self::$invalidChars = range(chr(0), chr(31));
+        }
+
+        if (is_string($stringValue) || is_numeric($stringValue)) {
+            return str_replace(self::$invalidChars, '', trim($stringValue, "\x00..\x1F"));
+        }
+        return null;
+    }
+
+
+    /**
+     * TRIMSPACES
+     *
+     * @param    mixed    $stringValue    Value to check
+     * @return    string
+     */
+    public static function TRIMSPACES($stringValue = '')
+    {
+        $stringValue = PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
+        if (is_bool($stringValue)) {
+            return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        if (is_string($stringValue) || is_numeric($stringValue)) {
+            return trim(preg_replace('/ +/', ' ', trim($stringValue, ' ')), ' ');
+        }
+        return null;
+    }
+
+
+    /**
+     * ASCIICODE
+     *
+     * @param    string    $characters        Value
+     * @return    int
+     */
+    public static function ASCIICODE($characters)
+    {
+        if (($characters === null) || ($characters === '')) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        $characters    = PHPExcel_Calculation_Functions::flattenSingleValue($characters);
+        if (is_bool($characters)) {
+            if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                $characters = (int) $characters;
+            } else {
+                $characters = ($characters) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+            }
+        }
+
+        $character = $characters;
+        if ((function_exists('mb_strlen')) && (function_exists('mb_substr'))) {
+            if (mb_strlen($characters, 'UTF-8') > 1) {
+                $character = mb_substr($characters, 0, 1, 'UTF-8');
+            }
+            return self::unicodeToOrd($character);
+        } else {
+            if (strlen($characters) > 0) {
+                $character = substr($characters, 0, 1);
+            }
+            return ord($character);
+        }
+    }
+
+
+    /**
+     * CONCATENATE
+     *
+     * @return    string
+     */
+    public static function CONCATENATE()
+    {
+        $returnValue = '';
+
+        // Loop through arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        foreach ($aArgs as $arg) {
+            if (is_bool($arg)) {
+                if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
+                    $arg = (int) $arg;
+                } else {
+                    $arg = ($arg) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+                }
+            }
+            $returnValue .= $arg;
+        }
+
+        return $returnValue;
+    }
+
+
+    /**
+     * DOLLAR
+     *
+     * This function converts a number to text using currency format, with the decimals rounded to the specified place.
+     * The format used is $#,##0.00_);($#,##0.00)..
+     *
+     * @param    float    $value            The value to format
+     * @param    int        $decimals        The number of digits to display to the right of the decimal point.
+     *                                    If decimals is negative, number is rounded to the left of the decimal point.
+     *                                    If you omit decimals, it is assumed to be 2
+     * @return    string
+     */
+    public static function DOLLAR($value = 0, $decimals = 2)
+    {
+        $value        = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $decimals    = is_null($decimals) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
+
+        // Validate parameters
+        if (!is_numeric($value) || !is_numeric($decimals)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $decimals = floor($decimals);
+
+        $mask = '$#,##0';
+        if ($decimals > 0) {
+            $mask .= '.' . str_repeat('0', $decimals);
+        } else {
+            $round = pow(10, abs($decimals));
+            if ($value < 0) {
+                $round = 0-$round;
+            }
+            $value = PHPExcel_Calculation_MathTrig::MROUND($value, $round);
+        }
+
+        return PHPExcel_Style_NumberFormat::toFormattedString($value, $mask);
+
+    }
+
+
+    /**
+     * SEARCHSENSITIVE
+     *
+     * @param    string    $needle        The string to look for
+     * @param    string    $haystack    The string in which to look
+     * @param    int        $offset        Offset within $haystack
+     * @return    string
+     */
+    public static function SEARCHSENSITIVE($needle, $haystack, $offset = 1)
+    {
+        $needle   = PHPExcel_Calculation_Functions::flattenSingleValue($needle);
+        $haystack = PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
+        $offset   = PHPExcel_Calculation_Functions::flattenSingleValue($offset);
+
+        if (!is_bool($needle)) {
+            if (is_bool($haystack)) {
+                $haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+            }
+
+            if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
+                if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
+                    return $offset;
+                }
+                if (function_exists('mb_strpos')) {
+                    $pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
+                } else {
+                    $pos = strpos($haystack, $needle, --$offset);
+                }
+                if ($pos !== false) {
+                    return ++$pos;
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * SEARCHINSENSITIVE
+     *
+     * @param    string    $needle        The string to look for
+     * @param    string    $haystack    The string in which to look
+     * @param    int        $offset        Offset within $haystack
+     * @return    string
+     */
+    public static function SEARCHINSENSITIVE($needle, $haystack, $offset = 1)
+    {
+        $needle   = PHPExcel_Calculation_Functions::flattenSingleValue($needle);
+        $haystack = PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
+        $offset   = PHPExcel_Calculation_Functions::flattenSingleValue($offset);
+
+        if (!is_bool($needle)) {
+            if (is_bool($haystack)) {
+                $haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+            }
+
+            if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
+                if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
+                    return $offset;
+                }
+                if (function_exists('mb_stripos')) {
+                    $pos = mb_stripos($haystack, $needle, --$offset, 'UTF-8');
+                } else {
+                    $pos = stripos($haystack, $needle, --$offset);
+                }
+                if ($pos !== false) {
+                    return ++$pos;
+                }
+            }
+        }
+        return PHPExcel_Calculation_Functions::VALUE();
+    }
+
+
+    /**
+     * FIXEDFORMAT
+     *
+     * @param    mixed        $value    Value to check
+     * @param    integer        $decimals
+     * @param    boolean        $no_commas
+     * @return    boolean
+     */
+    public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = false)
+    {
+        $value     = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $decimals  = PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
+        $no_commas = PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
+
+        // Validate parameters
+        if (!is_numeric($value) || !is_numeric($decimals)) {
+            return PHPExcel_Calculation_Functions::NaN();
+        }
+        $decimals = floor($decimals);
+
+        $valueResult = round($value, $decimals);
+        if ($decimals < 0) {
+            $decimals = 0;
+        }
+        if (!$no_commas) {
+            $valueResult = number_format($valueResult, $decimals);
+        }
+
+        return (string) $valueResult;
+    }
+
+
+    /**
+     * LEFT
+     *
+     * @param    string    $value    Value
+     * @param    int        $chars    Number of characters
+     * @return    string
+     */
+    public static function LEFT($value = '', $chars = 1)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $chars = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
+
+        if ($chars < 0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (is_bool($value)) {
+            $value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        if (function_exists('mb_substr')) {
+            return mb_substr($value, 0, $chars, 'UTF-8');
+        } else {
+            return substr($value, 0, $chars);
+        }
+    }
+
+
+    /**
+     * MID
+     *
+     * @param    string    $value    Value
+     * @param    int        $start    Start character
+     * @param    int        $chars    Number of characters
+     * @return    string
+     */
+    public static function MID($value = '', $start = 1, $chars = null)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $start = PHPExcel_Calculation_Functions::flattenSingleValue($start);
+        $chars = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
+
+        if (($start < 1) || ($chars < 0)) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (is_bool($value)) {
+            $value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        if (function_exists('mb_substr')) {
+            return mb_substr($value, --$start, $chars, 'UTF-8');
+        } else {
+            return substr($value, --$start, $chars);
+        }
+    }
+
+
+    /**
+     * RIGHT
+     *
+     * @param    string    $value    Value
+     * @param    int        $chars    Number of characters
+     * @return    string
+     */
+    public static function RIGHT($value = '', $chars = 1)
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $chars = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
+
+        if ($chars < 0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        if (is_bool($value)) {
+            $value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        if ((function_exists('mb_substr')) && (function_exists('mb_strlen'))) {
+            return mb_substr($value, mb_strlen($value, 'UTF-8') - $chars, $chars, 'UTF-8');
+        } else {
+            return substr($value, strlen($value) - $chars);
+        }
+    }
+
+
+    /**
+     * STRINGLENGTH
+     *
+     * @param    string    $value    Value
+     * @return    string
+     */
+    public static function STRINGLENGTH($value = '')
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        if (is_bool($value)) {
+            $value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        if (function_exists('mb_strlen')) {
+            return mb_strlen($value, 'UTF-8');
+        } else {
+            return strlen($value);
+        }
+    }
+
+
+    /**
+     * LOWERCASE
+     *
+     * Converts a string value to upper case.
+     *
+     * @param    string        $mixedCaseString
+     * @return    string
+     */
+    public static function LOWERCASE($mixedCaseString)
+    {
+        $mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
+
+        if (is_bool($mixedCaseString)) {
+            $mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        return PHPExcel_Shared_String::StrToLower($mixedCaseString);
+    }
+
+
+    /**
+     * UPPERCASE
+     *
+     * Converts a string value to upper case.
+     *
+     * @param    string        $mixedCaseString
+     * @return    string
+     */
+    public static function UPPERCASE($mixedCaseString)
+    {
+        $mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
+
+        if (is_bool($mixedCaseString)) {
+            $mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        return PHPExcel_Shared_String::StrToUpper($mixedCaseString);
+    }
+
+
+    /**
+     * PROPERCASE
+     *
+     * Converts a string value to upper case.
+     *
+     * @param    string        $mixedCaseString
+     * @return    string
+     */
+    public static function PROPERCASE($mixedCaseString)
+    {
+        $mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
+
+        if (is_bool($mixedCaseString)) {
+            $mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
+        }
+
+        return PHPExcel_Shared_String::StrToTitle($mixedCaseString);
+    }
+
+
+    /**
+     * REPLACE
+     *
+     * @param    string    $oldText    String to modify
+     * @param    int        $start        Start character
+     * @param    int        $chars        Number of characters
+     * @param    string    $newText    String to replace in defined position
+     * @return    string
+     */
+    public static function REPLACE($oldText = '', $start = 1, $chars = null, $newText)
+    {
+        $oldText = PHPExcel_Calculation_Functions::flattenSingleValue($oldText);
+        $start   = PHPExcel_Calculation_Functions::flattenSingleValue($start);
+        $chars   = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
+        $newText = PHPExcel_Calculation_Functions::flattenSingleValue($newText);
+
+        $left = self::LEFT($oldText, $start-1);
+        $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText)-($start+$chars)+1);
+
+        return $left.$newText.$right;
+    }
+
+
+    /**
+     * SUBSTITUTE
+     *
+     * @param    string    $text        Value
+     * @param    string    $fromText    From Value
+     * @param    string    $toText        To Value
+     * @param    integer    $instance    Instance Number
+     * @return    string
+     */
+    public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0)
+    {
+        $text     = PHPExcel_Calculation_Functions::flattenSingleValue($text);
+        $fromText = PHPExcel_Calculation_Functions::flattenSingleValue($fromText);
+        $toText   = PHPExcel_Calculation_Functions::flattenSingleValue($toText);
+        $instance = floor(PHPExcel_Calculation_Functions::flattenSingleValue($instance));
+
+        if ($instance == 0) {
+            if (function_exists('mb_str_replace')) {
+                return mb_str_replace($fromText, $toText, $text);
+            } else {
+                return str_replace($fromText, $toText, $text);
+            }
+        } else {
+            $pos = -1;
+            while ($instance > 0) {
+                if (function_exists('mb_strpos')) {
+                    $pos = mb_strpos($text, $fromText, $pos+1, 'UTF-8');
+                } else {
+                    $pos = strpos($text, $fromText, $pos+1);
+                }
+                if ($pos === false) {
+                    break;
+                }
+                --$instance;
+            }
+            if ($pos !== false) {
+                if (function_exists('mb_strlen')) {
+                    return self::REPLACE($text, ++$pos, mb_strlen($fromText, 'UTF-8'), $toText);
+                } else {
+                    return self::REPLACE($text, ++$pos, strlen($fromText), $toText);
+                }
+            }
+        }
+
+        return $text;
+    }
+
+
+    /**
+     * RETURNSTRING
+     *
+     * @param    mixed    $testValue    Value to check
+     * @return    boolean
+     */
+    public static function RETURNSTRING($testValue = '')
+    {
+        $testValue = PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
+
+        if (is_string($testValue)) {
+            return $testValue;
+        }
+        return null;
+    }
+
+
+    /**
+     * TEXTFORMAT
+     *
+     * @param    mixed    $value    Value to check
+     * @param    string    $format    Format mask to use
+     * @return    boolean
+     */
+    public static function TEXTFORMAT($value, $format)
+    {
+        $value  = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+        $format = PHPExcel_Calculation_Functions::flattenSingleValue($format);
+
+        if ((is_string($value)) && (!is_numeric($value)) && PHPExcel_Shared_Date::isDateTimeFormatCode($format)) {
+            $value = PHPExcel_Calculation_DateTime::DATEVALUE($value);
+        }
+
+        return (string) PHPExcel_Style_NumberFormat::toFormattedString($value, $format);
+    }
+
+    /**
+     * VALUE
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function VALUE($value = '')
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        if (!is_numeric($value)) {
+            $numberValue = str_replace(
+                PHPExcel_Shared_String::getThousandsSeparator(),
+                '',
+                trim($value, " \t\n\r\0\x0B" . PHPExcel_Shared_String::getCurrencyCode())
+            );
+            if (is_numeric($numberValue)) {
+                return (float) $numberValue;
+            }
+
+            $dateSetting = PHPExcel_Calculation_Functions::getReturnDateType();
+            PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+
+            if (strpos($value, ':') !== false) {
+                $timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($value);
+                if ($timeValue !== PHPExcel_Calculation_Functions::VALUE()) {
+                    PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
+                    return $timeValue;
+                }
+            }
+            $dateValue = PHPExcel_Calculation_DateTime::DATEVALUE($value);
+            if ($dateValue !== PHPExcel_Calculation_Functions::VALUE()) {
+                PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
+                return $dateValue;
+            }
+            PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
+
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return (float) $value;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/Token/Stack.php b/lib/PHPExcel/Calculation/Token/Stack.php
new file mode 100644
index 000000000..02ed5aaf0
--- /dev/null
+++ b/lib/PHPExcel/Calculation/Token/Stack.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * PHPExcel_Calculation_Token_Stack
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Calculation_Token_Stack
+{
+    /**
+     *  The parser stack for formulae
+     *
+     *  @var mixed[]
+     */
+    private $stack = array();
+
+    /**
+     *  Count of entries in the parser stack
+     *
+     *  @var integer
+     */
+    private $count = 0;
+
+    /**
+     * Return the number of entries on the stack
+     *
+     * @return  integer
+     */
+    public function count()
+    {
+        return $this->count;
+    }
+
+    /**
+     * Push a new entry onto the stack
+     *
+     * @param  mixed  $type
+     * @param  mixed  $value
+     * @param  mixed  $reference
+     */
+    public function push($type, $value, $reference = null)
+    {
+        $this->stack[$this->count++] = array(
+            'type'      => $type,
+            'value'     => $value,
+            'reference' => $reference
+        );
+        if ($type == 'Function') {
+            $localeFunction = PHPExcel_Calculation::localeFunc($value);
+            if ($localeFunction != $value) {
+                $this->stack[($this->count - 1)]['localeValue'] = $localeFunction;
+            }
+        }
+    }
+
+    /**
+     * Pop the last entry from the stack
+     *
+     * @return  mixed
+     */
+    public function pop()
+    {
+        if ($this->count > 0) {
+            return $this->stack[--$this->count];
+        }
+        return null;
+    }
+
+    /**
+     * Return an entry from the stack without removing it
+     *
+     * @param   integer  $n  number indicating how far back in the stack we want to look
+     * @return  mixed
+     */
+    public function last($n = 1)
+    {
+        if ($this->count - $n < 0) {
+            return null;
+        }
+        return $this->stack[$this->count - $n];
+    }
+
+    /**
+     * Clear the stack
+     */
+    public function clear()
+    {
+        $this->stack = array();
+        $this->count = 0;
+    }
+}
diff --git a/lib/PHPExcel/Calculation/functionlist.txt b/lib/PHPExcel/Calculation/functionlist.txt
new file mode 100644
index 000000000..67dbd49cf
--- /dev/null
+++ b/lib/PHPExcel/Calculation/functionlist.txt
@@ -0,0 +1,351 @@
+ABS
+ACCRINT
+ACCRINTM
+ACOS
+ACOSH
+ADDRESS
+AMORDEGRC
+AMORLINC
+AND
+AREAS
+ASC
+ASIN
+ASINH
+ATAN
+ATAN2
+ATANH
+AVEDEV
+AVERAGE
+AVERAGEA
+AVERAGEIF
+AVERAGEIFS
+BAHTTEXT
+BESSELI
+BESSELJ
+BESSELK
+BESSELY
+BETADIST
+BETAINV
+BIN2DEC
+BIN2HEX
+BIN2OCT
+BINOMDIST
+CEILING
+CELL
+CHAR
+CHIDIST
+CHIINV
+CHITEST
+CHOOSE
+CLEAN
+CODE
+COLUMN
+COLUMNS
+COMBIN
+COMPLEX
+CONCATENATE
+CONFIDENCE
+CONVERT
+CORREL
+COS
+COSH
+COUNT
+COUNTA
+COUNTBLANK
+COUNTIF
+COUNTIFS
+COUPDAYBS
+COUPDAYBS
+COUPDAYSNC
+COUPNCD
+COUPNUM
+COUPPCD
+COVAR
+CRITBINOM
+CUBEKPIMEMBER
+CUBEMEMBER
+CUBEMEMBERPROPERTY
+CUBERANKEDMEMBER
+CUBESET
+CUBESETCOUNT
+CUBEVALUE
+CUMIPMT
+CUMPRINC
+DATE
+DATEDIF
+DATEVALUE
+DAVERAGE
+DAY
+DAYS360
+DB
+DCOUNT
+DCOUNTA
+DDB
+DEC2BIN
+DEC2HEX
+DEC2OCT
+DEGREES
+DELTA
+DEVSQ
+DGET
+DISC
+DMAX
+DMIN
+DOLLAR
+DOLLARDE
+DOLLARFR
+DPRODUCT
+DSTDEV
+DSTDEVP
+DSUM
+DURATION
+DVAR
+DVARP
+EDATE
+EFFECT
+EOMONTH
+ERF
+ERFC
+ERROR.TYPE
+EVEN
+EXACT
+EXP
+EXPONDIST
+FACT
+FACTDOUBLE
+FALSE
+FDIST
+FIND
+FINDB
+FINV
+FISHER
+FISHERINV
+FIXED
+FLOOR
+FORECAST
+FREQUENCY
+FTEST
+FV
+FVSCHEDULE
+GAMAMDIST
+GAMMAINV
+GAMMALN
+GCD
+GEOMEAN
+GESTEP
+GETPIVOTDATA
+GROWTH
+HARMEAN
+HEX2BIN
+HEX2OCT
+HLOOKUP
+HOUR
+HYPERLINK
+HYPGEOMDIST
+IF
+IFERROR
+IMABS
+IMAGINARY
+IMARGUMENT
+IMCONJUGATE
+IMCOS
+IMEXP
+IMLN
+IMLOG10
+IMLOG2
+IMPOWER
+IMPRODUCT
+IMREAL
+IMSIN
+IMSQRT
+IMSUB
+IMSUM
+INDEX
+INDIRECT
+INFO
+INT
+INTERCEPT
+INTRATE
+IPMT
+IRR
+ISBLANK
+ISERR
+ISERROR
+ISEVEN
+ISLOGICAL
+ISNA
+ISNONTEXT
+ISNUMBER
+ISODD
+ISPMT
+ISREF
+ISTEXT
+JIS
+KURT
+LARGE
+LCM
+LEFT
+LEFTB
+LEN
+LENB
+LINEST
+LN
+LOG
+LOG10
+LOGEST
+LOGINV
+LOGNORMDIST
+LOOKUP
+LOWER
+MATCH
+MAX
+MAXA
+MDETERM
+MDURATION
+MEDIAN
+MID
+MIDB
+MIN
+MINA
+MINUTE
+MINVERSE
+MIRR
+MMULT
+MOD
+MODE
+MONTH
+MROUND
+MULTINOMIAL
+N
+NA
+NEGBINOMDIST
+NETWORKDAYS
+NOMINAL
+NORMDIST
+NORMINV
+NORMSDIST
+NORMSINV
+NOT
+NOW
+NPER
+NPV
+OCT2BIN
+OCT2DEC
+OCT2HEX
+ODD
+ODDFPRICE
+ODDFYIELD
+ODDLPRICE
+ODDLYIELD
+OFFSET
+OR
+PEARSON
+PERCENTILE
+PERCENTRANK
+PERMUT
+PHONETIC
+PI
+PMT
+POISSON
+POWER
+PPMT
+PRICE
+PRICEDISC
+PRICEMAT
+PROB
+PRODUCT
+PROPER
+PV
+QUARTILE
+QUOTIENT
+RADIANS
+RAND
+RANDBETWEEN
+RANK
+RATE
+RECEIVED
+REPLACE
+REPLACEB
+REPT
+RIGHT
+RIGHTB
+ROMAN
+ROUND
+ROUNDDOWN
+ROUNDUP
+ROW
+ROWS
+RSQ
+RTD
+SEARCH
+SEARCHB
+SECOND
+SERIESSUM
+SIGN
+SIN
+SINH
+SKEW
+SLN
+SLOPE
+SMALL
+SQRT
+SQRTPI
+STANDARDIZE
+STDEV
+STDEVA
+STDEVP
+STDEVPA
+STEYX
+SUBSTITUTE
+SUBTOTAL
+SUM
+SUMIF
+SUMIFS
+SUMPRODUCT
+SUMSQ
+SUMX2MY2
+SUMX2PY2
+SUMXMY2
+SYD
+T
+TAN
+TANH
+TBILLEQ
+TBILLPRICE
+TBILLYIELD
+TDIST
+TEXT
+TIME
+TIMEVALUE
+TINV
+TODAY
+TRANSPOSE
+TREND
+TRIM
+TRIMMEAN
+TRUE
+TRUNC
+TTEST
+TYPE
+UPPER
+USDOLLAR
+VALUE
+VAR
+VARA
+VARP
+VARPA
+VDB
+VERSION
+VLOOKUP
+WEEKDAY
+WEEKNUM
+WEIBULL
+WORKDAY
+XIRR
+XNPV
+YEAR
+YEARFRAC
+YIELD
+YIELDDISC
+YIELDMAT
+ZTEST
diff --git a/lib/PHPExcel/Cell.php b/lib/PHPExcel/Cell.php
new file mode 100644
index 000000000..4b1437f55
--- /dev/null
+++ b/lib/PHPExcel/Cell.php
@@ -0,0 +1,1032 @@
+<?php
+
+/**
+ *    PHPExcel_Cell
+ *
+ *    Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License as published by the Free Software Foundation; either
+ *    version 2.1 of the License, or (at your option) any later version.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *    @category    PHPExcel
+ *    @package    PHPExcel_Cell
+ *    @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *    @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *    @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Cell
+{
+    /**
+     *  Default range variable constant
+     *
+     *  @var  string
+     */
+    const DEFAULT_RANGE = 'A1:A1';
+
+    /**
+     *    Value binder to use
+     *
+     *    @var    PHPExcel_Cell_IValueBinder
+     */
+    private static $valueBinder;
+
+    /**
+     *    Value of the cell
+     *
+     *    @var    mixed
+     */
+    private $value;
+
+    /**
+     *    Calculated value of the cell (used for caching)
+     *    This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
+     *        create the original spreadsheet file.
+     *    Note that this value is not guaranteed to reflect the actual calculated value because it is
+     *        possible that auto-calculation was disabled in the original spreadsheet, and underlying data
+     *        values used by the formula have changed since it was last calculated.
+     *
+     *    @var mixed
+     */
+    private $calculatedValue;
+
+    /**
+     *    Type of the cell data
+     *
+     *    @var    string
+     */
+    private $dataType;
+
+    /**
+     *    Parent worksheet
+     *
+     *    @var    PHPExcel_CachedObjectStorage_CacheBase
+     */
+    private $parent;
+
+    /**
+     *    Index to cellXf
+     *
+     *    @var    int
+     */
+    private $xfIndex = 0;
+
+    /**
+     *    Attributes of the formula
+     *
+     */
+    private $formulaAttributes;
+
+
+    /**
+     *    Send notification to the cache controller
+     *
+     *    @return void
+     **/
+    public function notifyCacheController()
+    {
+        $this->parent->updateCacheData($this);
+
+        return $this;
+    }
+
+    public function detach()
+    {
+        $this->parent = null;
+    }
+
+    public function attach(PHPExcel_CachedObjectStorage_CacheBase $parent)
+    {
+        $this->parent = $parent;
+    }
+
+
+    /**
+     *    Create a new Cell
+     *
+     *    @param    mixed                $pValue
+     *    @param    string                $pDataType
+     *    @param    PHPExcel_Worksheet    $pSheet
+     *    @throws    PHPExcel_Exception
+     */
+    public function __construct($pValue = null, $pDataType = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // Initialise cell value
+        $this->value = $pValue;
+
+        // Set worksheet cache
+        $this->parent = $pSheet->getCellCacheController();
+
+        // Set datatype?
+        if ($pDataType !== null) {
+            if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2) {
+                $pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+            }
+            $this->dataType = $pDataType;
+        } elseif (!self::getValueBinder()->bindValue($this, $pValue)) {
+            throw new PHPExcel_Exception("Value could not be bound to cell.");
+        }
+    }
+
+    /**
+     *    Get cell coordinate column
+     *
+     *    @return    string
+     */
+    public function getColumn()
+    {
+        return $this->parent->getCurrentColumn();
+    }
+
+    /**
+     *    Get cell coordinate row
+     *
+     *    @return    int
+     */
+    public function getRow()
+    {
+        return $this->parent->getCurrentRow();
+    }
+
+    /**
+     *    Get cell coordinate
+     *
+     *    @return    string
+     */
+    public function getCoordinate()
+    {
+        return $this->parent->getCurrentAddress();
+    }
+
+    /**
+     *    Get cell value
+     *
+     *    @return    mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     *    Get cell value with formatting
+     *
+     *    @return    string
+     */
+    public function getFormattedValue()
+    {
+        return (string) PHPExcel_Style_NumberFormat::toFormattedString(
+            $this->getCalculatedValue(),
+            $this->getStyle()
+                ->getNumberFormat()->getFormatCode()
+        );
+    }
+
+    /**
+     *    Set cell value
+     *
+     *    Sets the value for a cell, automatically determining the datatype using the value binder
+     *
+     *    @param    mixed    $pValue                    Value
+     *    @return    PHPExcel_Cell
+     *    @throws    PHPExcel_Exception
+     */
+    public function setValue($pValue = null)
+    {
+        if (!self::getValueBinder()->bindValue($this, $pValue)) {
+            throw new PHPExcel_Exception("Value could not be bound to cell.");
+        }
+        return $this;
+    }
+
+    /**
+     *    Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder)
+     *
+     *    @param    mixed    $pValue            Value
+     *    @param    string    $pDataType        Explicit data type
+     *    @return    PHPExcel_Cell
+     *    @throws    PHPExcel_Exception
+     */
+    public function setValueExplicit($pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
+    {
+        // set the value according to data type
+        switch ($pDataType) {
+            case PHPExcel_Cell_DataType::TYPE_NULL:
+                $this->value = $pValue;
+                break;
+            case PHPExcel_Cell_DataType::TYPE_STRING2:
+                $pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+                // no break
+            case PHPExcel_Cell_DataType::TYPE_STRING:
+                // Synonym for string
+            case PHPExcel_Cell_DataType::TYPE_INLINE:
+                // Rich text
+                $this->value = PHPExcel_Cell_DataType::checkString($pValue);
+                break;
+            case PHPExcel_Cell_DataType::TYPE_NUMERIC:
+                $this->value = (float) $pValue;
+                break;
+            case PHPExcel_Cell_DataType::TYPE_FORMULA:
+                $this->value = (string) $pValue;
+                break;
+            case PHPExcel_Cell_DataType::TYPE_BOOL:
+                $this->value = (bool) $pValue;
+                break;
+            case PHPExcel_Cell_DataType::TYPE_ERROR:
+                $this->value = PHPExcel_Cell_DataType::checkErrorCode($pValue);
+                break;
+            default:
+                throw new PHPExcel_Exception('Invalid datatype: ' . $pDataType);
+                break;
+        }
+
+        // set the datatype
+        $this->dataType = $pDataType;
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *    Get calculated cell value
+     *
+     *    @deprecated        Since version 1.7.8 for planned changes to cell for array formula handling
+     *
+     *    @param    boolean $resetLog  Whether the calculation engine logger should be reset or not
+     *    @return    mixed
+     *    @throws    PHPExcel_Exception
+     */
+    public function getCalculatedValue($resetLog = true)
+    {
+//echo 'Cell '.$this->getCoordinate().' value is a '.$this->dataType.' with a value of '.$this->getValue().PHP_EOL;
+        if ($this->dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
+            try {
+//echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value'.PHP_EOL;
+                $result = PHPExcel_Calculation::getInstance(
+                    $this->getWorksheet()->getParent()
+                )->calculateCellValue($this, $resetLog);
+//echo $this->getCoordinate().' calculation result is '.$result.PHP_EOL;
+                //    We don't yet handle array returns
+                if (is_array($result)) {
+                    while (is_array($result)) {
+                        $result = array_pop($result);
+                    }
+                }
+            } catch (PHPExcel_Exception $ex) {
+                if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
+//echo 'Returning fallback value of '.$this->calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
+                    return $this->calculatedValue; // Fallback for calculations referencing external files.
+                }
+//echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL;
+                $result = '#N/A';
+                throw new PHPExcel_Calculation_Exception(
+                    $this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
+                );
+            }
+
+            if ($result === '#Not Yet Implemented') {
+//echo 'Returning fallback value of '.$this->calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
+                return $this->calculatedValue; // Fallback if calculation engine does not support the formula.
+            }
+//echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().PHP_EOL;
+            return $result;
+        } elseif ($this->value instanceof PHPExcel_RichText) {
+//        echo 'Cell value for '.$this->getCoordinate().' is rich text: Returning data value of '.$this->value.'<br />';
+            return $this->value->getPlainText();
+        }
+//        echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->value.'<br />';
+        return $this->value;
+    }
+
+    /**
+     *    Set old calculated value (cached)
+     *
+     *    @param    mixed $pValue    Value
+     *    @return    PHPExcel_Cell
+     */
+    public function setCalculatedValue($pValue = null)
+    {
+        if ($pValue !== null) {
+            $this->calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
+        }
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *    Get old calculated value (cached)
+     *    This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
+     *        create the original spreadsheet file.
+     *    Note that this value is not guaranteed to refelect the actual calculated value because it is
+     *        possible that auto-calculation was disabled in the original spreadsheet, and underlying data
+     *        values used by the formula have changed since it was last calculated.
+     *
+     *    @return    mixed
+     */
+    public function getOldCalculatedValue()
+    {
+        return $this->calculatedValue;
+    }
+
+    /**
+     *    Get cell data type
+     *
+     *    @return string
+     */
+    public function getDataType()
+    {
+        return $this->dataType;
+    }
+
+    /**
+     *    Set cell data type
+     *
+     *    @param    string $pDataType
+     *    @return    PHPExcel_Cell
+     */
+    public function setDataType($pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
+    {
+        if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2) {
+            $pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+        }
+        $this->dataType = $pDataType;
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *  Identify if the cell contains a formula
+     *
+     *  @return boolean
+     */
+    public function isFormula()
+    {
+        return $this->dataType == PHPExcel_Cell_DataType::TYPE_FORMULA;
+    }
+
+    /**
+     *    Does this cell contain Data validation rules?
+     *
+     *    @return    boolean
+     *    @throws    PHPExcel_Exception
+     */
+    public function hasDataValidation()
+    {
+        if (!isset($this->parent)) {
+            throw new PHPExcel_Exception('Cannot check for data validation when cell is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->dataValidationExists($this->getCoordinate());
+    }
+
+    /**
+     *    Get Data validation rules
+     *
+     *    @return    PHPExcel_Cell_DataValidation
+     *    @throws    PHPExcel_Exception
+     */
+    public function getDataValidation()
+    {
+        if (!isset($this->parent)) {
+            throw new PHPExcel_Exception('Cannot get data validation for cell that is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->getDataValidation($this->getCoordinate());
+    }
+
+    /**
+     *    Set Data validation rules
+     *
+     *    @param    PHPExcel_Cell_DataValidation    $pDataValidation
+     *    @return    PHPExcel_Cell
+     *    @throws    PHPExcel_Exception
+     */
+    public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = null)
+    {
+        if (!isset($this->parent)) {
+            throw new PHPExcel_Exception('Cannot set data validation for cell that is not bound to a worksheet');
+        }
+
+        $this->getWorksheet()->setDataValidation($this->getCoordinate(), $pDataValidation);
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *    Does this cell contain a Hyperlink?
+     *
+     *    @return boolean
+     *    @throws    PHPExcel_Exception
+     */
+    public function hasHyperlink()
+    {
+        if (!isset($this->parent)) {
+            throw new PHPExcel_Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->hyperlinkExists($this->getCoordinate());
+    }
+
+    /**
+     *    Get Hyperlink
+     *
+     *    @return    PHPExcel_Cell_Hyperlink
+     *    @throws    PHPExcel_Exception
+     */
+    public function getHyperlink()
+    {
+        if (!isset($this->parent)) {
+            throw new PHPExcel_Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->getHyperlink($this->getCoordinate());
+    }
+
+    /**
+     *    Set Hyperlink
+     *
+     *    @param    PHPExcel_Cell_Hyperlink    $pHyperlink
+     *    @return    PHPExcel_Cell
+     *    @throws    PHPExcel_Exception
+     */
+    public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = null)
+    {
+        if (!isset($this->parent)) {
+            throw new PHPExcel_Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
+        }
+
+        $this->getWorksheet()->setHyperlink($this->getCoordinate(), $pHyperlink);
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *    Get parent worksheet
+     *
+     *    @return PHPExcel_CachedObjectStorage_CacheBase
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     *    Get parent worksheet
+     *
+     *    @return PHPExcel_Worksheet
+     */
+    public function getWorksheet()
+    {
+        return $this->parent->getParent();
+    }
+
+    /**
+     *    Is this cell in a merge range
+     *
+     *    @return boolean
+     */
+    public function isInMergeRange()
+    {
+        return (boolean) $this->getMergeRange();
+    }
+
+    /**
+     *    Is this cell the master (top left cell) in a merge range (that holds the actual data value)
+     *
+     *    @return boolean
+     */
+    public function isMergeRangeValueCell()
+    {
+        if ($mergeRange = $this->getMergeRange()) {
+            $mergeRange = PHPExcel_Cell::splitRange($mergeRange);
+            list($startCell) = $mergeRange[0];
+            if ($this->getCoordinate() === $startCell) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    If this cell is in a merge range, then return the range
+     *
+     *    @return string
+     */
+    public function getMergeRange()
+    {
+        foreach ($this->getWorksheet()->getMergeCells() as $mergeRange) {
+            if ($this->isInRange($mergeRange)) {
+                return $mergeRange;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Get cell style
+     *
+     *    @return    PHPExcel_Style
+     */
+    public function getStyle()
+    {
+        return $this->getWorksheet()->getStyle($this->getCoordinate());
+    }
+
+    /**
+     *    Re-bind parent
+     *
+     *    @param    PHPExcel_Worksheet $parent
+     *    @return    PHPExcel_Cell
+     */
+    public function rebindParent(PHPExcel_Worksheet $parent)
+    {
+        $this->parent = $parent->getCellCacheController();
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *    Is cell in a specific range?
+     *
+     *    @param    string    $pRange        Cell range (e.g. A1:A1)
+     *    @return    boolean
+     */
+    public function isInRange($pRange = 'A1:A1')
+    {
+        list($rangeStart, $rangeEnd) = self::rangeBoundaries($pRange);
+
+        // Translate properties
+        $myColumn = self::columnIndexFromString($this->getColumn());
+        $myRow    = $this->getRow();
+
+        // Verify if cell is in range
+        return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
+                ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow)
+               );
+    }
+
+    /**
+     *    Coordinate from string
+     *
+     *    @param    string    $pCoordinateString
+     *    @return    array    Array containing column and row (indexes 0 and 1)
+     *    @throws    PHPExcel_Exception
+     */
+    public static function coordinateFromString($pCoordinateString = 'A1')
+    {
+        if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
+            return array($matches[1],$matches[2]);
+        } elseif ((strpos($pCoordinateString, ':') !== false) || (strpos($pCoordinateString, ',') !== false)) {
+            throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
+        } elseif ($pCoordinateString == '') {
+            throw new PHPExcel_Exception('Cell coordinate can not be zero-length string');
+        }
+
+        throw new PHPExcel_Exception('Invalid cell coordinate '.$pCoordinateString);
+    }
+
+    /**
+     *    Make string row, column or cell coordinate absolute
+     *
+     *    @param    string    $pCoordinateString        e.g. 'A' or '1' or 'A1'
+     *                    Note that this value can be a row or column reference as well as a cell reference
+     *    @return    string    Absolute coordinate        e.g. '$A' or '$1' or '$A$1'
+     *    @throws    PHPExcel_Exception
+     */
+    public static function absoluteReference($pCoordinateString = 'A1')
+    {
+        if (strpos($pCoordinateString, ':') === false && strpos($pCoordinateString, ',') === false) {
+            // Split out any worksheet name from the reference
+            $worksheet = '';
+            $cellAddress = explode('!', $pCoordinateString);
+            if (count($cellAddress) > 1) {
+                list($worksheet, $pCoordinateString) = $cellAddress;
+            }
+            if ($worksheet > '') {
+                $worksheet .= '!';
+            }
+
+            // Create absolute coordinate
+            if (ctype_digit($pCoordinateString)) {
+                return $worksheet . '$' . $pCoordinateString;
+            } elseif (ctype_alpha($pCoordinateString)) {
+                return $worksheet . '$' . strtoupper($pCoordinateString);
+            }
+            return $worksheet . self::absoluteCoordinate($pCoordinateString);
+        }
+
+        throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
+    }
+
+    /**
+     *    Make string coordinate absolute
+     *
+     *    @param    string    $pCoordinateString        e.g. 'A1'
+     *    @return    string    Absolute coordinate        e.g. '$A$1'
+     *    @throws    PHPExcel_Exception
+     */
+    public static function absoluteCoordinate($pCoordinateString = 'A1')
+    {
+        if (strpos($pCoordinateString, ':') === false && strpos($pCoordinateString, ',') === false) {
+            // Split out any worksheet name from the coordinate
+            $worksheet = '';
+            $cellAddress = explode('!', $pCoordinateString);
+            if (count($cellAddress) > 1) {
+                list($worksheet, $pCoordinateString) = $cellAddress;
+            }
+            if ($worksheet > '') {
+                $worksheet .= '!';
+            }
+
+            // Create absolute coordinate
+            list($column, $row) = self::coordinateFromString($pCoordinateString);
+            $column = ltrim($column, '$');
+            $row = ltrim($row, '$');
+            return $worksheet . '$' . $column . '$' . $row;
+        }
+
+        throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
+    }
+
+    /**
+     *    Split range into coordinate strings
+     *
+     *    @param    string    $pRange        e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
+     *    @return    array    Array containg one or more arrays containing one or two coordinate strings
+     *                                e.g. array('B4','D9') or array(array('B4','D9'),array('H2','O11'))
+     *                                        or array('B4')
+     */
+    public static function splitRange($pRange = 'A1:A1')
+    {
+        // Ensure $pRange is a valid range
+        if (empty($pRange)) {
+            $pRange = self::DEFAULT_RANGE;
+        }
+
+        $exploded = explode(',', $pRange);
+        $counter = count($exploded);
+        for ($i = 0; $i < $counter; ++$i) {
+            $exploded[$i] = explode(':', $exploded[$i]);
+        }
+        return $exploded;
+    }
+
+    /**
+     *    Build range from coordinate strings
+     *
+     *    @param    array    $pRange    Array containg one or more arrays containing one or two coordinate strings
+     *    @return    string    String representation of $pRange
+     *    @throws    PHPExcel_Exception
+     */
+    public static function buildRange($pRange)
+    {
+        // Verify range
+        if (!is_array($pRange) || empty($pRange) || !is_array($pRange[0])) {
+            throw new PHPExcel_Exception('Range does not contain any information');
+        }
+
+        // Build range
+        $imploded = array();
+        $counter = count($pRange);
+        for ($i = 0; $i < $counter; ++$i) {
+            $pRange[$i] = implode(':', $pRange[$i]);
+        }
+        $imploded = implode(',', $pRange);
+
+        return $imploded;
+    }
+
+    /**
+     *    Calculate range boundaries
+     *
+     *    @param    string    $pRange        Cell range (e.g. A1:A1)
+     *    @return    array    Range coordinates array(Start Cell, End Cell)
+     *                    where Start Cell and End Cell are arrays (Column Number, Row Number)
+     */
+    public static function rangeBoundaries($pRange = 'A1:A1')
+    {
+        // Ensure $pRange is a valid range
+        if (empty($pRange)) {
+            $pRange = self::DEFAULT_RANGE;
+        }
+
+        // Uppercase coordinate
+        $pRange = strtoupper($pRange);
+
+        // Extract range
+        if (strpos($pRange, ':') === false) {
+            $rangeA = $rangeB = $pRange;
+        } else {
+            list($rangeA, $rangeB) = explode(':', $pRange);
+        }
+
+        // Calculate range outer borders
+        $rangeStart = self::coordinateFromString($rangeA);
+        $rangeEnd    = self::coordinateFromString($rangeB);
+
+        // Translate column into index
+        $rangeStart[0]    = self::columnIndexFromString($rangeStart[0]);
+        $rangeEnd[0]    = self::columnIndexFromString($rangeEnd[0]);
+
+        return array($rangeStart, $rangeEnd);
+    }
+
+    /**
+     *    Calculate range dimension
+     *
+     *    @param    string    $pRange        Cell range (e.g. A1:A1)
+     *    @return    array    Range dimension (width, height)
+     */
+    public static function rangeDimension($pRange = 'A1:A1')
+    {
+        // Calculate range outer borders
+        list($rangeStart, $rangeEnd) = self::rangeBoundaries($pRange);
+
+        return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
+    }
+
+    /**
+     *    Calculate range boundaries
+     *
+     *    @param    string    $pRange        Cell range (e.g. A1:A1)
+     *    @return    array    Range coordinates array(Start Cell, End Cell)
+     *                    where Start Cell and End Cell are arrays (Column ID, Row Number)
+     */
+    public static function getRangeBoundaries($pRange = 'A1:A1')
+    {
+        // Ensure $pRange is a valid range
+        if (empty($pRange)) {
+            $pRange = self::DEFAULT_RANGE;
+        }
+
+        // Uppercase coordinate
+        $pRange = strtoupper($pRange);
+
+        // Extract range
+        if (strpos($pRange, ':') === false) {
+            $rangeA = $rangeB = $pRange;
+        } else {
+            list($rangeA, $rangeB) = explode(':', $pRange);
+        }
+
+        return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
+    }
+
+    /**
+     *    Column index from string
+     *
+     *    @param    string $pString
+     *    @return    int Column index (base 1 !!!)
+     */
+    public static function columnIndexFromString($pString = 'A')
+    {
+        //    Using a lookup cache adds a slight memory overhead, but boosts speed
+        //    caching using a static within the method is faster than a class static,
+        //        though it's additional memory overhead
+        static $_indexCache = array();
+
+        if (isset($_indexCache[$pString])) {
+            return $_indexCache[$pString];
+        }
+        //    It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
+        //        and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
+        //        memory overhead either
+        static $_columnLookup = array(
+            'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8, 'I' => 9, 'J' => 10, 'K' => 11, 'L' => 12, 'M' => 13,
+            'N' => 14, 'O' => 15, 'P' => 16, 'Q' => 17, 'R' => 18, 'S' => 19, 'T' => 20, 'U' => 21, 'V' => 22, 'W' => 23, 'X' => 24, 'Y' => 25, 'Z' => 26,
+            'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6, 'g' => 7, 'h' => 8, 'i' => 9, 'j' => 10, 'k' => 11, 'l' => 12, 'm' => 13,
+            'n' => 14, 'o' => 15, 'p' => 16, 'q' => 17, 'r' => 18, 's' => 19, 't' => 20, 'u' => 21, 'v' => 22, 'w' => 23, 'x' => 24, 'y' => 25, 'z' => 26
+        );
+
+        //    We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString
+        //        for improved performance
+        if (isset($pString[0])) {
+            if (!isset($pString[1])) {
+                $_indexCache[$pString] = $_columnLookup[$pString];
+                return $_indexCache[$pString];
+            } elseif (!isset($pString[2])) {
+                $_indexCache[$pString] = $_columnLookup[$pString[0]] * 26 + $_columnLookup[$pString[1]];
+                return $_indexCache[$pString];
+            } elseif (!isset($pString[3])) {
+                $_indexCache[$pString] = $_columnLookup[$pString[0]] * 676 + $_columnLookup[$pString[1]] * 26 + $_columnLookup[$pString[2]];
+                return $_indexCache[$pString];
+            }
+        }
+        throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString[0])) ? "longer than 3 characters" : "empty"));
+    }
+
+    /**
+     *    String from columnindex
+     *
+     *    @param    int $pColumnIndex Column index (base 0 !!!)
+     *    @return    string
+     */
+    public static function stringFromColumnIndex($pColumnIndex = 0)
+    {
+        //    Using a lookup cache adds a slight memory overhead, but boosts speed
+        //    caching using a static within the method is faster than a class static,
+        //        though it's additional memory overhead
+        static $_indexCache = array();
+
+        if (!isset($_indexCache[$pColumnIndex])) {
+            // Determine column string
+            if ($pColumnIndex < 26) {
+                $_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
+            } elseif ($pColumnIndex < 702) {
+                $_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
+                                              chr(65 + $pColumnIndex % 26);
+            } else {
+                $_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
+                                              chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
+                                              chr(65 + $pColumnIndex % 26);
+            }
+        }
+        return $_indexCache[$pColumnIndex];
+    }
+
+    /**
+     *    Extract all cell references in range
+     *
+     *    @param    string    $pRange        Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
+     *    @return    array    Array containing single cell references
+     */
+    public static function extractAllCellReferencesInRange($pRange = 'A1')
+    {
+        // Returnvalue
+        $returnValue = array();
+
+        // Explode spaces
+        $cellBlocks = explode(' ', str_replace('$', '', strtoupper($pRange)));
+        foreach ($cellBlocks as $cellBlock) {
+            // Single cell?
+            if (strpos($cellBlock, ':') === false && strpos($cellBlock, ',') === false) {
+                $returnValue[] = $cellBlock;
+                continue;
+            }
+
+            // Range...
+            $ranges = self::splitRange($cellBlock);
+            foreach ($ranges as $range) {
+                // Single cell?
+                if (!isset($range[1])) {
+                    $returnValue[] = $range[0];
+                    continue;
+                }
+
+                // Range...
+                list($rangeStart, $rangeEnd)    = $range;
+                sscanf($rangeStart, '%[A-Z]%d', $startCol, $startRow);
+                sscanf($rangeEnd, '%[A-Z]%d', $endCol, $endRow);
+                ++$endCol;
+
+                // Current data
+                $currentCol = $startCol;
+                $currentRow = $startRow;
+
+                // Loop cells
+                while ($currentCol != $endCol) {
+                    while ($currentRow <= $endRow) {
+                        $returnValue[] = $currentCol.$currentRow;
+                        ++$currentRow;
+                    }
+                    ++$currentCol;
+                    $currentRow = $startRow;
+                }
+            }
+        }
+
+        //    Sort the result by column and row
+        $sortKeys = array();
+        foreach (array_unique($returnValue) as $coord) {
+            sscanf($coord, '%[A-Z]%d', $column, $row);
+            $sortKeys[sprintf('%3s%09d', $column, $row)] = $coord;
+        }
+        ksort($sortKeys);
+
+        // Return value
+        return array_values($sortKeys);
+    }
+
+    /**
+     * Compare 2 cells
+     *
+     * @param    PHPExcel_Cell    $a    Cell a
+     * @param    PHPExcel_Cell    $b    Cell b
+     * @return    int        Result of comparison (always -1 or 1, never zero!)
+     */
+    public static function compareCells(PHPExcel_Cell $a, PHPExcel_Cell $b)
+    {
+        if ($a->getRow() < $b->getRow()) {
+            return -1;
+        } elseif ($a->getRow() > $b->getRow()) {
+            return 1;
+        } elseif (self::columnIndexFromString($a->getColumn()) < self::columnIndexFromString($b->getColumn())) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+
+    /**
+     * Get value binder to use
+     *
+     * @return PHPExcel_Cell_IValueBinder
+     */
+    public static function getValueBinder()
+    {
+        if (self::$valueBinder === null) {
+            self::$valueBinder = new PHPExcel_Cell_DefaultValueBinder();
+        }
+
+        return self::$valueBinder;
+    }
+
+    /**
+     * Set value binder to use
+     *
+     * @param PHPExcel_Cell_IValueBinder $binder
+     * @throws PHPExcel_Exception
+     */
+    public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = null)
+    {
+        if ($binder === null) {
+            throw new PHPExcel_Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
+        }
+
+        self::$valueBinder = $binder;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ((is_object($value)) && ($key != 'parent')) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    /**
+     * Get index to cellXf
+     *
+     * @return int
+     */
+    public function getXfIndex()
+    {
+        return $this->xfIndex;
+    }
+
+    /**
+     * Set index to cellXf
+     *
+     * @param int $pValue
+     * @return PHPExcel_Cell
+     */
+    public function setXfIndex($pValue = 0)
+    {
+        $this->xfIndex = $pValue;
+
+        return $this->notifyCacheController();
+    }
+
+    /**
+     *    @deprecated        Since version 1.7.8 for planned changes to cell for array formula handling
+     */
+    public function setFormulaAttributes($pAttributes)
+    {
+        $this->formulaAttributes = $pAttributes;
+        return $this;
+    }
+
+    /**
+     *    @deprecated        Since version 1.7.8 for planned changes to cell for array formula handling
+     */
+    public function getFormulaAttributes()
+    {
+        return $this->formulaAttributes;
+    }
+
+    /**
+     * Convert to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->getValue();
+    }
+}
diff --git a/lib/PHPExcel/Cell/AdvancedValueBinder.php b/lib/PHPExcel/Cell/AdvancedValueBinder.php
new file mode 100644
index 000000000..061d04eb5
--- /dev/null
+++ b/lib/PHPExcel/Cell/AdvancedValueBinder.php
@@ -0,0 +1,187 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Cell_AdvancedValueBinder
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
+{
+    /**
+     * Bind value to a cell
+     *
+     * @param  PHPExcel_Cell  $cell  Cell to bind value to
+     * @param  mixed $value          Value to bind in cell
+     * @return boolean
+     */
+    public function bindValue(PHPExcel_Cell $cell, $value = null)
+    {
+        // sanitize UTF-8 strings
+        if (is_string($value)) {
+            $value = PHPExcel_Shared_String::SanitizeUTF8($value);
+        }
+
+        // Find out data type
+        $dataType = parent::dataTypeForValue($value);
+
+        // Style logic - strings
+        if ($dataType === PHPExcel_Cell_DataType::TYPE_STRING && !$value instanceof PHPExcel_RichText) {
+            //    Test for booleans using locale-setting
+            if ($value == PHPExcel_Calculation::getTRUE()) {
+                $cell->setValueExplicit(true, PHPExcel_Cell_DataType::TYPE_BOOL);
+                return true;
+            } elseif ($value == PHPExcel_Calculation::getFALSE()) {
+                $cell->setValueExplicit(false, PHPExcel_Cell_DataType::TYPE_BOOL);
+                return true;
+            }
+
+            // Check for number in scientific format
+            if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) {
+                $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                return true;
+            }
+
+            // Check for fraction
+            if (preg_match('/^([+-]?)\s*([0-9]+)\s?\/\s*([0-9]+)$/', $value, $matches)) {
+                // Convert value to number
+                $value = $matches[2] / $matches[3];
+                if ($matches[1] == '-') {
+                    $value = 0 - $value;
+                }
+                $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode('??/??');
+                return true;
+            } elseif (preg_match('/^([+-]?)([0-9]*) +([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
+                // Convert value to number
+                $value = $matches[2] + ($matches[3] / $matches[4]);
+                if ($matches[1] == '-') {
+                    $value = 0 - $value;
+                }
+                $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode('# ??/??');
+                return true;
+            }
+
+            // Check for percentage
+            if (preg_match('/^\-?[0-9]*\.?[0-9]*\s?\%$/', $value)) {
+                // Convert value to number
+                $value = (float) str_replace('%', '', $value) / 100;
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00);
+                return true;
+            }
+
+            // Check for currency
+            $currencyCode = PHPExcel_Shared_String::getCurrencyCode();
+            $decimalSeparator = PHPExcel_Shared_String::getDecimalSeparator();
+            $thousandsSeparator = PHPExcel_Shared_String::getThousandsSeparator();
+            if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) {
+                // Convert value to number
+                $value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value));
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode(
+                        str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE)
+                    );
+                return true;
+            } elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
+                // Convert value to number
+                $value = (float) trim(str_replace(array('$',','), '', $value));
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
+                return true;
+            }
+
+            // Check for time without seconds e.g. '9:45', '09:45'
+            if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) {
+                // Convert value to number
+                list($h, $m) = explode(':', $value);
+                $days = $h / 24 + $m / 1440;
+                $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3);
+                return true;
+            }
+
+            // Check for time with seconds '9:45:59', '09:45:59'
+            if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) {
+                // Convert value to number
+                list($h, $m, $s) = explode(':', $value);
+                $days = $h / 24 + $m / 1440 + $s / 86400;
+                // Convert value to number
+                $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4);
+                return true;
+            }
+
+            // Check for datetime, e.g. '2008-12-31', '2008-12-31 15:59', '2008-12-31 15:59:10'
+            if (($d = PHPExcel_Shared_Date::stringToExcel($value)) !== false) {
+                // Convert value to number
+                $cell->setValueExplicit($d, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                // Determine style. Either there is a time part or not. Look for ':'
+                if (strpos($value, ':') !== false) {
+                    $formatCode = 'yyyy-mm-dd h:mm';
+                } else {
+                    $formatCode = 'yyyy-mm-dd';
+                }
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode($formatCode);
+                return true;
+            }
+
+            // Check for newline character "\n"
+            if (strpos($value, "\n") !== false) {
+                $value = PHPExcel_Shared_String::SanitizeUTF8($value);
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getAlignment()->setWrapText(true);
+                return true;
+            }
+        }
+
+        // Not bound yet? Use parent...
+        return parent::bindValue($cell, $value);
+    }
+}
diff --git a/lib/PHPExcel/Cell/DataType.php b/lib/PHPExcel/Cell/DataType.php
new file mode 100644
index 000000000..fc010e653
--- /dev/null
+++ b/lib/PHPExcel/Cell/DataType.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * PHPExcel_Cell_DataType
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Cell_DataType
+{
+    /* Data types */
+    const TYPE_STRING2  = 'str';
+    const TYPE_STRING   = 's';
+    const TYPE_FORMULA  = 'f';
+    const TYPE_NUMERIC  = 'n';
+    const TYPE_BOOL     = 'b';
+    const TYPE_NULL     = 'null';
+    const TYPE_INLINE   = 'inlineStr';
+    const TYPE_ERROR    = 'e';
+
+    /**
+     * List of error codes
+     *
+     * @var array
+     */
+    private static $errorCodes = array(
+        '#NULL!'  => 0,
+        '#DIV/0!' => 1,
+        '#VALUE!' => 2,
+        '#REF!'   => 3,
+        '#NAME?'  => 4,
+        '#NUM!'   => 5,
+        '#N/A'    => 6
+    );
+
+    /**
+     * Get list of error codes
+     *
+     * @return array
+     */
+    public static function getErrorCodes()
+    {
+        return self::$errorCodes;
+    }
+
+    /**
+     * DataType for value
+     *
+     * @deprecated  Replaced by PHPExcel_Cell_IValueBinder infrastructure, will be removed in version 1.8.0
+     * @param       mixed  $pValue
+     * @return      string
+     */
+    public static function dataTypeForValue($pValue = null)
+    {
+        return PHPExcel_Cell_DefaultValueBinder::dataTypeForValue($pValue);
+    }
+
+    /**
+     * Check a string that it satisfies Excel requirements
+     *
+     * @param  mixed  Value to sanitize to an Excel string
+     * @return mixed  Sanitized value
+     */
+    public static function checkString($pValue = null)
+    {
+        if ($pValue instanceof PHPExcel_RichText) {
+            // TODO: Sanitize Rich-Text string (max. character count is 32,767)
+            return $pValue;
+        }
+
+        // string must never be longer than 32,767 characters, truncate if necessary
+        $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 32767);
+
+        // we require that newline is represented as "\n" in core, not as "\r\n" or "\r"
+        $pValue = str_replace(array("\r\n", "\r"), "\n", $pValue);
+
+        return $pValue;
+    }
+
+    /**
+     * Check a value that it is a valid error code
+     *
+     * @param  mixed   Value to sanitize to an Excel error code
+     * @return string  Sanitized value
+     */
+    public static function checkErrorCode($pValue = null)
+    {
+        $pValue = (string) $pValue;
+
+        if (!array_key_exists($pValue, self::$errorCodes)) {
+            $pValue = '#NULL!';
+        }
+
+        return $pValue;
+    }
+}
diff --git a/lib/PHPExcel/Cell/DataValidation.php b/lib/PHPExcel/Cell/DataValidation.php
new file mode 100644
index 000000000..9883633e6
--- /dev/null
+++ b/lib/PHPExcel/Cell/DataValidation.php
@@ -0,0 +1,492 @@
+<?php
+
+/**
+ * PHPExcel_Cell_DataValidation
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Cell_DataValidation
+{
+    /* Data validation types */
+    const TYPE_NONE        = 'none';
+    const TYPE_CUSTOM      = 'custom';
+    const TYPE_DATE        = 'date';
+    const TYPE_DECIMAL     = 'decimal';
+    const TYPE_LIST        = 'list';
+    const TYPE_TEXTLENGTH  = 'textLength';
+    const TYPE_TIME        = 'time';
+    const TYPE_WHOLE       = 'whole';
+
+    /* Data validation error styles */
+    const STYLE_STOP         = 'stop';
+    const STYLE_WARNING      = 'warning';
+    const STYLE_INFORMATION  = 'information';
+
+    /* Data validation operators */
+    const OPERATOR_BETWEEN             = 'between';
+    const OPERATOR_EQUAL               = 'equal';
+    const OPERATOR_GREATERTHAN         = 'greaterThan';
+    const OPERATOR_GREATERTHANOREQUAL  = 'greaterThanOrEqual';
+    const OPERATOR_LESSTHAN            = 'lessThan';
+    const OPERATOR_LESSTHANOREQUAL     = 'lessThanOrEqual';
+    const OPERATOR_NOTBETWEEN          = 'notBetween';
+    const OPERATOR_NOTEQUAL            = 'notEqual';
+
+    /**
+     * Formula 1
+     *
+     * @var string
+     */
+    private $formula1;
+
+    /**
+     * Formula 2
+     *
+     * @var string
+     */
+    private $formula2;
+
+    /**
+     * Type
+     *
+     * @var string
+     */
+    private $type = PHPExcel_Cell_DataValidation::TYPE_NONE;
+
+    /**
+     * Error style
+     *
+     * @var string
+     */
+    private $errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
+
+    /**
+     * Operator
+     *
+     * @var string
+     */
+    private $operator;
+
+    /**
+     * Allow Blank
+     *
+     * @var boolean
+     */
+    private $allowBlank;
+
+    /**
+     * Show DropDown
+     *
+     * @var boolean
+     */
+    private $showDropDown;
+
+    /**
+     * Show InputMessage
+     *
+     * @var boolean
+     */
+    private $showInputMessage;
+
+    /**
+     * Show ErrorMessage
+     *
+     * @var boolean
+     */
+    private $showErrorMessage;
+
+    /**
+     * Error title
+     *
+     * @var string
+     */
+    private $errorTitle;
+
+    /**
+     * Error
+     *
+     * @var string
+     */
+    private $error;
+
+    /**
+     * Prompt title
+     *
+     * @var string
+     */
+    private $promptTitle;
+
+    /**
+     * Prompt
+     *
+     * @var string
+     */
+    private $prompt;
+
+    /**
+     * Create a new PHPExcel_Cell_DataValidation
+     */
+    public function __construct()
+    {
+        // Initialise member variables
+        $this->formula1          = '';
+        $this->formula2          = '';
+        $this->type              = PHPExcel_Cell_DataValidation::TYPE_NONE;
+        $this->errorStyle        = PHPExcel_Cell_DataValidation::STYLE_STOP;
+        $this->operator          = '';
+        $this->allowBlank        = false;
+        $this->showDropDown      = false;
+        $this->showInputMessage  = false;
+        $this->showErrorMessage  = false;
+        $this->errorTitle        = '';
+        $this->error             = '';
+        $this->promptTitle       = '';
+        $this->prompt            = '';
+    }
+
+    /**
+     * Get Formula 1
+     *
+     * @return string
+     */
+    public function getFormula1()
+    {
+        return $this->formula1;
+    }
+
+    /**
+     * Set Formula 1
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setFormula1($value = '')
+    {
+        $this->formula1 = $value;
+        return $this;
+    }
+
+    /**
+     * Get Formula 2
+     *
+     * @return string
+     */
+    public function getFormula2()
+    {
+        return $this->formula2;
+    }
+
+    /**
+     * Set Formula 2
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setFormula2($value = '')
+    {
+        $this->formula2 = $value;
+        return $this;
+    }
+
+    /**
+     * Get Type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set Type
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE)
+    {
+        $this->type = $value;
+        return $this;
+    }
+
+    /**
+     * Get Error style
+     *
+     * @return string
+     */
+    public function getErrorStyle()
+    {
+        return $this->errorStyle;
+    }
+
+    /**
+     * Set Error style
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP)
+    {
+        $this->errorStyle = $value;
+        return $this;
+    }
+
+    /**
+     * Get Operator
+     *
+     * @return string
+     */
+    public function getOperator()
+    {
+        return $this->operator;
+    }
+
+    /**
+     * Set Operator
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setOperator($value = '')
+    {
+        $this->operator = $value;
+        return $this;
+    }
+
+    /**
+     * Get Allow Blank
+     *
+     * @return boolean
+     */
+    public function getAllowBlank()
+    {
+        return $this->allowBlank;
+    }
+
+    /**
+     * Set Allow Blank
+     *
+     * @param  boolean    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setAllowBlank($value = false)
+    {
+        $this->allowBlank = $value;
+        return $this;
+    }
+
+    /**
+     * Get Show DropDown
+     *
+     * @return boolean
+     */
+    public function getShowDropDown()
+    {
+        return $this->showDropDown;
+    }
+
+    /**
+     * Set Show DropDown
+     *
+     * @param  boolean    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setShowDropDown($value = false)
+    {
+        $this->showDropDown = $value;
+        return $this;
+    }
+
+    /**
+     * Get Show InputMessage
+     *
+     * @return boolean
+     */
+    public function getShowInputMessage()
+    {
+        return $this->showInputMessage;
+    }
+
+    /**
+     * Set Show InputMessage
+     *
+     * @param  boolean    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setShowInputMessage($value = false)
+    {
+        $this->showInputMessage = $value;
+        return $this;
+    }
+
+    /**
+     * Get Show ErrorMessage
+     *
+     * @return boolean
+     */
+    public function getShowErrorMessage()
+    {
+        return $this->showErrorMessage;
+    }
+
+    /**
+     * Set Show ErrorMessage
+     *
+     * @param  boolean    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setShowErrorMessage($value = false)
+    {
+        $this->showErrorMessage = $value;
+        return $this;
+    }
+
+    /**
+     * Get Error title
+     *
+     * @return string
+     */
+    public function getErrorTitle()
+    {
+        return $this->errorTitle;
+    }
+
+    /**
+     * Set Error title
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setErrorTitle($value = '')
+    {
+        $this->errorTitle = $value;
+        return $this;
+    }
+
+    /**
+     * Get Error
+     *
+     * @return string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Set Error
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setError($value = '')
+    {
+        $this->error = $value;
+        return $this;
+    }
+
+    /**
+     * Get Prompt title
+     *
+     * @return string
+     */
+    public function getPromptTitle()
+    {
+        return $this->promptTitle;
+    }
+
+    /**
+     * Set Prompt title
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setPromptTitle($value = '')
+    {
+        $this->promptTitle = $value;
+        return $this;
+    }
+
+    /**
+     * Get Prompt
+     *
+     * @return string
+     */
+    public function getPrompt()
+    {
+        return $this->prompt;
+    }
+
+    /**
+     * Set Prompt
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_DataValidation
+     */
+    public function setPrompt($value = '')
+    {
+        $this->prompt = $value;
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->formula1 .
+            $this->formula2 .
+            $this->type = PHPExcel_Cell_DataValidation::TYPE_NONE .
+            $this->errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP .
+            $this->operator .
+            ($this->allowBlank ? 't' : 'f') .
+            ($this->showDropDown ? 't' : 'f') .
+            ($this->showInputMessage ? 't' : 'f') .
+            ($this->showErrorMessage ? 't' : 'f') .
+            $this->errorTitle .
+            $this->error .
+            $this->promptTitle .
+            $this->prompt .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Cell/DefaultValueBinder.php b/lib/PHPExcel/Cell/DefaultValueBinder.php
new file mode 100644
index 000000000..d1501b8c2
--- /dev/null
+++ b/lib/PHPExcel/Cell/DefaultValueBinder.php
@@ -0,0 +1,102 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Cell_DefaultValueBinder
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
+{
+    /**
+     * Bind value to a cell
+     *
+     * @param  PHPExcel_Cell  $cell   Cell to bind value to
+     * @param  mixed          $value  Value to bind in cell
+     * @return boolean
+     */
+    public function bindValue(PHPExcel_Cell $cell, $value = null)
+    {
+        // sanitize UTF-8 strings
+        if (is_string($value)) {
+            $value = PHPExcel_Shared_String::SanitizeUTF8($value);
+        } elseif (is_object($value)) {
+            // Handle any objects that might be injected
+            if ($value instanceof DateTime) {
+                $value = $value->format('Y-m-d H:i:s');
+            } elseif (!($value instanceof PHPExcel_RichText)) {
+                $value = (string) $value;
+            }
+        }
+
+        // Set value explicit
+        $cell->setValueExplicit($value, self::dataTypeForValue($value));
+
+        // Done!
+        return true;
+    }
+
+    /**
+     * DataType for value
+     *
+     * @param   mixed  $pValue
+     * @return  string
+     */
+    public static function dataTypeForValue($pValue = null)
+    {
+        // Match the value against a few data types
+        if ($pValue === null) {
+            return PHPExcel_Cell_DataType::TYPE_NULL;
+        } elseif ($pValue === '') {
+            return PHPExcel_Cell_DataType::TYPE_STRING;
+        } elseif ($pValue instanceof PHPExcel_RichText) {
+            return PHPExcel_Cell_DataType::TYPE_INLINE;
+        } elseif ($pValue[0] === '=' && strlen($pValue) > 1) {
+            return PHPExcel_Cell_DataType::TYPE_FORMULA;
+        } elseif (is_bool($pValue)) {
+            return PHPExcel_Cell_DataType::TYPE_BOOL;
+        } elseif (is_float($pValue) || is_int($pValue)) {
+            return PHPExcel_Cell_DataType::TYPE_NUMERIC;
+        } elseif (preg_match('/^[\+\-]?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $pValue)) {
+            $tValue = ltrim($pValue, '+-');
+            if (is_string($pValue) && $tValue[0] === '0' && strlen($tValue) > 1 && $tValue[1] !== '.') {
+                return PHPExcel_Cell_DataType::TYPE_STRING;
+            } elseif ((strpos($pValue, '.') === false) && ($pValue > PHP_INT_MAX)) {
+                return PHPExcel_Cell_DataType::TYPE_STRING;
+            }
+            return PHPExcel_Cell_DataType::TYPE_NUMERIC;
+        } elseif (is_string($pValue) && array_key_exists($pValue, PHPExcel_Cell_DataType::getErrorCodes())) {
+            return PHPExcel_Cell_DataType::TYPE_ERROR;
+        }
+
+        return PHPExcel_Cell_DataType::TYPE_STRING;
+    }
+}
diff --git a/lib/PHPExcel/Cell/Hyperlink.php b/lib/PHPExcel/Cell/Hyperlink.php
new file mode 100644
index 000000000..daab54c84
--- /dev/null
+++ b/lib/PHPExcel/Cell/Hyperlink.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * PHPExcel_Cell_Hyperlink
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Cell_Hyperlink
+{
+    /**
+     * URL to link the cell to
+     *
+     * @var string
+     */
+    private $url;
+
+    /**
+     * Tooltip to display on the hyperlink
+     *
+     * @var string
+     */
+    private $tooltip;
+
+    /**
+     * Create a new PHPExcel_Cell_Hyperlink
+     *
+     * @param  string  $pUrl      Url to link the cell to
+     * @param  string  $pTooltip  Tooltip to display on the hyperlink
+     */
+    public function __construct($pUrl = '', $pTooltip = '')
+    {
+        // Initialise member variables
+        $this->url     = $pUrl;
+        $this->tooltip = $pTooltip;
+    }
+
+    /**
+     * Get URL
+     *
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * Set URL
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_Hyperlink
+     */
+    public function setUrl($value = '')
+    {
+        $this->url = $value;
+        return $this;
+    }
+
+    /**
+     * Get tooltip
+     *
+     * @return string
+     */
+    public function getTooltip()
+    {
+        return $this->tooltip;
+    }
+
+    /**
+     * Set tooltip
+     *
+     * @param  string    $value
+     * @return PHPExcel_Cell_Hyperlink
+     */
+    public function setTooltip($value = '')
+    {
+        $this->tooltip = $value;
+        return $this;
+    }
+
+    /**
+     * Is this hyperlink internal? (to another worksheet)
+     *
+     * @return boolean
+     */
+    public function isInternal()
+    {
+        return strpos($this->url, 'sheet://') !== false;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->url .
+            $this->tooltip .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Cell/IValueBinder.php b/lib/PHPExcel/Cell/IValueBinder.php
new file mode 100644
index 000000000..de2d0ac0c
--- /dev/null
+++ b/lib/PHPExcel/Cell/IValueBinder.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Cell_IValueBinder
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Cell
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+interface PHPExcel_Cell_IValueBinder
+{
+    /**
+     * Bind value to a cell
+     *
+     * @param  PHPExcel_Cell $cell    Cell to bind value to
+     * @param  mixed $value           Value to bind in cell
+     * @return boolean
+     */
+    public function bindValue(PHPExcel_Cell $cell, $value = null);
+}
diff --git a/lib/PHPExcel/Chart.php b/lib/PHPExcel/Chart.php
new file mode 100644
index 000000000..d7799935b
--- /dev/null
+++ b/lib/PHPExcel/Chart.php
@@ -0,0 +1,680 @@
+<?php
+
+/**
+ * PHPExcel_Chart
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart
+{
+    /**
+     * Chart Name
+     *
+     * @var string
+     */
+    private $name = '';
+
+    /**
+     * Worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $worksheet;
+
+    /**
+     * Chart Title
+     *
+     * @var PHPExcel_Chart_Title
+     */
+    private $title;
+
+    /**
+     * Chart Legend
+     *
+     * @var PHPExcel_Chart_Legend
+     */
+    private $legend;
+
+    /**
+     * X-Axis Label
+     *
+     * @var PHPExcel_Chart_Title
+     */
+    private $xAxisLabel;
+
+    /**
+     * Y-Axis Label
+     *
+     * @var PHPExcel_Chart_Title
+     */
+    private $yAxisLabel;
+
+    /**
+     * Chart Plot Area
+     *
+     * @var PHPExcel_Chart_PlotArea
+     */
+    private $plotArea;
+
+    /**
+     * Plot Visible Only
+     *
+     * @var boolean
+     */
+    private $plotVisibleOnly = true;
+
+    /**
+     * Display Blanks as
+     *
+     * @var string
+     */
+    private $displayBlanksAs = '0';
+
+    /**
+     * Chart Asix Y as
+     *
+     * @var PHPExcel_Chart_Axis
+     */
+    private $yAxis;
+
+    /**
+     * Chart Asix X as
+     *
+     * @var PHPExcel_Chart_Axis
+     */
+    private $xAxis;
+
+    /**
+     * Chart Major Gridlines as
+     *
+     * @var PHPExcel_Chart_GridLines
+     */
+    private $majorGridlines;
+
+    /**
+     * Chart Minor Gridlines as
+     *
+     * @var PHPExcel_Chart_GridLines
+     */
+    private $minorGridlines;
+
+    /**
+     * Top-Left Cell Position
+     *
+     * @var string
+     */
+    private $topLeftCellRef = 'A1';
+
+
+    /**
+     * Top-Left X-Offset
+     *
+     * @var integer
+     */
+    private $topLeftXOffset = 0;
+
+
+    /**
+     * Top-Left Y-Offset
+     *
+     * @var integer
+     */
+    private $topLeftYOffset = 0;
+
+
+    /**
+     * Bottom-Right Cell Position
+     *
+     * @var string
+     */
+    private $bottomRightCellRef = 'A1';
+
+
+    /**
+     * Bottom-Right X-Offset
+     *
+     * @var integer
+     */
+    private $bottomRightXOffset = 10;
+
+
+    /**
+     * Bottom-Right Y-Offset
+     *
+     * @var integer
+     */
+    private $bottomRightYOffset = 10;
+
+
+    /**
+     * Create a new PHPExcel_Chart
+     */
+    public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, PHPExcel_Chart_Axis $xAxis = null, PHPExcel_Chart_Axis $yAxis = null, PHPExcel_Chart_GridLines $majorGridlines = null, PHPExcel_Chart_GridLines $minorGridlines = null)
+    {
+        $this->name = $name;
+        $this->title = $title;
+        $this->legend = $legend;
+        $this->xAxisLabel = $xAxisLabel;
+        $this->yAxisLabel = $yAxisLabel;
+        $this->plotArea = $plotArea;
+        $this->plotVisibleOnly = $plotVisibleOnly;
+        $this->displayBlanksAs = $displayBlanksAs;
+        $this->xAxis = $xAxis;
+        $this->yAxis = $yAxis;
+        $this->majorGridlines = $majorGridlines;
+        $this->minorGridlines = $minorGridlines;
+    }
+
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get Worksheet
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function getWorksheet()
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set Worksheet
+     *
+     * @param    PHPExcel_Worksheet    $pValue
+     * @throws    PHPExcel_Chart_Exception
+     * @return PHPExcel_Chart
+     */
+    public function setWorksheet(PHPExcel_Worksheet $pValue = null)
+    {
+        $this->worksheet = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get Title
+     *
+     * @return PHPExcel_Chart_Title
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set Title
+     *
+     * @param    PHPExcel_Chart_Title $title
+     * @return    PHPExcel_Chart
+     */
+    public function setTitle(PHPExcel_Chart_Title $title)
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    /**
+     * Get Legend
+     *
+     * @return PHPExcel_Chart_Legend
+     */
+    public function getLegend()
+    {
+        return $this->legend;
+    }
+
+    /**
+     * Set Legend
+     *
+     * @param    PHPExcel_Chart_Legend $legend
+     * @return    PHPExcel_Chart
+     */
+    public function setLegend(PHPExcel_Chart_Legend $legend)
+    {
+        $this->legend = $legend;
+
+        return $this;
+    }
+
+    /**
+     * Get X-Axis Label
+     *
+     * @return PHPExcel_Chart_Title
+     */
+    public function getXAxisLabel()
+    {
+        return $this->xAxisLabel;
+    }
+
+    /**
+     * Set X-Axis Label
+     *
+     * @param    PHPExcel_Chart_Title $label
+     * @return    PHPExcel_Chart
+     */
+    public function setXAxisLabel(PHPExcel_Chart_Title $label)
+    {
+        $this->xAxisLabel = $label;
+
+        return $this;
+    }
+
+    /**
+     * Get Y-Axis Label
+     *
+     * @return PHPExcel_Chart_Title
+     */
+    public function getYAxisLabel()
+    {
+        return $this->yAxisLabel;
+    }
+
+    /**
+     * Set Y-Axis Label
+     *
+     * @param    PHPExcel_Chart_Title $label
+     * @return    PHPExcel_Chart
+     */
+    public function setYAxisLabel(PHPExcel_Chart_Title $label)
+    {
+        $this->yAxisLabel = $label;
+
+        return $this;
+    }
+
+    /**
+     * Get Plot Area
+     *
+     * @return PHPExcel_Chart_PlotArea
+     */
+    public function getPlotArea()
+    {
+        return $this->plotArea;
+    }
+
+    /**
+     * Get Plot Visible Only
+     *
+     * @return boolean
+     */
+    public function getPlotVisibleOnly()
+    {
+        return $this->plotVisibleOnly;
+    }
+
+    /**
+     * Set Plot Visible Only
+     *
+     * @param boolean $plotVisibleOnly
+     * @return PHPExcel_Chart
+     */
+    public function setPlotVisibleOnly($plotVisibleOnly = true)
+    {
+        $this->plotVisibleOnly = $plotVisibleOnly;
+
+        return $this;
+    }
+
+    /**
+     * Get Display Blanks as
+     *
+     * @return string
+     */
+    public function getDisplayBlanksAs()
+    {
+        return $this->displayBlanksAs;
+    }
+
+    /**
+     * Set Display Blanks as
+     *
+     * @param string $displayBlanksAs
+     * @return PHPExcel_Chart
+     */
+    public function setDisplayBlanksAs($displayBlanksAs = '0')
+    {
+        $this->displayBlanksAs = $displayBlanksAs;
+    }
+
+
+    /**
+     * Get yAxis
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    public function getChartAxisY()
+    {
+        if ($this->yAxis !== null) {
+            return $this->yAxis;
+        }
+
+        return new PHPExcel_Chart_Axis();
+    }
+
+    /**
+     * Get xAxis
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    public function getChartAxisX()
+    {
+        if ($this->xAxis !== null) {
+            return $this->xAxis;
+        }
+
+        return new PHPExcel_Chart_Axis();
+    }
+
+    /**
+     * Get Major Gridlines
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+    public function getMajorGridlines()
+    {
+        if ($this->majorGridlines !== null) {
+            return $this->majorGridlines;
+        }
+
+        return new PHPExcel_Chart_GridLines();
+    }
+
+    /**
+     * Get Minor Gridlines
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+    public function getMinorGridlines()
+    {
+        if ($this->minorGridlines !== null) {
+            return $this->minorGridlines;
+        }
+
+        return new PHPExcel_Chart_GridLines();
+    }
+
+
+    /**
+     * Set the Top Left position for the chart
+     *
+     * @param    string    $cell
+     * @param    integer    $xOffset
+     * @param    integer    $yOffset
+     * @return PHPExcel_Chart
+     */
+    public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null)
+    {
+        $this->topLeftCellRef = $cell;
+        if (!is_null($xOffset)) {
+            $this->setTopLeftXOffset($xOffset);
+        }
+        if (!is_null($yOffset)) {
+            $this->setTopLeftYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the top left position of the chart
+     *
+     * @return array    an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+     */
+    public function getTopLeftPosition()
+    {
+        return array(
+            'cell'    => $this->topLeftCellRef,
+            'xOffset' => $this->topLeftXOffset,
+            'yOffset' => $this->topLeftYOffset
+        );
+    }
+
+    /**
+     * Get the cell address where the top left of the chart is fixed
+     *
+     * @return string
+     */
+    public function getTopLeftCell()
+    {
+        return $this->topLeftCellRef;
+    }
+
+    /**
+     * Set the Top Left cell position for the chart
+     *
+     * @param    string    $cell
+     * @return PHPExcel_Chart
+     */
+    public function setTopLeftCell($cell)
+    {
+        $this->topLeftCellRef = $cell;
+
+        return $this;
+    }
+
+    /**
+     * Set the offset position within the Top Left cell for the chart
+     *
+     * @param    integer    $xOffset
+     * @param    integer    $yOffset
+     * @return PHPExcel_Chart
+     */
+    public function setTopLeftOffset($xOffset = null, $yOffset = null)
+    {
+        if (!is_null($xOffset)) {
+            $this->setTopLeftXOffset($xOffset);
+        }
+        if (!is_null($yOffset)) {
+            $this->setTopLeftYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the offset position within the Top Left cell for the chart
+     *
+     * @return integer[]
+     */
+    public function getTopLeftOffset()
+    {
+        return array(
+            'X' => $this->topLeftXOffset,
+            'Y' => $this->topLeftYOffset
+        );
+    }
+
+    public function setTopLeftXOffset($xOffset)
+    {
+        $this->topLeftXOffset = $xOffset;
+
+        return $this;
+    }
+
+    public function getTopLeftXOffset()
+    {
+        return $this->topLeftXOffset;
+    }
+
+    public function setTopLeftYOffset($yOffset)
+    {
+        $this->topLeftYOffset = $yOffset;
+
+        return $this;
+    }
+
+    public function getTopLeftYOffset()
+    {
+        return $this->topLeftYOffset;
+    }
+
+    /**
+     * Set the Bottom Right position of the chart
+     *
+     * @param    string    $cell
+     * @param    integer    $xOffset
+     * @param    integer    $yOffset
+     * @return PHPExcel_Chart
+     */
+    public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null)
+    {
+        $this->bottomRightCellRef = $cell;
+        if (!is_null($xOffset)) {
+            $this->setBottomRightXOffset($xOffset);
+        }
+        if (!is_null($yOffset)) {
+            $this->setBottomRightYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the bottom right position of the chart
+     *
+     * @return array    an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+     */
+    public function getBottomRightPosition()
+    {
+        return array(
+            'cell'    => $this->bottomRightCellRef,
+            'xOffset' => $this->bottomRightXOffset,
+            'yOffset' => $this->bottomRightYOffset
+        );
+    }
+
+    public function setBottomRightCell($cell)
+    {
+        $this->bottomRightCellRef = $cell;
+
+        return $this;
+    }
+
+    /**
+     * Get the cell address where the bottom right of the chart is fixed
+     *
+     * @return string
+     */
+    public function getBottomRightCell()
+    {
+        return $this->bottomRightCellRef;
+    }
+
+    /**
+     * Set the offset position within the Bottom Right cell for the chart
+     *
+     * @param    integer    $xOffset
+     * @param    integer    $yOffset
+     * @return PHPExcel_Chart
+     */
+    public function setBottomRightOffset($xOffset = null, $yOffset = null)
+    {
+        if (!is_null($xOffset)) {
+            $this->setBottomRightXOffset($xOffset);
+        }
+        if (!is_null($yOffset)) {
+            $this->setBottomRightYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the offset position within the Bottom Right cell for the chart
+     *
+     * @return integer[]
+     */
+    public function getBottomRightOffset()
+    {
+        return array(
+            'X' => $this->bottomRightXOffset,
+            'Y' => $this->bottomRightYOffset
+        );
+    }
+
+    public function setBottomRightXOffset($xOffset)
+    {
+        $this->bottomRightXOffset = $xOffset;
+
+        return $this;
+    }
+
+    public function getBottomRightXOffset()
+    {
+        return $this->bottomRightXOffset;
+    }
+
+    public function setBottomRightYOffset($yOffset)
+    {
+        $this->bottomRightYOffset = $yOffset;
+
+        return $this;
+    }
+
+    public function getBottomRightYOffset()
+    {
+        return $this->bottomRightYOffset;
+    }
+
+
+    public function refresh()
+    {
+        if ($this->worksheet !== null) {
+            $this->plotArea->refresh($this->worksheet);
+        }
+    }
+
+    public function render($outputDestination = null)
+    {
+        $libraryName = PHPExcel_Settings::getChartRendererName();
+        if (is_null($libraryName)) {
+            return false;
+        }
+        //    Ensure that data series values are up-to-date before we render
+        $this->refresh();
+
+        $libraryPath = PHPExcel_Settings::getChartRendererPath();
+        $includePath = str_replace('\\', '/', get_include_path());
+        $rendererPath = str_replace('\\', '/', $libraryPath);
+        if (strpos($rendererPath, $includePath) === false) {
+            set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath);
+        }
+
+        $rendererName = 'PHPExcel_Chart_Renderer_'.$libraryName;
+        $renderer = new $rendererName($this);
+
+        if ($outputDestination == 'php://output') {
+            $outputDestination = null;
+        }
+        return $renderer->render($outputDestination);
+    }
+}
diff --git a/lib/PHPExcel/Chart/Axis.php b/lib/PHPExcel/Chart/Axis.php
new file mode 100644
index 000000000..9aeafc6a4
--- /dev/null
+++ b/lib/PHPExcel/Chart/Axis.php
@@ -0,0 +1,561 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Wiktor Trzonkowski
+ * Date: 6/17/14
+ * Time: 12:11 PM
+ */
+
+class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
+{
+    /**
+     * Axis Number
+     *
+     * @var  array of mixed
+     */
+    private $axisNumber = array(
+        'format' => self::FORMAT_CODE_GENERAL,
+        'source_linked' => 1
+    );
+
+    /**
+     * Axis Options
+     *
+     * @var  array of mixed
+     */
+    private $axisOptions = array(
+        'minimum' => null,
+        'maximum' => null,
+        'major_unit' => null,
+        'minor_unit' => null,
+        'orientation' => self::ORIENTATION_NORMAL,
+        'minor_tick_mark' => self::TICK_MARK_NONE,
+        'major_tick_mark' => self::TICK_MARK_NONE,
+        'axis_labels' => self::AXIS_LABELS_NEXT_TO,
+        'horizontal_crosses' => self::HORIZONTAL_CROSSES_AUTOZERO,
+        'horizontal_crosses_value' => null
+    );
+
+    /**
+     * Fill Properties
+     *
+     * @var  array of mixed
+     */
+    private $fillProperties = array(
+        'type' => self::EXCEL_COLOR_TYPE_ARGB,
+        'value' => null,
+        'alpha' => 0
+    );
+
+    /**
+     * Line Properties
+     *
+     * @var  array of mixed
+     */
+    private $lineProperties = array(
+        'type' => self::EXCEL_COLOR_TYPE_ARGB,
+        'value' => null,
+        'alpha' => 0
+    );
+
+    /**
+     * Line Style Properties
+     *
+     * @var  array of mixed
+     */
+    private $lineStyleProperties = array(
+        'width' => '9525',
+        'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
+        'dash' => self::LINE_STYLE_DASH_SOLID,
+        'cap' => self::LINE_STYLE_CAP_FLAT,
+        'join' => self::LINE_STYLE_JOIN_BEVEL,
+        'arrow' => array(
+            'head' => array(
+                'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => self::LINE_STYLE_ARROW_SIZE_5
+            ),
+            'end' => array(
+                'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => self::LINE_STYLE_ARROW_SIZE_8
+            ),
+        )
+    );
+
+    /**
+     * Shadow Properties
+     *
+     * @var  array of mixed
+     */
+    private $shadowProperties = array(
+        'presets' => self::SHADOW_PRESETS_NOSHADOW,
+        'effect' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 40,
+        ),
+        'size' => array(
+            'sx' => null,
+            'sy' => null,
+            'kx' => null
+        ),
+        'blur' => null,
+        'direction' => null,
+        'distance' => null,
+        'algn' => null,
+        'rotWithShape' => null
+    );
+
+    /**
+     * Glow Properties
+     *
+     * @var  array of mixed
+     */
+    private $glowProperties = array(
+        'size' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 40
+        )
+    );
+
+    /**
+     * Soft Edge Properties
+     *
+     * @var  array of mixed
+     */
+    private $softEdges = array(
+        'size' => null
+    );
+
+    /**
+     * Get Series Data Type
+     *
+     * @return  string
+     */
+    public function setAxisNumberProperties($format_code)
+    {
+        $this->axisNumber['format'] = (string) $format_code;
+        $this->axisNumber['source_linked'] = 0;
+    }
+
+    /**
+     * Get Axis Number Format Data Type
+     *
+     * @return  string
+     */
+    public function getAxisNumberFormat()
+    {
+        return $this->axisNumber['format'];
+    }
+
+    /**
+     * Get Axis Number Source Linked
+     *
+     * @return  string
+     */
+    public function getAxisNumberSourceLinked()
+    {
+        return (string) $this->axisNumber['source_linked'];
+    }
+
+    /**
+     * Set Axis Options Properties
+     *
+     * @param string $axis_labels
+     * @param string $horizontal_crosses_value
+     * @param string $horizontal_crosses
+     * @param string $axis_orientation
+     * @param string $major_tmt
+     * @param string $minor_tmt
+     * @param string $minimum
+     * @param string $maximum
+     * @param string $major_unit
+     * @param string $minor_unit
+     *
+     */
+    public function setAxisOptionsProperties($axis_labels, $horizontal_crosses_value = null, $horizontal_crosses = null, $axis_orientation = null, $major_tmt = null, $minor_tmt = null, $minimum = null, $maximum = null, $major_unit = null, $minor_unit = null)
+    {
+        $this->axisOptions['axis_labels'] = (string) $axis_labels;
+        ($horizontal_crosses_value !== null) ? $this->axisOptions['horizontal_crosses_value'] = (string) $horizontal_crosses_value : null;
+        ($horizontal_crosses !== null) ? $this->axisOptions['horizontal_crosses'] = (string) $horizontal_crosses : null;
+        ($axis_orientation !== null) ? $this->axisOptions['orientation'] = (string) $axis_orientation : null;
+        ($major_tmt !== null) ? $this->axisOptions['major_tick_mark'] = (string) $major_tmt : null;
+        ($minor_tmt !== null) ? $this->axisOptions['minor_tick_mark'] = (string) $minor_tmt : null;
+        ($minor_tmt !== null) ? $this->axisOptions['minor_tick_mark'] = (string) $minor_tmt : null;
+        ($minimum !== null) ? $this->axisOptions['minimum'] = (string) $minimum : null;
+        ($maximum !== null) ? $this->axisOptions['maximum'] = (string) $maximum : null;
+        ($major_unit !== null) ? $this->axisOptions['major_unit'] = (string) $major_unit : null;
+        ($minor_unit !== null) ? $this->axisOptions['minor_unit'] = (string) $minor_unit : null;
+    }
+
+    /**
+     * Get Axis Options Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+    public function getAxisOptionsProperty($property)
+    {
+        return $this->axisOptions[$property];
+    }
+
+    /**
+     * Set Axis Orientation Property
+     *
+     * @param string $orientation
+     *
+     */
+    public function setAxisOrientation($orientation)
+    {
+        $this->orientation = (string) $orientation;
+    }
+
+    /**
+     * Set Fill Property
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     */
+    public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
+    {
+        $this->fillProperties = $this->setColorProperties($color, $alpha, $type);
+    }
+
+    /**
+     * Set Line Property
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     */
+    public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
+    {
+        $this->lineProperties = $this->setColorProperties($color, $alpha, $type);
+    }
+
+    /**
+     * Get Fill Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+    public function getFillProperty($property)
+    {
+        return $this->fillProperties[$property];
+    }
+
+    /**
+     * Get Line Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+    public function getLineProperty($property)
+    {
+        return $this->lineProperties[$property];
+    }
+
+    /**
+     * Set Line Style Properties
+     *
+     * @param float $line_width
+     * @param string $compound_type
+     * @param string $dash_type
+     * @param string $cap_type
+     * @param string $join_type
+     * @param string $head_arrow_type
+     * @param string $head_arrow_size
+     * @param string $end_arrow_type
+     * @param string $end_arrow_size
+     *
+     */
+    public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null)
+    {
+        (!is_null($line_width)) ? $this->lineStyleProperties['width'] = $this->getExcelPointsWidth((float) $line_width) : null;
+        (!is_null($compound_type)) ? $this->lineStyleProperties['compound'] = (string) $compound_type : null;
+        (!is_null($dash_type)) ? $this->lineStyleProperties['dash'] = (string) $dash_type : null;
+        (!is_null($cap_type)) ? $this->lineStyleProperties['cap'] = (string) $cap_type : null;
+        (!is_null($join_type)) ? $this->lineStyleProperties['join'] = (string) $join_type : null;
+        (!is_null($head_arrow_type)) ? $this->lineStyleProperties['arrow']['head']['type'] = (string) $head_arrow_type : null;
+        (!is_null($head_arrow_size)) ? $this->lineStyleProperties['arrow']['head']['size'] = (string) $head_arrow_size : null;
+        (!is_null($end_arrow_type)) ? $this->lineStyleProperties['arrow']['end']['type'] = (string) $end_arrow_type : null;
+        (!is_null($end_arrow_size)) ? $this->lineStyleProperties['arrow']['end']['size'] = (string) $end_arrow_size : null;
+    }
+
+    /**
+     * Get Line Style Property
+     *
+     * @param array|string $elements
+     *
+     * @return string
+     */
+    public function getLineStyleProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->lineStyleProperties, $elements);
+    }
+
+    /**
+     * Get Line Style Arrow Excel Width
+     *
+     * @param string $arrow
+     *
+     * @return string
+     */
+    public function getLineStyleArrowWidth($arrow)
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'w');
+    }
+
+    /**
+     * Get Line Style Arrow Excel Length
+     *
+     * @param string $arrow
+     *
+     * @return string
+     */
+    public function getLineStyleArrowLength($arrow)
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'len');
+    }
+
+    /**
+     * Set Shadow Properties
+     *
+     * @param int $shadow_presets
+     * @param string $sh_color_value
+     * @param string $sh_color_type
+     * @param string $sh_color_alpha
+     * @param float $sh_blur
+     * @param int $sh_angle
+     * @param float $sh_distance
+     *
+     */
+    public function setShadowProperties($sh_presets, $sh_color_value = null, $sh_color_type = null, $sh_color_alpha = null, $sh_blur = null, $sh_angle = null, $sh_distance = null)
+    {
+        $this->setShadowPresetsProperties((int) $sh_presets)
+            ->setShadowColor(
+                is_null($sh_color_value) ? $this->shadowProperties['color']['value'] : $sh_color_value,
+                is_null($sh_color_alpha) ? (int) $this->shadowProperties['color']['alpha'] : $sh_color_alpha,
+                is_null($sh_color_type) ? $this->shadowProperties['color']['type'] : $sh_color_type
+            )
+            ->setShadowBlur($sh_blur)
+            ->setShadowAngle($sh_angle)
+            ->setShadowDistance($sh_distance);
+    }
+
+    /**
+     * Set Shadow Color
+     *
+     * @param int $shadow_presets
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowPresetsProperties($shadow_presets)
+    {
+        $this->shadowProperties['presets'] = $shadow_presets;
+        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties from Maped Values
+     *
+     * @param array $properties_map
+     * @param * $reference
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowProperiesMapValues(array $properties_map, &$reference = null)
+    {
+        $base_reference = $reference;
+        foreach ($properties_map as $property_key => $property_val) {
+            if (is_array($property_val)) {
+                if ($reference === null) {
+                    $reference = & $this->shadowProperties[$property_key];
+                } else {
+                    $reference = & $reference[$property_key];
+                }
+                $this->setShadowProperiesMapValues($property_val, $reference);
+            } else {
+                if ($base_reference === null) {
+                    $this->shadowProperties[$property_key] = $property_val;
+                } else {
+                    $reference[$property_key] = $property_val;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowColor($color, $alpha, $type)
+    {
+        $this->shadowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Blur
+     *
+     * @param float $blur
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowBlur($blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle
+     *
+     * @param int $angle
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowAngle($angle)
+    {
+        if ($angle !== null) {
+            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance
+     *
+     * @param float $distance
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowDistance($distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Glow Property
+     *
+     * @param float $size
+     * @param string $color_value
+     * @param int $color_alpha
+     * @param string $color_type
+     */
+    public function getShadowProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->shadowProperties, $elements);
+    }
+
+    /**
+     * Set Glow Properties
+     *
+     * @param float $size
+     * @param string $color_value
+     * @param int $color_alpha
+     * @param string $color_type
+     */
+    public function setGlowProperties($size, $color_value = null, $color_alpha = null, $color_type = null)
+    {
+        $this->setGlowSize($size)
+            ->setGlowColor(
+                is_null($color_value) ? $this->glowProperties['color']['value'] : $color_value,
+                is_null($color_alpha) ? (int) $this->glowProperties['color']['alpha'] : $color_alpha,
+                is_null($color_type) ? $this->glowProperties['color']['type'] : $color_type
+            );
+    }
+
+    /**
+     * Get Glow Property
+     *
+     * @param array|string $property
+     *
+     * @return string
+     */
+    public function getGlowProperty($property)
+    {
+        return $this->getArrayElementsValue($this->glowProperties, $property);
+    }
+
+    /**
+     * Set Glow Color
+     *
+     * @param float $size
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setGlowSize($size)
+    {
+        if (!is_null($size)) {
+            $this->glowProperties['size'] = $this->getExcelPointsWidth($size);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Glow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setGlowColor($color, $alpha, $type)
+    {
+        $this->glowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
+
+        return $this;
+    }
+
+    /**
+     * Set Soft Edges Size
+     *
+     * @param float $size
+     */
+    public function setSoftEdges($size)
+    {
+        if (!is_null($size)) {
+            $softEdges['size'] = (string) $this->getExcelPointsWidth($size);
+        }
+    }
+
+    /**
+     * Get Soft Edges Size
+     *
+     * @return string
+     */
+    public function getSoftEdgesSize()
+    {
+        return $this->softEdges['size'];
+    }
+}
diff --git a/lib/PHPExcel/Chart/DataSeries.php b/lib/PHPExcel/Chart/DataSeries.php
new file mode 100644
index 000000000..9ecd543a8
--- /dev/null
+++ b/lib/PHPExcel/Chart/DataSeries.php
@@ -0,0 +1,390 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Chart_DataSeries
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_DataSeries
+{
+    const TYPE_BARCHART        = 'barChart';
+    const TYPE_BARCHART_3D     = 'bar3DChart';
+    const TYPE_LINECHART       = 'lineChart';
+    const TYPE_LINECHART_3D    = 'line3DChart';
+    const TYPE_AREACHART       = 'areaChart';
+    const TYPE_AREACHART_3D    = 'area3DChart';
+    const TYPE_PIECHART        = 'pieChart';
+    const TYPE_PIECHART_3D     = 'pie3DChart';
+    const TYPE_DOUGHTNUTCHART  = 'doughnutChart';
+    const TYPE_DONUTCHART      = self::TYPE_DOUGHTNUTCHART;    //    Synonym
+    const TYPE_SCATTERCHART    = 'scatterChart';
+    const TYPE_SURFACECHART    = 'surfaceChart';
+    const TYPE_SURFACECHART_3D = 'surface3DChart';
+    const TYPE_RADARCHART      = 'radarChart';
+    const TYPE_BUBBLECHART     = 'bubbleChart';
+    const TYPE_STOCKCHART      = 'stockChart';
+    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART;       //    Synonym
+
+    const GROUPING_CLUSTERED       = 'clustered';
+    const GROUPING_STACKED         = 'stacked';
+    const GROUPING_PERCENT_STACKED = 'percentStacked';
+    const GROUPING_STANDARD        = 'standard';
+
+    const DIRECTION_BAR        = 'bar';
+    const DIRECTION_HORIZONTAL = self::DIRECTION_BAR;
+    const DIRECTION_COL        = 'col';
+    const DIRECTION_COLUMN     = self::DIRECTION_COL;
+    const DIRECTION_VERTICAL   = self::DIRECTION_COL;
+
+    const STYLE_LINEMARKER   = 'lineMarker';
+    const STYLE_SMOOTHMARKER = 'smoothMarker';
+    const STYLE_MARKER       = 'marker';
+    const STYLE_FILLED       = 'filled';
+
+
+    /**
+     * Series Plot Type
+     *
+     * @var string
+     */
+    private $plotType;
+
+    /**
+     * Plot Grouping Type
+     *
+     * @var boolean
+     */
+    private $plotGrouping;
+
+    /**
+     * Plot Direction
+     *
+     * @var boolean
+     */
+    private $plotDirection;
+
+    /**
+     * Plot Style
+     *
+     * @var string
+     */
+    private $plotStyle;
+
+    /**
+     * Order of plots in Series
+     *
+     * @var array of integer
+     */
+    private $plotOrder = array();
+
+    /**
+     * Plot Label
+     *
+     * @var array of PHPExcel_Chart_DataSeriesValues
+     */
+    private $plotLabel = array();
+
+    /**
+     * Plot Category
+     *
+     * @var array of PHPExcel_Chart_DataSeriesValues
+     */
+    private $plotCategory = array();
+
+    /**
+     * Smooth Line
+     *
+     * @var string
+     */
+    private $smoothLine;
+
+    /**
+     * Plot Values
+     *
+     * @var array of PHPExcel_Chart_DataSeriesValues
+     */
+    private $plotValues = array();
+
+    /**
+     * Create a new PHPExcel_Chart_DataSeries
+     */
+    public function __construct($plotType = null, $plotGrouping = null, $plotOrder = array(), $plotLabel = array(), $plotCategory = array(), $plotValues = array(), $plotDirection = null, $smoothLine = null, $plotStyle = null)
+    {
+        $this->plotType = $plotType;
+        $this->plotGrouping = $plotGrouping;
+        $this->plotOrder = $plotOrder;
+        $keys = array_keys($plotValues);
+        $this->plotValues = $plotValues;
+        if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
+            $plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
+        }
+
+        $this->plotLabel = $plotLabel;
+        if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
+            $plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
+        }
+        $this->plotCategory = $plotCategory;
+        $this->smoothLine = $smoothLine;
+        $this->plotStyle = $plotStyle;
+        
+        if (is_null($plotDirection)) {
+            $plotDirection = self::DIRECTION_COL;
+        }
+        $this->plotDirection = $plotDirection;
+    }
+
+    /**
+     * Get Plot Type
+     *
+     * @return string
+     */
+    public function getPlotType()
+    {
+        return $this->plotType;
+    }
+
+    /**
+     * Set Plot Type
+     *
+     * @param string $plotType
+     * @return PHPExcel_Chart_DataSeries
+     */
+    public function setPlotType($plotType = '')
+    {
+        $this->plotType = $plotType;
+        return $this;
+    }
+
+    /**
+     * Get Plot Grouping Type
+     *
+     * @return string
+     */
+    public function getPlotGrouping()
+    {
+        return $this->plotGrouping;
+    }
+
+    /**
+     * Set Plot Grouping Type
+     *
+     * @param string $groupingType
+     * @return PHPExcel_Chart_DataSeries
+     */
+    public function setPlotGrouping($groupingType = null)
+    {
+        $this->plotGrouping = $groupingType;
+        return $this;
+    }
+
+    /**
+     * Get Plot Direction
+     *
+     * @return string
+     */
+    public function getPlotDirection()
+    {
+        return $this->plotDirection;
+    }
+
+    /**
+     * Set Plot Direction
+     *
+     * @param string $plotDirection
+     * @return PHPExcel_Chart_DataSeries
+     */
+    public function setPlotDirection($plotDirection = null)
+    {
+        $this->plotDirection = $plotDirection;
+        return $this;
+    }
+
+    /**
+     * Get Plot Order
+     *
+     * @return string
+     */
+    public function getPlotOrder()
+    {
+        return $this->plotOrder;
+    }
+
+    /**
+     * Get Plot Labels
+     *
+     * @return array of PHPExcel_Chart_DataSeriesValues
+     */
+    public function getPlotLabels()
+    {
+        return $this->plotLabel;
+    }
+
+    /**
+     * Get Plot Label by Index
+     *
+     * @return PHPExcel_Chart_DataSeriesValues
+     */
+    public function getPlotLabelByIndex($index)
+    {
+        $keys = array_keys($this->plotLabel);
+        if (in_array($index, $keys)) {
+            return $this->plotLabel[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotLabel[$keys[$index]];
+        }
+        return false;
+    }
+
+    /**
+     * Get Plot Categories
+     *
+     * @return array of PHPExcel_Chart_DataSeriesValues
+     */
+    public function getPlotCategories()
+    {
+        return $this->plotCategory;
+    }
+
+    /**
+     * Get Plot Category by Index
+     *
+     * @return PHPExcel_Chart_DataSeriesValues
+     */
+    public function getPlotCategoryByIndex($index)
+    {
+        $keys = array_keys($this->plotCategory);
+        if (in_array($index, $keys)) {
+            return $this->plotCategory[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotCategory[$keys[$index]];
+        }
+        return false;
+    }
+
+    /**
+     * Get Plot Style
+     *
+     * @return string
+     */
+    public function getPlotStyle()
+    {
+        return $this->plotStyle;
+    }
+
+    /**
+     * Set Plot Style
+     *
+     * @param string $plotStyle
+     * @return PHPExcel_Chart_DataSeries
+     */
+    public function setPlotStyle($plotStyle = null)
+    {
+        $this->plotStyle = $plotStyle;
+        return $this;
+    }
+
+    /**
+     * Get Plot Values
+     *
+     * @return array of PHPExcel_Chart_DataSeriesValues
+     */
+    public function getPlotValues()
+    {
+        return $this->plotValues;
+    }
+
+    /**
+     * Get Plot Values by Index
+     *
+     * @return PHPExcel_Chart_DataSeriesValues
+     */
+    public function getPlotValuesByIndex($index)
+    {
+        $keys = array_keys($this->plotValues);
+        if (in_array($index, $keys)) {
+            return $this->plotValues[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotValues[$keys[$index]];
+        }
+        return false;
+    }
+
+    /**
+     * Get Number of Plot Series
+     *
+     * @return integer
+     */
+    public function getPlotSeriesCount()
+    {
+        return count($this->plotValues);
+    }
+
+    /**
+     * Get Smooth Line
+     *
+     * @return boolean
+     */
+    public function getSmoothLine()
+    {
+        return $this->smoothLine;
+    }
+
+    /**
+     * Set Smooth Line
+     *
+     * @param boolean $smoothLine
+     * @return PHPExcel_Chart_DataSeries
+     */
+    public function setSmoothLine($smoothLine = true)
+    {
+        $this->smoothLine = $smoothLine;
+        return $this;
+    }
+
+    public function refresh(PHPExcel_Worksheet $worksheet)
+    {
+        foreach ($this->plotValues as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, true);
+            }
+        }
+        foreach ($this->plotLabel as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, true);
+            }
+        }
+        foreach ($this->plotCategory as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, false);
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Chart/DataSeriesValues.php b/lib/PHPExcel/Chart/DataSeriesValues.php
new file mode 100644
index 000000000..ea57e52a1
--- /dev/null
+++ b/lib/PHPExcel/Chart/DataSeriesValues.php
@@ -0,0 +1,333 @@
+<?php
+
+/**
+ * PHPExcel_Chart_DataSeriesValues
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart_DataSeriesValues
+{
+
+    const DATASERIES_TYPE_STRING    = 'String';
+    const DATASERIES_TYPE_NUMBER    = 'Number';
+
+    private static $dataTypeValues = array(
+        self::DATASERIES_TYPE_STRING,
+        self::DATASERIES_TYPE_NUMBER,
+    );
+
+    /**
+     * Series Data Type
+     *
+     * @var    string
+     */
+    private $dataType;
+
+    /**
+     * Series Data Source
+     *
+     * @var    string
+     */
+    private $dataSource;
+
+    /**
+     * Format Code
+     *
+     * @var    string
+     */
+    private $formatCode;
+
+    /**
+     * Series Point Marker
+     *
+     * @var    string
+     */
+    private $pointMarker;
+
+    /**
+     * Point Count (The number of datapoints in the dataseries)
+     *
+     * @var    integer
+     */
+    private $pointCount = 0;
+
+    /**
+     * Data Values
+     *
+     * @var    array of mixed
+     */
+    private $dataValues = array();
+
+    /**
+     * Create a new PHPExcel_Chart_DataSeriesValues object
+     */
+    public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
+    {
+        $this->setDataType($dataType);
+        $this->dataSource = $dataSource;
+        $this->formatCode = $formatCode;
+        $this->pointCount = $pointCount;
+        $this->dataValues = $dataValues;
+        $this->pointMarker = $marker;
+    }
+
+    /**
+     * Get Series Data Type
+     *
+     * @return    string
+     */
+    public function getDataType()
+    {
+        return $this->dataType;
+    }
+
+    /**
+     * Set Series Data Type
+     *
+     * @param    string    $dataType    Datatype of this data series
+     *                                Typical values are:
+     *                                    PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_STRING
+     *                                        Normally used for axis point values
+     *                                    PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_NUMBER
+     *                                        Normally used for chart data values
+     * @return    PHPExcel_Chart_DataSeriesValues
+     */
+    public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER)
+    {
+        if (!in_array($dataType, self::$dataTypeValues)) {
+            throw new PHPExcel_Chart_Exception('Invalid datatype for chart data series values');
+        }
+        $this->dataType = $dataType;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Data Source (formula)
+     *
+     * @return    string
+     */
+    public function getDataSource()
+    {
+        return $this->dataSource;
+    }
+
+    /**
+     * Set Series Data Source (formula)
+     *
+     * @param    string    $dataSource
+     * @return    PHPExcel_Chart_DataSeriesValues
+     */
+    public function setDataSource($dataSource = null, $refreshDataValues = true)
+    {
+        $this->dataSource = $dataSource;
+
+        if ($refreshDataValues) {
+            //    TO DO
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Point Marker
+     *
+     * @return string
+     */
+    public function getPointMarker()
+    {
+        return $this->pointMarker;
+    }
+
+    /**
+     * Set Point Marker
+     *
+     * @param    string    $marker
+     * @return    PHPExcel_Chart_DataSeriesValues
+     */
+    public function setPointMarker($marker = null)
+    {
+        $this->pointMarker = $marker;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Format Code
+     *
+     * @return    string
+     */
+    public function getFormatCode()
+    {
+        return $this->formatCode;
+    }
+
+    /**
+     * Set Series Format Code
+     *
+     * @param    string    $formatCode
+     * @return    PHPExcel_Chart_DataSeriesValues
+     */
+    public function setFormatCode($formatCode = null)
+    {
+        $this->formatCode = $formatCode;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Point Count
+     *
+     * @return    integer
+     */
+    public function getPointCount()
+    {
+        return $this->pointCount;
+    }
+
+    /**
+     * Identify if the Data Series is a multi-level or a simple series
+     *
+     * @return    boolean
+     */
+    public function isMultiLevelSeries()
+    {
+        if (count($this->dataValues) > 0) {
+            return is_array($this->dataValues[0]);
+        }
+        return null;
+    }
+
+    /**
+     * Return the level count of a multi-level Data Series
+     *
+     * @return    boolean
+     */
+    public function multiLevelCount()
+    {
+        $levelCount = 0;
+        foreach ($this->dataValues as $dataValueSet) {
+            $levelCount = max($levelCount, count($dataValueSet));
+        }
+        return $levelCount;
+    }
+
+    /**
+     * Get Series Data Values
+     *
+     * @return    array of mixed
+     */
+    public function getDataValues()
+    {
+        return $this->dataValues;
+    }
+
+    /**
+     * Get the first Series Data value
+     *
+     * @return    mixed
+     */
+    public function getDataValue()
+    {
+        $count = count($this->dataValues);
+        if ($count == 0) {
+            return null;
+        } elseif ($count == 1) {
+            return $this->dataValues[0];
+        }
+        return $this->dataValues;
+    }
+
+    /**
+     * Set Series Data Values
+     *
+     * @param    array    $dataValues
+     * @param    boolean    $refreshDataSource
+     *                    TRUE - refresh the value of dataSource based on the values of $dataValues
+     *                    FALSE - don't change the value of dataSource
+     * @return    PHPExcel_Chart_DataSeriesValues
+     */
+    public function setDataValues($dataValues = array(), $refreshDataSource = true)
+    {
+        $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
+        $this->pointCount = count($dataValues);
+
+        if ($refreshDataSource) {
+            //    TO DO
+        }
+
+        return $this;
+    }
+
+    private function stripNulls($var)
+    {
+        return $var !== null;
+    }
+
+    public function refresh(PHPExcel_Worksheet $worksheet, $flatten = true)
+    {
+        if ($this->dataSource !== null) {
+            $calcEngine = PHPExcel_Calculation::getInstance($worksheet->getParent());
+            $newDataValues = PHPExcel_Calculation::unwrapResult(
+                $calcEngine->_calculateFormulaValue(
+                    '='.$this->dataSource,
+                    null,
+                    $worksheet->getCell('A1')
+                )
+            );
+            if ($flatten) {
+                $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+                foreach ($this->dataValues as &$dataValue) {
+                    if ((!empty($dataValue)) && ($dataValue[0] == '#')) {
+                        $dataValue = 0.0;
+                    }
+                }
+                unset($dataValue);
+            } else {
+                $cellRange = explode('!', $this->dataSource);
+                if (count($cellRange) > 1) {
+                    list(, $cellRange) = $cellRange;
+                }
+
+                $dimensions = PHPExcel_Cell::rangeDimension(str_replace('$', '', $cellRange));
+                if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
+                    $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+                } else {
+                    $newArray = array_values(array_shift($newDataValues));
+                    foreach ($newArray as $i => $newDataSet) {
+                        $newArray[$i] = array($newDataSet);
+                    }
+
+                    foreach ($newDataValues as $newDataSet) {
+                        $i = 0;
+                        foreach ($newDataSet as $newDataVal) {
+                            array_unshift($newArray[$i++], $newDataVal);
+                        }
+                    }
+                    $this->dataValues = $newArray;
+                }
+            }
+            $this->pointCount = count($this->dataValues);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Chart/Exception.php b/lib/PHPExcel/Chart/Exception.php
new file mode 100644
index 000000000..e20dfa590
--- /dev/null
+++ b/lib/PHPExcel/Chart/Exception.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * PHPExcel_Chart_Exception
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Chart
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart_Exception extends PHPExcel_Exception
+{
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
+}
diff --git a/lib/PHPExcel/Chart/GridLines.php b/lib/PHPExcel/Chart/GridLines.php
new file mode 100644
index 000000000..898012ebd
--- /dev/null
+++ b/lib/PHPExcel/Chart/GridLines.php
@@ -0,0 +1,472 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Wiktor Trzonkowski
+ * Date: 7/2/14
+ * Time: 2:36 PM
+ */
+
+class PHPExcel_Chart_GridLines extends PHPExcel_Chart_Properties
+{
+
+  /**
+   * Properties of Class:
+   * Object State (State for Minor Tick Mark) @var bool
+   * Line Properties @var  array of mixed
+   * Shadow Properties @var  array of mixed
+   * Glow Properties @var  array of mixed
+   * Soft Properties @var  array of mixed
+   *
+   */
+
+    private $objectState = false;
+
+    private $lineProperties = array(
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => null,
+            'alpha' => 0
+        ),
+        'style' => array(
+            'width' => '9525',
+            'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
+            'dash' => self::LINE_STYLE_DASH_SOLID,
+            'cap' => self::LINE_STYLE_CAP_FLAT,
+            'join' => self::LINE_STYLE_JOIN_BEVEL,
+            'arrow' => array(
+                'head' => array(
+                    'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                    'size' => self::LINE_STYLE_ARROW_SIZE_5
+                ),
+                'end' => array(
+                    'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                    'size' => self::LINE_STYLE_ARROW_SIZE_8
+                ),
+            )
+        )
+    );
+
+    private $shadowProperties = array(
+        'presets' => self::SHADOW_PRESETS_NOSHADOW,
+        'effect' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 85,
+        ),
+        'size' => array(
+            'sx' => null,
+            'sy' => null,
+            'kx' => null
+        ),
+        'blur' => null,
+        'direction' => null,
+        'distance' => null,
+        'algn' => null,
+        'rotWithShape' => null
+    );
+
+    private $glowProperties = array(
+        'size' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 40
+        )
+    );
+
+    private $softEdges = array(
+        'size' => null
+     );
+
+    /**
+     * Get Object State
+     *
+     * @return bool
+     */
+
+    public function getObjectState()
+    {
+        return $this->objectState;
+    }
+
+    /**
+     * Change Object State to True
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function activateObject()
+    {
+        $this->objectState = true;
+
+        return $this;
+    }
+
+    /**
+     * Set Line Color Properties
+     *
+     * @param string $value
+     * @param int $alpha
+     * @param string $type
+     */
+
+    public function setLineColorProperties($value, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_STANDARD)
+    {
+        $this->activateObject()
+            ->lineProperties['color'] = $this->setColorProperties(
+                $value,
+                $alpha,
+                $type
+            );
+    }
+
+    /**
+     * Set Line Color Properties
+     *
+     * @param float $line_width
+     * @param string $compound_type
+     * @param string $dash_type
+     * @param string $cap_type
+     * @param string $join_type
+     * @param string $head_arrow_type
+     * @param string $head_arrow_size
+     * @param string $end_arrow_type
+     * @param string $end_arrow_size
+     */
+
+    public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null)
+    {
+        $this->activateObject();
+        (!is_null($line_width))
+                ? $this->lineProperties['style']['width'] = $this->getExcelPointsWidth((float) $line_width)
+                : null;
+        (!is_null($compound_type))
+                ? $this->lineProperties['style']['compound'] = (string) $compound_type
+                : null;
+        (!is_null($dash_type))
+                ? $this->lineProperties['style']['dash'] = (string) $dash_type
+                : null;
+        (!is_null($cap_type))
+                ? $this->lineProperties['style']['cap'] = (string) $cap_type
+                : null;
+        (!is_null($join_type))
+                ? $this->lineProperties['style']['join'] = (string) $join_type
+                : null;
+        (!is_null($head_arrow_type))
+                ? $this->lineProperties['style']['arrow']['head']['type'] = (string) $head_arrow_type
+                : null;
+        (!is_null($head_arrow_size))
+                ? $this->lineProperties['style']['arrow']['head']['size'] = (string) $head_arrow_size
+                : null;
+        (!is_null($end_arrow_type))
+                ? $this->lineProperties['style']['arrow']['end']['type'] = (string) $end_arrow_type
+                : null;
+        (!is_null($end_arrow_size))
+                ? $this->lineProperties['style']['arrow']['end']['size'] = (string) $end_arrow_size
+                : null;
+    }
+
+    /**
+     * Get Line Color Property
+     *
+     * @param string $parameter
+     *
+     * @return string
+     */
+
+    public function getLineColorProperty($parameter)
+    {
+        return $this->lineProperties['color'][$parameter];
+    }
+
+    /**
+     * Get Line Style Property
+     *
+     * @param    array|string $elements
+     *
+     * @return string
+     */
+
+    public function getLineStyleProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->lineProperties['style'], $elements);
+    }
+
+    /**
+     * Set Glow Properties
+     *
+     * @param    float $size
+     * @param    string $color_value
+     * @param    int $color_alpha
+     * @param    string $color_type
+     *
+     */
+
+    public function setGlowProperties($size, $color_value = null, $color_alpha = null, $color_type = null)
+    {
+        $this
+                ->activateObject()
+                ->setGlowSize($size)
+                ->setGlowColor($color_value, $color_alpha, $color_type);
+    }
+
+    /**
+     * Get Glow Color Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+
+    public function getGlowColor($property)
+    {
+        return $this->glowProperties['color'][$property];
+    }
+
+    /**
+     * Get Glow Size
+     *
+     * @return string
+     */
+
+    public function getGlowSize()
+    {
+        return $this->glowProperties['size'];
+    }
+
+    /**
+     * Set Glow Size
+     *
+     * @param float $size
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setGlowSize($size)
+    {
+        $this->glowProperties['size'] = $this->getExcelPointsWidth((float) $size);
+
+        return $this;
+    }
+
+    /**
+     * Set Glow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setGlowColor($color, $alpha, $type)
+    {
+        if (!is_null($color)) {
+            $this->glowProperties['color']['value'] = (string) $color;
+        }
+        if (!is_null($alpha)) {
+            $this->glowProperties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
+        }
+        if (!is_null($type)) {
+            $this->glowProperties['color']['type'] = (string) $type;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Line Style Arrow Parameters
+     *
+     * @param string $arrow_selector
+     * @param string $property_selector
+     *
+     * @return string
+     */
+
+    public function getLineStyleArrowParameters($arrow_selector, $property_selector)
+    {
+        return $this->getLineStyleArrowSize($this->lineProperties['style']['arrow'][$arrow_selector]['size'], $property_selector);
+    }
+
+    /**
+     * Set Shadow Properties
+     *
+     * @param int $sh_presets
+     * @param string $sh_color_value
+     * @param string $sh_color_type
+     * @param int $sh_color_alpha
+     * @param string $sh_blur
+     * @param int $sh_angle
+     * @param float $sh_distance
+     *
+     */
+
+    public function setShadowProperties($sh_presets, $sh_color_value = null, $sh_color_type = null, $sh_color_alpha = null, $sh_blur = null, $sh_angle = null, $sh_distance = null)
+    {
+        $this->activateObject()
+            ->setShadowPresetsProperties((int) $sh_presets)
+            ->setShadowColor(
+                is_null($sh_color_value) ? $this->shadowProperties['color']['value'] : $sh_color_value,
+                is_null($sh_color_alpha) ? (int) $this->shadowProperties['color']['alpha'] : $this->getTrueAlpha($sh_color_alpha),
+                is_null($sh_color_type) ? $this->shadowProperties['color']['type'] : $sh_color_type
+            )
+            ->setShadowBlur($sh_blur)
+            ->setShadowAngle($sh_angle)
+            ->setShadowDistance($sh_distance);
+    }
+
+    /**
+     * Set Shadow Presets Properties
+     *
+     * @param int $shadow_presets
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setShadowPresetsProperties($shadow_presets)
+    {
+        $this->shadowProperties['presets'] = $shadow_presets;
+        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties Values
+     *
+     * @param array $properties_map
+     * @param * $reference
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setShadowProperiesMapValues(array $properties_map, &$reference = null)
+    {
+        $base_reference = $reference;
+        foreach ($properties_map as $property_key => $property_val) {
+            if (is_array($property_val)) {
+                if ($reference === null) {
+                    $reference = & $this->shadowProperties[$property_key];
+                } else {
+                    $reference = & $reference[$property_key];
+                }
+                $this->setShadowProperiesMapValues($property_val, $reference);
+            } else {
+                if ($base_reference === null) {
+                    $this->shadowProperties[$property_key] = $property_val;
+                } else {
+                    $reference[$property_key] = $property_val;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     * @return PHPExcel_Chart_GridLines
+     */
+    private function setShadowColor($color, $alpha, $type)
+    {
+        if (!is_null($color)) {
+            $this->shadowProperties['color']['value'] = (string) $color;
+        }
+        if (!is_null($alpha)) {
+            $this->shadowProperties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
+        }
+        if (!is_null($type)) {
+            $this->shadowProperties['color']['type'] = (string) $type;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Blur
+     *
+     * @param float $blur
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+    private function setShadowBlur($blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle
+     *
+     * @param int $angle
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setShadowAngle($angle)
+    {
+        if ($angle !== null) {
+            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance
+     *
+     * @param float $distance
+     * @return PHPExcel_Chart_GridLines
+     */
+    private function setShadowDistance($distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Shadow Property
+     *
+     * @param string $elements
+     * @param array $elements
+     * @return string
+     */
+    public function getShadowProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->shadowProperties, $elements);
+    }
+
+    /**
+     * Set Soft Edges Size
+     *
+     * @param float $size
+     */
+    public function setSoftEdgesSize($size)
+    {
+        if (!is_null($size)) {
+            $this->activateObject();
+            $softEdges['size'] = (string) $this->getExcelPointsWidth($size);
+        }
+    }
+
+    /**
+     * Get Soft Edges Size
+     *
+     * @return string
+     */
+    public function getSoftEdgesSize()
+    {
+        return $this->softEdges['size'];
+    }
+}
diff --git a/lib/PHPExcel/Chart/Layout.php b/lib/PHPExcel/Chart/Layout.php
new file mode 100644
index 000000000..7fef07410
--- /dev/null
+++ b/lib/PHPExcel/Chart/Layout.php
@@ -0,0 +1,486 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Chart_Layout
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_Layout
+{
+    /**
+     * layoutTarget
+     *
+     * @var string
+     */
+    private $layoutTarget;
+
+    /**
+     * X Mode
+     *
+     * @var string
+     */
+    private $xMode;
+
+    /**
+     * Y Mode
+     *
+     * @var string
+     */
+    private $yMode;
+
+    /**
+     * X-Position
+     *
+     * @var float
+     */
+    private $xPos;
+
+    /**
+     * Y-Position
+     *
+     * @var float
+     */
+    private $yPos;
+
+    /**
+     * width
+     *
+     * @var float
+     */
+    private $width;
+
+    /**
+     * height
+     *
+     * @var float
+     */
+    private $height;
+
+    /**
+     * show legend key
+     * Specifies that legend keys should be shown in data labels
+     *
+     * @var boolean
+     */
+    private $showLegendKey;
+
+    /**
+     * show value
+     * Specifies that the value should be shown in a data label.
+     *
+     * @var boolean
+     */
+    private $showVal;
+
+    /**
+     * show category name
+     * Specifies that the category name should be shown in the data label.
+     *
+     * @var boolean
+     */
+    private $showCatName;
+
+    /**
+     * show data series name
+     * Specifies that the series name should be shown in the data label.
+     *
+     * @var boolean
+     */
+    private $showSerName;
+
+    /**
+     * show percentage
+     * Specifies that the percentage should be shown in the data label.
+     *
+     * @var boolean
+     */
+    private $showPercent;
+
+    /**
+     * show bubble size
+     *
+     * @var boolean
+     */
+    private $showBubbleSize;
+
+    /**
+     * show leader lines
+     * Specifies that leader lines should be shown for the data label.
+     *
+     * @var boolean
+     */
+    private $showLeaderLines;
+
+
+    /**
+     * Create a new PHPExcel_Chart_Layout
+     */
+    public function __construct($layout = array())
+    {
+        if (isset($layout['layoutTarget'])) {
+            $this->layoutTarget = $layout['layoutTarget'];
+        }
+        if (isset($layout['xMode'])) {
+            $this->xMode = $layout['xMode'];
+        }
+        if (isset($layout['yMode'])) {
+            $this->yMode = $layout['yMode'];
+        }
+        if (isset($layout['x'])) {
+            $this->xPos = (float) $layout['x'];
+        }
+        if (isset($layout['y'])) {
+            $this->yPos = (float) $layout['y'];
+        }
+        if (isset($layout['w'])) {
+            $this->width = (float) $layout['w'];
+        }
+        if (isset($layout['h'])) {
+            $this->height = (float) $layout['h'];
+        }
+    }
+
+    /**
+     * Get Layout Target
+     *
+     * @return string
+     */
+    public function getLayoutTarget()
+    {
+        return $this->layoutTarget;
+    }
+
+    /**
+     * Set Layout Target
+     *
+     * @param Layout Target $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setLayoutTarget($value)
+    {
+        $this->layoutTarget = $value;
+        return $this;
+    }
+
+    /**
+     * Get X-Mode
+     *
+     * @return string
+     */
+    public function getXMode()
+    {
+        return $this->xMode;
+    }
+
+    /**
+     * Set X-Mode
+     *
+     * @param X-Mode $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setXMode($value)
+    {
+        $this->xMode = $value;
+        return $this;
+    }
+
+    /**
+     * Get Y-Mode
+     *
+     * @return string
+     */
+    public function getYMode()
+    {
+        return $this->yMode;
+    }
+
+    /**
+     * Set Y-Mode
+     *
+     * @param Y-Mode $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setYMode($value)
+    {
+        $this->yMode = $value;
+        return $this;
+    }
+
+    /**
+     * Get X-Position
+     *
+     * @return number
+     */
+    public function getXPosition()
+    {
+        return $this->xPos;
+    }
+
+    /**
+     * Set X-Position
+     *
+     * @param X-Position $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setXPosition($value)
+    {
+        $this->xPos = $value;
+        return $this;
+    }
+
+    /**
+     * Get Y-Position
+     *
+     * @return number
+     */
+    public function getYPosition()
+    {
+        return $this->yPos;
+    }
+
+    /**
+     * Set Y-Position
+     *
+     * @param Y-Position $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setYPosition($value)
+    {
+        $this->yPos = $value;
+        return $this;
+    }
+
+    /**
+     * Get Width
+     *
+     * @return number
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set Width
+     *
+     * @param Width $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setWidth($value)
+    {
+        $this->width = $value;
+        return $this;
+    }
+
+    /**
+     * Get Height
+     *
+     * @return number
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set Height
+     *
+     * @param Height $value
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setHeight($value)
+    {
+        $this->height = $value;
+        return $this;
+    }
+
+
+    /**
+     * Get show legend key
+     *
+     * @return boolean
+     */
+    public function getShowLegendKey()
+    {
+        return $this->showLegendKey;
+    }
+
+    /**
+     * Set show legend key
+     * Specifies that legend keys should be shown in data labels.
+     *
+     * @param boolean $value        Show legend key
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowLegendKey($value)
+    {
+        $this->showLegendKey = $value;
+        return $this;
+    }
+
+    /**
+     * Get show value
+     *
+     * @return boolean
+     */
+    public function getShowVal()
+    {
+        return $this->showVal;
+    }
+
+    /**
+     * Set show val
+     * Specifies that the value should be shown in data labels.
+     *
+     * @param boolean $value        Show val
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowVal($value)
+    {
+        $this->showVal = $value;
+        return $this;
+    }
+
+    /**
+     * Get show category name
+     *
+     * @return boolean
+     */
+    public function getShowCatName()
+    {
+        return $this->showCatName;
+    }
+
+    /**
+     * Set show cat name
+     * Specifies that the category name should be shown in data labels.
+     *
+     * @param boolean $value        Show cat name
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowCatName($value)
+    {
+        $this->showCatName = $value;
+        return $this;
+    }
+
+    /**
+     * Get show data series name
+     *
+     * @return boolean
+     */
+    public function getShowSerName()
+    {
+        return $this->showSerName;
+    }
+
+    /**
+     * Set show ser name
+     * Specifies that the series name should be shown in data labels.
+     *
+     * @param boolean $value        Show series name
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowSerName($value)
+    {
+        $this->showSerName = $value;
+        return $this;
+    }
+
+    /**
+     * Get show percentage
+     *
+     * @return boolean
+     */
+    public function getShowPercent()
+    {
+        return $this->showPercent;
+    }
+
+    /**
+     * Set show percentage
+     * Specifies that the percentage should be shown in data labels.
+     *
+     * @param boolean $value        Show percentage
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowPercent($value)
+    {
+        $this->showPercent = $value;
+        return $this;
+    }
+
+    /**
+     * Get show bubble size
+     *
+     * @return boolean
+     */
+    public function getShowBubbleSize()
+    {
+        return $this->showBubbleSize;
+    }
+
+    /**
+     * Set show bubble size
+     * Specifies that the bubble size should be shown in data labels.
+     *
+     * @param boolean $value        Show bubble size
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowBubbleSize($value)
+    {
+        $this->showBubbleSize = $value;
+        return $this;
+    }
+
+    /**
+     * Get show leader lines
+     *
+     * @return boolean
+     */
+    public function getShowLeaderLines()
+    {
+        return $this->showLeaderLines;
+    }
+
+    /**
+     * Set show leader lines
+     * Specifies that leader lines should be shown in data labels.
+     *
+     * @param boolean $value        Show leader lines
+     * @return PHPExcel_Chart_Layout
+     */
+    public function setShowLeaderLines($value)
+    {
+        $this->showLeaderLines = $value;
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/Chart/Legend.php b/lib/PHPExcel/Chart/Legend.php
new file mode 100644
index 000000000..e850eb594
--- /dev/null
+++ b/lib/PHPExcel/Chart/Legend.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+ * PHPExcel_Chart_Legend
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart_Legend
+{
+    /** Legend positions */
+    const xlLegendPositionBottom = -4107;    //    Below the chart.
+    const xlLegendPositionCorner = 2;        //    In the upper right-hand corner of the chart border.
+    const xlLegendPositionCustom = -4161;    //    A custom position.
+    const xlLegendPositionLeft   = -4131;    //    Left of the chart.
+    const xlLegendPositionRight  = -4152;    //    Right of the chart.
+    const xlLegendPositionTop    = -4160;    //    Above the chart.
+
+    const POSITION_RIGHT    = 'r';
+    const POSITION_LEFT     = 'l';
+    const POSITION_BOTTOM   = 'b';
+    const POSITION_TOP      = 't';
+    const POSITION_TOPRIGHT = 'tr';
+
+    private static $positionXLref = array(
+        self::xlLegendPositionBottom => self::POSITION_BOTTOM,
+        self::xlLegendPositionCorner => self::POSITION_TOPRIGHT,
+        self::xlLegendPositionCustom => '??',
+        self::xlLegendPositionLeft   => self::POSITION_LEFT,
+        self::xlLegendPositionRight  => self::POSITION_RIGHT,
+        self::xlLegendPositionTop    => self::POSITION_TOP
+    );
+
+    /**
+     * Legend position
+     *
+     * @var    string
+     */
+    private $position = self::POSITION_RIGHT;
+
+    /**
+     * Allow overlay of other elements?
+     *
+     * @var    boolean
+     */
+    private $overlay = true;
+
+    /**
+     * Legend Layout
+     *
+     * @var    PHPExcel_Chart_Layout
+     */
+    private $layout = null;
+
+
+    /**
+     *    Create a new PHPExcel_Chart_Legend
+     */
+    public function __construct($position = self::POSITION_RIGHT, PHPExcel_Chart_Layout $layout = null, $overlay = false)
+    {
+        $this->setPosition($position);
+        $this->layout = $layout;
+        $this->setOverlay($overlay);
+    }
+
+    /**
+     * Get legend position as an excel string value
+     *
+     * @return    string
+     */
+    public function getPosition()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Get legend position using an excel string value
+     *
+     * @param    string    $position
+     */
+    public function setPosition($position = self::POSITION_RIGHT)
+    {
+        if (!in_array($position, self::$positionXLref)) {
+            return false;
+        }
+
+        $this->position = $position;
+        return true;
+    }
+
+    /**
+     * Get legend position as an Excel internal numeric value
+     *
+     * @return    number
+     */
+    public function getPositionXL()
+    {
+        return array_search($this->position, self::$positionXLref);
+    }
+
+    /**
+     * Set legend position using an Excel internal numeric value
+     *
+     * @param    number    $positionXL
+     */
+    public function setPositionXL($positionXL = self::xlLegendPositionRight)
+    {
+        if (!array_key_exists($positionXL, self::$positionXLref)) {
+            return false;
+        }
+
+        $this->position = self::$positionXLref[$positionXL];
+        return true;
+    }
+
+    /**
+     * Get allow overlay of other elements?
+     *
+     * @return    boolean
+     */
+    public function getOverlay()
+    {
+        return $this->overlay;
+    }
+
+    /**
+     * Set allow overlay of other elements?
+     *
+     * @param    boolean    $overlay
+     * @return    boolean
+     */
+    public function setOverlay($overlay = false)
+    {
+        if (!is_bool($overlay)) {
+            return false;
+        }
+
+        $this->overlay = $overlay;
+        return true;
+    }
+
+    /**
+     * Get Layout
+     *
+     * @return PHPExcel_Chart_Layout
+     */
+    public function getLayout()
+    {
+        return $this->layout;
+    }
+}
diff --git a/lib/PHPExcel/Chart/PlotArea.php b/lib/PHPExcel/Chart/PlotArea.php
new file mode 100644
index 000000000..551cc517b
--- /dev/null
+++ b/lib/PHPExcel/Chart/PlotArea.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * PHPExcel_Chart_PlotArea
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart_PlotArea
+{
+    /**
+     * PlotArea Layout
+     *
+     * @var PHPExcel_Chart_Layout
+     */
+    private $layout = null;
+
+    /**
+     * Plot Series
+     *
+     * @var array of PHPExcel_Chart_DataSeries
+     */
+    private $plotSeries = array();
+
+    /**
+     * Create a new PHPExcel_Chart_PlotArea
+     */
+    public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
+    {
+        $this->layout = $layout;
+        $this->plotSeries = $plotSeries;
+    }
+
+    /**
+     * Get Layout
+     *
+     * @return PHPExcel_Chart_Layout
+     */
+    public function getLayout()
+    {
+        return $this->layout;
+    }
+
+    /**
+     * Get Number of Plot Groups
+     *
+     * @return array of PHPExcel_Chart_DataSeries
+     */
+    public function getPlotGroupCount()
+    {
+        return count($this->plotSeries);
+    }
+
+    /**
+     * Get Number of Plot Series
+     *
+     * @return integer
+     */
+    public function getPlotSeriesCount()
+    {
+        $seriesCount = 0;
+        foreach ($this->plotSeries as $plot) {
+            $seriesCount += $plot->getPlotSeriesCount();
+        }
+        return $seriesCount;
+    }
+
+    /**
+     * Get Plot Series
+     *
+     * @return array of PHPExcel_Chart_DataSeries
+     */
+    public function getPlotGroup()
+    {
+        return $this->plotSeries;
+    }
+
+    /**
+     * Get Plot Series by Index
+     *
+     * @return PHPExcel_Chart_DataSeries
+     */
+    public function getPlotGroupByIndex($index)
+    {
+        return $this->plotSeries[$index];
+    }
+
+    /**
+     * Set Plot Series
+     *
+     * @param [PHPExcel_Chart_DataSeries]
+     * @return PHPExcel_Chart_PlotArea
+     */
+    public function setPlotSeries($plotSeries = array())
+    {
+        $this->plotSeries = $plotSeries;
+        
+        return $this;
+    }
+
+    public function refresh(PHPExcel_Worksheet $worksheet)
+    {
+        foreach ($this->plotSeries as $plotSeries) {
+            $plotSeries->refresh($worksheet);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Chart/Properties.php b/lib/PHPExcel/Chart/Properties.php
new file mode 100644
index 000000000..9bb6e9337
--- /dev/null
+++ b/lib/PHPExcel/Chart/Properties.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: nhw2h8s
+ * Date: 7/2/14
+ * Time: 5:45 PM
+ */
+
+abstract class PHPExcel_Chart_Properties
+{
+    const
+        EXCEL_COLOR_TYPE_STANDARD = 'prstClr',
+        EXCEL_COLOR_TYPE_SCHEME = 'schemeClr',
+        EXCEL_COLOR_TYPE_ARGB = 'srgbClr';
+
+    const
+        AXIS_LABELS_LOW = 'low',
+        AXIS_LABELS_HIGH = 'high',
+        AXIS_LABELS_NEXT_TO = 'nextTo',
+        AXIS_LABELS_NONE = 'none';
+
+    const
+        TICK_MARK_NONE = 'none',
+        TICK_MARK_INSIDE = 'in',
+        TICK_MARK_OUTSIDE = 'out',
+        TICK_MARK_CROSS = 'cross';
+
+    const
+        HORIZONTAL_CROSSES_AUTOZERO = 'autoZero',
+        HORIZONTAL_CROSSES_MAXIMUM = 'max';
+
+    const
+        FORMAT_CODE_GENERAL = 'General',
+        FORMAT_CODE_NUMBER = '#,##0.00',
+        FORMAT_CODE_CURRENCY = '$#,##0.00',
+        FORMAT_CODE_ACCOUNTING = '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)',
+        FORMAT_CODE_DATE = 'm/d/yyyy',
+        FORMAT_CODE_TIME = '[$-F400]h:mm:ss AM/PM',
+        FORMAT_CODE_PERCENTAGE = '0.00%',
+        FORMAT_CODE_FRACTION = '# ?/?',
+        FORMAT_CODE_SCIENTIFIC = '0.00E+00',
+        FORMAT_CODE_TEXT = '@',
+        FORMAT_CODE_SPECIAL = '00000';
+
+    const
+        ORIENTATION_NORMAL = 'minMax',
+        ORIENTATION_REVERSED = 'maxMin';
+
+    const
+        LINE_STYLE_COMPOUND_SIMPLE = 'sng',
+        LINE_STYLE_COMPOUND_DOUBLE = 'dbl',
+        LINE_STYLE_COMPOUND_THICKTHIN = 'thickThin',
+        LINE_STYLE_COMPOUND_THINTHICK = 'thinThick',
+        LINE_STYLE_COMPOUND_TRIPLE = 'tri',
+
+        LINE_STYLE_DASH_SOLID = 'solid',
+        LINE_STYLE_DASH_ROUND_DOT = 'sysDot',
+        LINE_STYLE_DASH_SQUERE_DOT = 'sysDash',
+        LINE_STYPE_DASH_DASH = 'dash',
+        LINE_STYLE_DASH_DASH_DOT = 'dashDot',
+        LINE_STYLE_DASH_LONG_DASH = 'lgDash',
+        LINE_STYLE_DASH_LONG_DASH_DOT = 'lgDashDot',
+        LINE_STYLE_DASH_LONG_DASH_DOT_DOT = 'lgDashDotDot',
+
+        LINE_STYLE_CAP_SQUARE = 'sq',
+        LINE_STYLE_CAP_ROUND = 'rnd',
+        LINE_STYLE_CAP_FLAT = 'flat',
+
+        LINE_STYLE_JOIN_ROUND = 'bevel',
+        LINE_STYLE_JOIN_MITER = 'miter',
+        LINE_STYLE_JOIN_BEVEL = 'bevel',
+
+        LINE_STYLE_ARROW_TYPE_NOARROW = null,
+        LINE_STYLE_ARROW_TYPE_ARROW = 'triangle',
+        LINE_STYLE_ARROW_TYPE_OPEN = 'arrow',
+        LINE_STYLE_ARROW_TYPE_STEALTH = 'stealth',
+        LINE_STYLE_ARROW_TYPE_DIAMOND = 'diamond',
+        LINE_STYLE_ARROW_TYPE_OVAL = 'oval',
+
+        LINE_STYLE_ARROW_SIZE_1 = 1,
+        LINE_STYLE_ARROW_SIZE_2 = 2,
+        LINE_STYLE_ARROW_SIZE_3 = 3,
+        LINE_STYLE_ARROW_SIZE_4 = 4,
+        LINE_STYLE_ARROW_SIZE_5 = 5,
+        LINE_STYLE_ARROW_SIZE_6 = 6,
+        LINE_STYLE_ARROW_SIZE_7 = 7,
+        LINE_STYLE_ARROW_SIZE_8 = 8,
+        LINE_STYLE_ARROW_SIZE_9 = 9;
+
+    const
+        SHADOW_PRESETS_NOSHADOW = null,
+        SHADOW_PRESETS_OUTER_BOTTTOM_RIGHT = 1,
+        SHADOW_PRESETS_OUTER_BOTTOM = 2,
+        SHADOW_PRESETS_OUTER_BOTTOM_LEFT = 3,
+        SHADOW_PRESETS_OUTER_RIGHT = 4,
+        SHADOW_PRESETS_OUTER_CENTER = 5,
+        SHADOW_PRESETS_OUTER_LEFT = 6,
+        SHADOW_PRESETS_OUTER_TOP_RIGHT = 7,
+        SHADOW_PRESETS_OUTER_TOP = 8,
+        SHADOW_PRESETS_OUTER_TOP_LEFT = 9,
+        SHADOW_PRESETS_INNER_BOTTTOM_RIGHT = 10,
+        SHADOW_PRESETS_INNER_BOTTOM = 11,
+        SHADOW_PRESETS_INNER_BOTTOM_LEFT = 12,
+        SHADOW_PRESETS_INNER_RIGHT = 13,
+        SHADOW_PRESETS_INNER_CENTER = 14,
+        SHADOW_PRESETS_INNER_LEFT = 15,
+        SHADOW_PRESETS_INNER_TOP_RIGHT = 16,
+        SHADOW_PRESETS_INNER_TOP = 17,
+        SHADOW_PRESETS_INNER_TOP_LEFT = 18,
+        SHADOW_PRESETS_PERSPECTIVE_BELOW = 19,
+        SHADOW_PRESETS_PERSPECTIVE_UPPER_RIGHT = 20,
+        SHADOW_PRESETS_PERSPECTIVE_UPPER_LEFT = 21,
+        SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22,
+        SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
+
+    protected function getExcelPointsWidth($width)
+    {
+        return $width * 12700;
+    }
+
+    protected function getExcelPointsAngle($angle)
+    {
+        return $angle * 60000;
+    }
+
+    protected function getTrueAlpha($alpha)
+    {
+        return (string) 100 - $alpha . '000';
+    }
+
+    protected function setColorProperties($color, $alpha, $type)
+    {
+        return array(
+            'type' => (string) $type,
+            'value' => (string) $color,
+            'alpha' => (string) $this->getTrueAlpha($alpha)
+        );
+    }
+
+    protected function getLineStyleArrowSize($array_selector, $array_kay_selector)
+    {
+        $sizes = array(
+            1 => array('w' => 'sm', 'len' => 'sm'),
+            2 => array('w' => 'sm', 'len' => 'med'),
+            3 => array('w' => 'sm', 'len' => 'lg'),
+            4 => array('w' => 'med', 'len' => 'sm'),
+            5 => array('w' => 'med', 'len' => 'med'),
+            6 => array('w' => 'med', 'len' => 'lg'),
+            7 => array('w' => 'lg', 'len' => 'sm'),
+            8 => array('w' => 'lg', 'len' => 'med'),
+            9 => array('w' => 'lg', 'len' => 'lg')
+        );
+
+        return $sizes[$array_selector][$array_kay_selector];
+    }
+
+    protected function getShadowPresetsMap($shadow_presets_option)
+    {
+        $presets_options = array(
+            //OUTER
+            1 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '2700000',
+                'algn' => 'tl',
+                'rotWithShape' => '0'
+            ),
+            2 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '5400000',
+                'algn' => 't',
+                'rotWithShape' => '0'
+            ),
+            3 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '8100000',
+                'algn' => 'tr',
+                'rotWithShape' => '0'
+            ),
+            4 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'algn' => 'l',
+                'rotWithShape' => '0'
+            ),
+            5 => array(
+                'effect' => 'outerShdw',
+                'size' => array(
+                    'sx' => '102000',
+                    'sy' => '102000'
+                )
+                ,
+                'blur' => '63500',
+                'distance' => '38100',
+                'algn' => 'ctr',
+                'rotWithShape' => '0'
+            ),
+            6 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '10800000',
+                'algn' => 'r',
+                'rotWithShape' => '0'
+            ),
+            7 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '18900000',
+                'algn' => 'bl',
+                'rotWithShape' => '0'
+            ),
+            8 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '16200000',
+                'rotWithShape' => '0'
+            ),
+            9 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '13500000',
+                'algn' => 'br',
+                'rotWithShape' => '0'
+            ),
+            //INNER
+            10 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '2700000',
+            ),
+            11 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '5400000',
+            ),
+            12 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '8100000',
+            ),
+            13 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+            ),
+            14 => array(
+                'effect' => 'innerShdw',
+                'blur' => '114300',
+            ),
+            15 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '10800000',
+            ),
+            16 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '18900000',
+            ),
+            17 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '16200000',
+            ),
+            18 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '13500000',
+            ),
+            //perspective
+            19 => array(
+                'effect' => 'outerShdw',
+                'blur' => '152400',
+                'distance' => '317500',
+                'size' => array(
+                    'sx' => '90000',
+                    'sy' => '-19000',
+                ),
+                'direction' => '5400000',
+                'rotWithShape' => '0',
+            ),
+            20 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'direction' => '18900000',
+                'size' => array(
+                    'sy' => '23000',
+                    'kx' => '-1200000',
+                ),
+                'algn' => 'bl',
+                'rotWithShape' => '0',
+            ),
+            21 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'direction' => '13500000',
+                'size' => array(
+                    'sy' => '23000',
+                    'kx' => '1200000',
+                ),
+                'algn' => 'br',
+                'rotWithShape' => '0',
+            ),
+            22 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'distance' => '12700',
+                'direction' => '2700000',
+                'size' => array(
+                    'sy' => '-23000',
+                    'kx' => '-800400',
+                ),
+                'algn' => 'bl',
+                'rotWithShape' => '0',
+            ),
+            23 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'distance' => '12700',
+                'direction' => '8100000',
+                'size' => array(
+                    'sy' => '-23000',
+                    'kx' => '800400',
+                ),
+                'algn' => 'br',
+                'rotWithShape' => '0',
+            ),
+        );
+
+        return $presets_options[$shadow_presets_option];
+    }
+
+    protected function getArrayElementsValue($properties, $elements)
+    {
+        $reference = & $properties;
+        if (!is_array($elements)) {
+            return $reference[$elements];
+        } else {
+            foreach ($elements as $keys) {
+                $reference = & $reference[$keys];
+            }
+            return $reference;
+        }
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/Chart/Renderer/PHP_Charting_Libraries.txt b/lib/PHPExcel/Chart/Renderer/PHP_Charting_Libraries.txt
new file mode 100644
index 000000000..9334f684e
--- /dev/null
+++ b/lib/PHPExcel/Chart/Renderer/PHP_Charting_Libraries.txt
@@ -0,0 +1,20 @@
+ChartDirector
+	http://www.advsofteng.com/cdphp.html
+
+GraPHPite
+	http://graphpite.sourceforge.net/
+
+JpGraph
+	http://www.aditus.nu/jpgraph/
+
+LibChart
+	http://naku.dohcrew.com/libchart/pages/introduction/
+
+pChart
+	http://pchart.sourceforge.net/
+
+TeeChart
+	http://www.steema.com/products/teechart/overview.html
+
+PHPGraphLib
+    http://www.ebrueggeman.com/phpgraphlib
\ No newline at end of file
diff --git a/lib/PHPExcel/Chart/Renderer/jpgraph.php b/lib/PHPExcel/Chart/Renderer/jpgraph.php
new file mode 100644
index 000000000..b3d7396f5
--- /dev/null
+++ b/lib/PHPExcel/Chart/Renderer/jpgraph.php
@@ -0,0 +1,883 @@
+<?php
+
+require_once(PHPExcel_Settings::getChartRendererPath().'/jpgraph.php');
+
+/**
+ * PHPExcel_Chart_Renderer_jpgraph
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart_Renderer
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart_Renderer_jpgraph
+{
+    private static $width    = 640;
+
+    private static $height    = 480;
+
+    private static $colourSet = array(
+        'mediumpurple1',    'palegreen3',     'gold1',          'cadetblue1',
+        'darkmagenta',      'coral',          'dodgerblue3',    'eggplant',
+        'mediumblue',       'magenta',        'sandybrown',     'cyan',
+        'firebrick1',       'forestgreen',    'deeppink4',      'darkolivegreen',
+        'goldenrod2'
+    );
+
+    private static $markSet = array(
+        'diamond'  => MARK_DIAMOND,
+        'square'   => MARK_SQUARE,
+        'triangle' => MARK_UTRIANGLE,
+        'x'        => MARK_X,
+        'star'     => MARK_STAR,
+        'dot'      => MARK_FILLEDCIRCLE,
+        'dash'     => MARK_DTRIANGLE,
+        'circle'   => MARK_CIRCLE,
+        'plus'     => MARK_CROSS
+    );
+
+
+    private $chart;
+
+    private $graph;
+
+    private static $plotColour = 0;
+
+    private static $plotMark = 0;
+
+
+    private function formatPointMarker($seriesPlot, $markerID)
+    {
+        $plotMarkKeys = array_keys(self::$markSet);
+        if (is_null($markerID)) {
+            //    Use default plot marker (next marker in the series)
+            self::$plotMark %= count(self::$markSet);
+            $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+        } elseif ($markerID !== 'none') {
+            //    Use specified plot marker (if it exists)
+            if (isset(self::$markSet[$markerID])) {
+                $seriesPlot->mark->SetType(self::$markSet[$markerID]);
+            } else {
+                //    If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
+                self::$plotMark %= count(self::$markSet);
+                $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+            }
+        } else {
+            //    Hide plot marker
+            $seriesPlot->mark->Hide();
+        }
+        $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+
+        return $seriesPlot;
+    }
+
+
+    private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
+    {
+        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
+        if (!is_null($datasetLabelFormatCode)) {
+            //    Retrieve any label formatting code
+            $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
+        }
+
+        $testCurrentIndex = 0;
+        foreach ($datasetLabels as $i => $datasetLabel) {
+            if (is_array($datasetLabel)) {
+                if ($rotation == 'bar') {
+                    $datasetLabels[$i] = implode(" ", $datasetLabel);
+                } else {
+                    $datasetLabel = array_reverse($datasetLabel);
+                    $datasetLabels[$i] = implode("\n", $datasetLabel);
+                }
+            } else {
+                //    Format labels according to any formatting code
+                if (!is_null($datasetLabelFormatCode)) {
+                    $datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
+                }
+            }
+            ++$testCurrentIndex;
+        }
+
+        return $datasetLabels;
+    }
+
+
+    private function percentageSumCalculation($groupID, $seriesCount)
+    {
+        //    Adjust our values to a percentage value across all series in the group
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            if ($i == 0) {
+                $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            } else {
+                $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+                foreach ($nextValues as $k => $value) {
+                    if (isset($sumValues[$k])) {
+                        $sumValues[$k] += $value;
+                    } else {
+                        $sumValues[$k] = $value;
+                    }
+                }
+            }
+        }
+
+        return $sumValues;
+    }
+
+
+    private function percentageAdjustValues($dataValues, $sumValues)
+    {
+        foreach ($dataValues as $k => $dataValue) {
+            $dataValues[$k] = $dataValue / $sumValues[$k] * 100;
+        }
+
+        return $dataValues;
+    }
+
+
+    private function getCaption($captionElement)
+    {
+        //    Read any caption
+        $caption = (!is_null($captionElement)) ? $captionElement->getCaption() : null;
+        //    Test if we have a title caption to display
+        if (!is_null($caption)) {
+            //    If we do, it could be a plain string or an array
+            if (is_array($caption)) {
+                //    Implode an array to a plain string
+                $caption = implode('', $caption);
+            }
+        }
+        return $caption;
+    }
+
+
+    private function renderTitle()
+    {
+        $title = $this->getCaption($this->chart->getTitle());
+        if (!is_null($title)) {
+            $this->graph->title->Set($title);
+        }
+    }
+
+
+    private function renderLegend()
+    {
+        $legend = $this->chart->getLegend();
+        if (!is_null($legend)) {
+            $legendPosition = $legend->getPosition();
+            $legendOverlay = $legend->getOverlay();
+            switch ($legendPosition) {
+                case 'r':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center');    //    right
+                    $this->graph->legend->SetColumns(1);
+                    break;
+                case 'l':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center');    //    left
+                    $this->graph->legend->SetColumns(1);
+                    break;
+                case 't':
+                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top');    //    top
+                    break;
+                case 'b':
+                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom');    //    bottom
+                    break;
+                default:
+                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top');    //    top-right
+                    $this->graph->legend->SetColumns(1);
+                    break;
+            }
+        } else {
+            $this->graph->legend->Hide();
+        }
+    }
+
+
+    private function renderCartesianPlotArea($type = 'textlin')
+    {
+        $this->graph = new Graph(self::$width, self::$height);
+        $this->graph->SetScale($type);
+
+        $this->renderTitle();
+
+        //    Rotate for bar rather than column chart
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
+        $reverse = ($rotation == 'bar') ? true : false;
+
+        $xAxisLabel = $this->chart->getXAxisLabel();
+        if (!is_null($xAxisLabel)) {
+            $title = $this->getCaption($xAxisLabel);
+            if (!is_null($title)) {
+                $this->graph->xaxis->SetTitle($title, 'center');
+                $this->graph->xaxis->title->SetMargin(35);
+                if ($reverse) {
+                    $this->graph->xaxis->title->SetAngle(90);
+                    $this->graph->xaxis->title->SetMargin(90);
+                }
+            }
+        }
+
+        $yAxisLabel = $this->chart->getYAxisLabel();
+        if (!is_null($yAxisLabel)) {
+            $title = $this->getCaption($yAxisLabel);
+            if (!is_null($title)) {
+                $this->graph->yaxis->SetTitle($title, 'center');
+                if ($reverse) {
+                    $this->graph->yaxis->title->SetAngle(0);
+                    $this->graph->yaxis->title->SetMargin(-55);
+                }
+            }
+        }
+    }
+
+
+    private function renderPiePlotArea($doughnut = false)
+    {
+        $this->graph = new PieGraph(self::$width, self::$height);
+
+        $this->renderTitle();
+    }
+
+
+    private function renderRadarPlotArea()
+    {
+        $this->graph = new RadarGraph(self::$width, self::$height);
+        $this->graph->SetScale('lin');
+
+        $this->renderTitle();
+    }
+
+
+    private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d')
+    {
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $labelCount = count($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = array();
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        }
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            $seriesPlot = new LinePlot($dataValues);
+            if ($combination) {
+                $seriesPlot->SetBarCenter();
+            }
+
+            if ($filled) {
+                $seriesPlot->SetFilled(true);
+                $seriesPlot->SetColor('black');
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            } else {
+                //    Set the appropriate plot marker
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $seriesPlot->SetLegend($dataLabel);
+
+            $seriesPlots[] = $seriesPlot;
+        }
+
+        if ($grouping == 'standard') {
+            $groupPlot = $seriesPlots;
+        } else {
+            $groupPlot = new AccLinePlot($seriesPlots);
+        }
+        $this->graph->Add($groupPlot);
+    }
+
+
+    private function renderPlotBar($groupID, $dimensions = '2d')
+    {
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
+        //    Rotate for bar rather than column chart
+        if (($groupID == 0) && ($rotation == 'bar')) {
+            $this->graph->Set90AndMargin();
+        }
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $labelCount = count($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
+            //    Rotate for bar rather than column chart
+            if ($rotation == 'bar') {
+                $datasetLabels = array_reverse($datasetLabels);
+                $this->graph->yaxis->SetPos('max');
+                $this->graph->yaxis->SetLabelAlign('center', 'top');
+                $this->graph->yaxis->SetLabelSide(SIDE_RIGHT);
+            }
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = array();
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        }
+
+        //    Loop through each data series in turn
+        for ($j = 0; $j < $seriesCount; ++$j) {
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            //    Reverse the $dataValues order for bar rather than column chart
+            if ($rotation == 'bar') {
+                $dataValues = array_reverse($dataValues);
+            }
+            $seriesPlot = new BarPlot($dataValues);
+            $seriesPlot->SetColor('black');
+            $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            if ($dimensions == '3d') {
+                $seriesPlot->SetShadow();
+            }
+            if (!$this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
+                $dataLabel = '';
+            } else {
+                $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
+            }
+            $seriesPlot->SetLegend($dataLabel);
+
+            $seriesPlots[] = $seriesPlot;
+        }
+        //    Reverse the plot order for bar rather than column chart
+        if (($rotation == 'bar') && (!($grouping == 'percentStacked'))) {
+            $seriesPlots = array_reverse($seriesPlots);
+        }
+
+        if ($grouping == 'clustered') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } elseif ($grouping == 'standard') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } else {
+            $groupPlot = new AccBarPlot($seriesPlots);
+            if ($dimensions == '3d') {
+                $groupPlot->SetShadow();
+            }
+        }
+
+        $this->graph->Add($groupPlot);
+    }
+
+
+    private function renderPlotScatter($groupID, $bubble)
+    {
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+        $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = array();
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            foreach ($dataValuesY as $k => $dataValueY) {
+                $dataValuesY[$k] = $k;
+            }
+
+            $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
+            if ($scatterStyle == 'lineMarker') {
+                $seriesPlot->SetLinkPoints();
+                $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]);
+            } elseif ($scatterStyle == 'smoothMarker') {
+                $spline = new Spline($dataValuesY, $dataValuesX);
+                list($splineDataY, $splineDataX) = $spline->Get(count($dataValuesX) * self::$width / 20);
+                $lplot = new LinePlot($splineDataX, $splineDataY);
+                $lplot->SetColor(self::$colourSet[self::$plotColour]);
+
+                $this->graph->Add($lplot);
+            }
+
+            if ($bubble) {
+                $this->formatPointMarker($seriesPlot, 'dot');
+                $seriesPlot->mark->SetColor('black');
+                $seriesPlot->mark->SetSize($bubbleSize);
+            } else {
+                $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $seriesPlot->SetLegend($dataLabel);
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+
+    private function renderPlotRadar($groupID)
+    {
+        $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = array();
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+            $dataValues = array();
+            foreach ($dataValuesY as $k => $dataValueY) {
+                $dataValues[$k] = implode(' ', array_reverse($dataValueY));
+            }
+            $tmp = array_shift($dataValues);
+            $dataValues[] = $tmp;
+            $tmp = array_shift($dataValuesX);
+            $dataValuesX[] = $tmp;
+
+            $this->graph->SetTitles(array_reverse($dataValues));
+
+            $seriesPlot = new RadarPlot(array_reverse($dataValuesX));
+
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+            if ($radarStyle == 'filled') {
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
+            }
+            $this->formatPointMarker($seriesPlot, $marker);
+            $seriesPlot->SetLegend($dataLabel);
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+
+    private function renderPlotContour($groupID)
+    {
+        $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = array();
+
+        $dataValues = array();
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            $dataValues[$i] = $dataValuesX;
+        }
+        $seriesPlot = new ContourPlot($dataValues);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+
+    private function renderPlotStock($groupID)
+    {
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
+
+        $dataValues = array();
+        //    Loop through each data series in turn and build the plot arrays
+        foreach ($plotOrder as $i => $v) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
+            foreach ($dataValuesX as $j => $dataValueX) {
+                $dataValues[$plotOrder[$i]][$j] = $dataValueX;
+            }
+        }
+        if (empty($dataValues)) {
+            return;
+        }
+
+        $dataValuesPlot = array();
+        // Flatten the plot arrays to a single dimensional array to work with jpgraph
+        for ($j = 0; $j < count($dataValues[0]); ++$j) {
+            for ($i = 0; $i < $seriesCount; ++$i) {
+                $dataValuesPlot[] = $dataValues[$i][$j];
+            }
+        }
+
+        // Set the x-axis labels
+        $labelCount = count($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesPlot = new StockPlot($dataValuesPlot);
+        $seriesPlot->SetWidth(20);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+
+    private function renderAreaChart($groupCount, $dimensions = '2d')
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
+
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, true, false, $dimensions);
+        }
+    }
+
+
+    private function renderLineChart($groupCount, $dimensions = '2d')
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
+
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, false, false, $dimensions);
+        }
+    }
+
+
+    private function renderBarChart($groupCount, $dimensions = '2d')
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_bar.php');
+
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotBar($i, $dimensions);
+        }
+    }
+
+
+    private function renderScatterChart($groupCount)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_scatter.php');
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_regstat.php');
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
+
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, false);
+        }
+    }
+
+
+    private function renderBubbleChart($groupCount)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_scatter.php');
+
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, true);
+        }
+    }
+
+
+    private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_pie.php');
+        if ($dimensions == '3d') {
+            require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_pie3d.php');
+        }
+
+        $this->renderPiePlotArea($doughnut);
+
+        $iLimit = ($multiplePlots) ? $groupCount : 1;
+        for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
+            $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+            $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+            if ($groupID == 0) {
+                $labelCount = count($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+                if ($labelCount > 0) {
+                    $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+                }
+            }
+
+            $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+            $seriesPlots = array();
+            //    For pie charts, we only display the first series: doughnut charts generally display all series
+            $jLimit = ($multiplePlots) ? $seriesCount : 1;
+            //    Loop through each data series in turn
+            for ($j = 0; $j < $jLimit; ++$j) {
+                $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+
+                //    Fill in any missing values in the $dataValues array
+                $testCurrentIndex = 0;
+                foreach ($dataValues as $k => $dataValue) {
+                    while ($k != $testCurrentIndex) {
+                        $dataValues[$testCurrentIndex] = null;
+                        ++$testCurrentIndex;
+                    }
+                    ++$testCurrentIndex;
+                }
+
+                if ($dimensions == '3d') {
+                    $seriesPlot = new PiePlot3D($dataValues);
+                } else {
+                    if ($doughnut) {
+                        $seriesPlot = new PiePlotC($dataValues);
+                    } else {
+                        $seriesPlot = new PiePlot($dataValues);
+                    }
+                }
+
+                if ($multiplePlots) {
+                    $seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+                }
+
+                if ($doughnut) {
+                    $seriesPlot->SetMidColor('white');
+                }
+
+                $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+                if (count($datasetLabels) > 0) {
+                    $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
+                }
+                if ($dimensions != '3d') {
+                    $seriesPlot->SetGuideLines(false);
+                }
+                if ($j == 0) {
+                    if ($exploded) {
+                        $seriesPlot->ExplodeAll();
+                    }
+                    $seriesPlot->SetLegends($datasetLabels);
+                }
+
+                $this->graph->Add($seriesPlot);
+            }
+        }
+    }
+
+
+    private function renderRadarChart($groupCount)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_radar.php');
+
+        $this->renderRadarPlotArea();
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotRadar($groupID);
+        }
+    }
+
+
+    private function renderStockChart($groupCount)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_stock.php');
+
+        $this->renderCartesianPlotArea('intint');
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotStock($groupID);
+        }
+    }
+
+
+    private function renderContourChart($groupCount, $dimensions)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_contour.php');
+
+        $this->renderCartesianPlotArea('intint');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotContour($i);
+        }
+    }
+
+
+    private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
+    {
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_bar.php');
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_scatter.php');
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_regstat.php');
+        require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
+
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $dimensions = null;
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            switch ($chartType) {
+                case 'area3DChart':
+                    $dimensions = '3d';
+                    // no break
+                case 'areaChart':
+                    $this->renderPlotLine($i, true, true, $dimensions);
+                    break;
+                case 'bar3DChart':
+                    $dimensions = '3d';
+                    // no break
+                case 'barChart':
+                    $this->renderPlotBar($i, $dimensions);
+                    break;
+                case 'line3DChart':
+                    $dimensions = '3d';
+                    // no break
+                case 'lineChart':
+                    $this->renderPlotLine($i, false, true, $dimensions);
+                    break;
+                case 'scatterChart':
+                    $this->renderPlotScatter($i, false);
+                    break;
+                case 'bubbleChart':
+                    $this->renderPlotScatter($i, true);
+                    break;
+                default:
+                    $this->graph = null;
+                    return false;
+            }
+        }
+
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+        return true;
+    }
+
+
+    public function render($outputDestination)
+    {
+        self::$plotColour = 0;
+
+        $groupCount = $this->chart->getPlotArea()->getPlotGroupCount();
+
+        $dimensions = null;
+        if ($groupCount == 1) {
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+        } else {
+            $chartTypes = array();
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            }
+            $chartTypes = array_unique($chartTypes);
+            if (count($chartTypes) == 1) {
+                $chartType = array_pop($chartTypes);
+            } elseif (count($chartTypes) == 0) {
+                echo 'Chart is not yet implemented<br />';
+                return false;
+            } else {
+                return $this->renderCombinationChart($groupCount, $dimensions, $outputDestination);
+            }
+        }
+
+        switch ($chartType) {
+            case 'area3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'areaChart':
+                $this->renderAreaChart($groupCount, $dimensions);
+                break;
+            case 'bar3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'barChart':
+                $this->renderBarChart($groupCount, $dimensions);
+                break;
+            case 'line3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'lineChart':
+                $this->renderLineChart($groupCount, $dimensions);
+                break;
+            case 'pie3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'pieChart':
+                $this->renderPieChart($groupCount, $dimensions, false, false);
+                break;
+            case 'doughnut3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'doughnutChart':
+                $this->renderPieChart($groupCount, $dimensions, true, true);
+                break;
+            case 'scatterChart':
+                $this->renderScatterChart($groupCount);
+                break;
+            case 'bubbleChart':
+                $this->renderBubbleChart($groupCount);
+                break;
+            case 'radarChart':
+                $this->renderRadarChart($groupCount);
+                break;
+            case 'surface3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'surfaceChart':
+                $this->renderContourChart($groupCount, $dimensions);
+                break;
+            case 'stockChart':
+                $this->renderStockChart($groupCount, $dimensions);
+                break;
+            default:
+                echo $chartType.' is not yet implemented<br />';
+                return false;
+        }
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+        return true;
+    }
+
+
+    /**
+     * Create a new PHPExcel_Chart_Renderer_jpgraph
+     */
+    public function __construct(PHPExcel_Chart $chart)
+    {
+        $this->graph    = null;
+        $this->chart    = $chart;
+    }
+}
diff --git a/lib/PHPExcel/Chart/Title.php b/lib/PHPExcel/Chart/Title.php
new file mode 100644
index 000000000..d8dc14f2b
--- /dev/null
+++ b/lib/PHPExcel/Chart/Title.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * PHPExcel_Chart_Title
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Chart
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Chart_Title
+{
+
+    /**
+     * Title Caption
+     *
+     * @var string
+     */
+    private $caption = null;
+
+    /**
+     * Title Layout
+     *
+     * @var PHPExcel_Chart_Layout
+     */
+    private $layout = null;
+
+    /**
+     * Create a new PHPExcel_Chart_Title
+     */
+    public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
+    {
+        $this->caption = $caption;
+        $this->layout = $layout;
+    }
+
+    /**
+     * Get caption
+     *
+     * @return string
+     */
+    public function getCaption()
+    {
+        return $this->caption;
+    }
+
+    /**
+     * Set caption
+     *
+     * @param string $caption
+     * @return PHPExcel_Chart_Title
+     */
+    public function setCaption($caption = null)
+    {
+        $this->caption = $caption;
+        
+        return $this;
+    }
+
+    /**
+     * Get Layout
+     *
+     * @return PHPExcel_Chart_Layout
+     */
+    public function getLayout()
+    {
+        return $this->layout;
+    }
+}
diff --git a/lib/PHPExcel/Comment.php b/lib/PHPExcel/Comment.php
new file mode 100644
index 000000000..d55363fd5
--- /dev/null
+++ b/lib/PHPExcel/Comment.php
@@ -0,0 +1,338 @@
+<?php
+
+/**
+ * PHPExcel_Comment
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Comment implements PHPExcel_IComparable
+{
+    /**
+     * Author
+     *
+     * @var string
+     */
+    private $author;
+
+    /**
+     * Rich text comment
+     *
+     * @var PHPExcel_RichText
+     */
+    private $text;
+
+    /**
+     * Comment width (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $width = '96pt';
+
+    /**
+     * Left margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $marginLeft = '59.25pt';
+
+    /**
+     * Top margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $marginTop = '1.5pt';
+
+    /**
+     * Visible
+     *
+     * @var boolean
+     */
+    private $visible = false;
+
+    /**
+     * Comment height (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $height = '55.5pt';
+
+    /**
+     * Comment fill color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    private $fillColor;
+
+    /**
+     * Alignment
+     *
+     * @var string
+     */
+    private $alignment;
+
+    /**
+     * Create a new PHPExcel_Comment
+     *
+     * @throws PHPExcel_Exception
+     */
+    public function __construct()
+    {
+        // Initialise variables
+        $this->author    = 'Author';
+        $this->text      = new PHPExcel_RichText();
+        $this->fillColor = new PHPExcel_Style_Color('FFFFFFE1');
+        $this->alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+    }
+
+    /**
+     * Get Author
+     *
+     * @return string
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * Set Author
+     *
+     * @param string $pValue
+     * @return PHPExcel_Comment
+     */
+    public function setAuthor($pValue = '')
+    {
+        $this->author = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Rich text comment
+     *
+     * @return PHPExcel_RichText
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set Rich text comment
+     *
+     * @param PHPExcel_RichText $pValue
+     * @return PHPExcel_Comment
+     */
+    public function setText(PHPExcel_RichText $pValue)
+    {
+        $this->text = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get comment width (CSS style, i.e. XXpx or YYpt)
+     *
+     * @return string
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set comment width (CSS style, i.e. XXpx or YYpt)
+     *
+     * @param string $value
+     * @return PHPExcel_Comment
+     */
+    public function setWidth($value = '96pt')
+    {
+        $this->width = $value;
+        return $this;
+    }
+
+    /**
+     * Get comment height (CSS style, i.e. XXpx or YYpt)
+     *
+     * @return string
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set comment height (CSS style, i.e. XXpx or YYpt)
+     *
+     * @param string $value
+     * @return PHPExcel_Comment
+     */
+    public function setHeight($value = '55.5pt')
+    {
+        $this->height = $value;
+        return $this;
+    }
+
+    /**
+     * Get left margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @return string
+     */
+    public function getMarginLeft()
+    {
+        return $this->marginLeft;
+    }
+
+    /**
+     * Set left margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @param string $value
+     * @return PHPExcel_Comment
+     */
+    public function setMarginLeft($value = '59.25pt')
+    {
+        $this->marginLeft = $value;
+        return $this;
+    }
+
+    /**
+     * Get top margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @return string
+     */
+    public function getMarginTop()
+    {
+        return $this->marginTop;
+    }
+
+    /**
+     * Set top margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @param string $value
+     * @return PHPExcel_Comment
+     */
+    public function setMarginTop($value = '1.5pt')
+    {
+        $this->marginTop = $value;
+        return $this;
+    }
+
+    /**
+     * Is the comment visible by default?
+     *
+     * @return boolean
+     */
+    public function getVisible()
+    {
+        return $this->visible;
+    }
+
+    /**
+     * Set comment default visibility
+     *
+     * @param boolean $value
+     * @return PHPExcel_Comment
+     */
+    public function setVisible($value = false)
+    {
+        $this->visible = $value;
+        return $this;
+    }
+
+    /**
+     * Get fill color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getFillColor()
+    {
+        return $this->fillColor;
+    }
+
+    /**
+     * Set Alignment
+     *
+     * @param string $pValue
+     * @return PHPExcel_Comment
+     */
+    public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL)
+    {
+        $this->alignment = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Alignment
+     *
+     * @return string
+     */
+    public function getAlignment()
+    {
+        return $this->alignment;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->author .
+            $this->text->getHashCode() .
+            $this->width .
+            $this->height .
+            $this->marginLeft .
+            $this->marginTop .
+            ($this->visible ? 1 : 0) .
+            $this->fillColor->getHashCode() .
+            $this->alignment .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    /**
+     * Convert to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->text->getPlainText();
+    }
+}
diff --git a/lib/PHPExcel/DocumentProperties.php b/lib/PHPExcel/DocumentProperties.php
new file mode 100644
index 000000000..2395ba987
--- /dev/null
+++ b/lib/PHPExcel/DocumentProperties.php
@@ -0,0 +1,611 @@
+<?php
+
+/**
+ * PHPExcel_DocumentProperties
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package    PHPExcel
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_DocumentProperties
+{
+    /** constants */
+    const PROPERTY_TYPE_BOOLEAN = 'b';
+    const PROPERTY_TYPE_INTEGER = 'i';
+    const PROPERTY_TYPE_FLOAT   = 'f';
+    const PROPERTY_TYPE_DATE    = 'd';
+    const PROPERTY_TYPE_STRING  = 's';
+    const PROPERTY_TYPE_UNKNOWN = 'u';
+
+    /**
+     * Creator
+     *
+     * @var string
+     */
+    private $creator = 'Unknown Creator';
+
+    /**
+     * LastModifiedBy
+     *
+     * @var string
+     */
+    private $lastModifiedBy;
+
+    /**
+     * Created
+     *
+     * @var datetime
+     */
+    private $created;
+
+    /**
+     * Modified
+     *
+     * @var datetime
+     */
+    private $modified;
+
+    /**
+     * Title
+     *
+     * @var string
+     */
+    private $title = 'Untitled Spreadsheet';
+
+    /**
+     * Description
+     *
+     * @var string
+     */
+    private $description = '';
+
+    /**
+     * Subject
+     *
+     * @var string
+     */
+    private $subject = '';
+
+    /**
+     * Keywords
+     *
+     * @var string
+     */
+    private $keywords = '';
+
+    /**
+     * Category
+     *
+     * @var string
+     */
+    private $category = '';
+
+    /**
+     * Manager
+     *
+     * @var string
+     */
+    private $manager = '';
+
+    /**
+     * Company
+     *
+     * @var string
+     */
+    private $company = 'Microsoft Corporation';
+
+    /**
+     * Custom Properties
+     *
+     * @var string
+     */
+    private $customProperties = array();
+
+
+    /**
+     * Create a new PHPExcel_DocumentProperties
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->lastModifiedBy = $this->creator;
+        $this->created  = time();
+        $this->modified = time();
+    }
+
+    /**
+     * Get Creator
+     *
+     * @return string
+     */
+    public function getCreator()
+    {
+        return $this->creator;
+    }
+
+    /**
+     * Set Creator
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCreator($pValue = '')
+    {
+        $this->creator = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Last Modified By
+     *
+     * @return string
+     */
+    public function getLastModifiedBy()
+    {
+        return $this->lastModifiedBy;
+    }
+
+    /**
+     * Set Last Modified By
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setLastModifiedBy($pValue = '')
+    {
+        $this->lastModifiedBy = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Created
+     *
+     * @return datetime
+     */
+    public function getCreated()
+    {
+        return $this->created;
+    }
+
+    /**
+     * Set Created
+     *
+     * @param datetime $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCreated($pValue = null)
+    {
+        if ($pValue === null) {
+            $pValue = time();
+        } elseif (is_string($pValue)) {
+            if (is_numeric($pValue)) {
+                $pValue = intval($pValue);
+            } else {
+                $pValue = strtotime($pValue);
+            }
+        }
+
+        $this->created = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Modified
+     *
+     * @return datetime
+     */
+    public function getModified()
+    {
+        return $this->modified;
+    }
+
+    /**
+     * Set Modified
+     *
+     * @param datetime $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setModified($pValue = null)
+    {
+        if ($pValue === null) {
+            $pValue = time();
+        } elseif (is_string($pValue)) {
+            if (is_numeric($pValue)) {
+                $pValue = intval($pValue);
+            } else {
+                $pValue = strtotime($pValue);
+            }
+        }
+
+        $this->modified = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Title
+     *
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set Title
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setTitle($pValue = '')
+    {
+        $this->title = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Set Description
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setDescription($pValue = '')
+    {
+        $this->description = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Subject
+     *
+     * @return string
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
+    /**
+     * Set Subject
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setSubject($pValue = '')
+    {
+        $this->subject = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Keywords
+     *
+     * @return string
+     */
+    public function getKeywords()
+    {
+        return $this->keywords;
+    }
+
+    /**
+     * Set Keywords
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setKeywords($pValue = '')
+    {
+        $this->keywords = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Category
+     *
+     * @return string
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * Set Category
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCategory($pValue = '')
+    {
+        $this->category = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Company
+     *
+     * @return string
+     */
+    public function getCompany()
+    {
+        return $this->company;
+    }
+
+    /**
+     * Set Company
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCompany($pValue = '')
+    {
+        $this->company = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Manager
+     *
+     * @return string
+     */
+    public function getManager()
+    {
+        return $this->manager;
+    }
+
+    /**
+     * Set Manager
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setManager($pValue = '')
+    {
+        $this->manager = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get a List of Custom Property Names
+     *
+     * @return array of string
+     */
+    public function getCustomProperties()
+    {
+        return array_keys($this->customProperties);
+    }
+
+    /**
+     * Check if a Custom Property is defined
+     *
+     * @param string $propertyName
+     * @return boolean
+     */
+    public function isCustomPropertySet($propertyName)
+    {
+        return isset($this->customProperties[$propertyName]);
+    }
+
+    /**
+     * Get a Custom Property Value
+     *
+     * @param string $propertyName
+     * @return string
+     */
+    public function getCustomPropertyValue($propertyName)
+    {
+        if (isset($this->customProperties[$propertyName])) {
+            return $this->customProperties[$propertyName]['value'];
+        }
+
+    }
+
+    /**
+     * Get a Custom Property Type
+     *
+     * @param string $propertyName
+     * @return string
+     */
+    public function getCustomPropertyType($propertyName)
+    {
+        if (isset($this->customProperties[$propertyName])) {
+            return $this->customProperties[$propertyName]['type'];
+        }
+
+    }
+
+    /**
+     * Set a Custom Property
+     *
+     * @param string $propertyName
+     * @param mixed $propertyValue
+     * @param string $propertyType
+     *      'i'    : Integer
+     *   'f' : Floating Point
+     *   's' : String
+     *   'd' : Date/Time
+     *   'b' : Boolean
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCustomProperty($propertyName, $propertyValue = '', $propertyType = null)
+    {
+        if (($propertyType === null) || (!in_array($propertyType, array(self::PROPERTY_TYPE_INTEGER,
+                                                                        self::PROPERTY_TYPE_FLOAT,
+                                                                        self::PROPERTY_TYPE_STRING,
+                                                                        self::PROPERTY_TYPE_DATE,
+                                                                        self::PROPERTY_TYPE_BOOLEAN)))) {
+            if ($propertyValue === null) {
+                $propertyType = self::PROPERTY_TYPE_STRING;
+            } elseif (is_float($propertyValue)) {
+                $propertyType = self::PROPERTY_TYPE_FLOAT;
+            } elseif (is_int($propertyValue)) {
+                $propertyType = self::PROPERTY_TYPE_INTEGER;
+            } elseif (is_bool($propertyValue)) {
+                $propertyType = self::PROPERTY_TYPE_BOOLEAN;
+            } else {
+                $propertyType = self::PROPERTY_TYPE_STRING;
+            }
+        }
+
+        $this->customProperties[$propertyName] = array(
+            'value' => $propertyValue,
+            'type' => $propertyType
+        );
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    public static function convertProperty($propertyValue, $propertyType)
+    {
+        switch ($propertyType) {
+            case 'empty':     //    Empty
+                return '';
+                break;
+            case 'null':      //    Null
+                return null;
+                break;
+            case 'i1':        //    1-Byte Signed Integer
+            case 'i2':        //    2-Byte Signed Integer
+            case 'i4':        //    4-Byte Signed Integer
+            case 'i8':        //    8-Byte Signed Integer
+            case 'int':       //    Integer
+                return (int) $propertyValue;
+                break;
+            case 'ui1':       //    1-Byte Unsigned Integer
+            case 'ui2':       //    2-Byte Unsigned Integer
+            case 'ui4':       //    4-Byte Unsigned Integer
+            case 'ui8':       //    8-Byte Unsigned Integer
+            case 'uint':      //    Unsigned Integer
+                return abs((int) $propertyValue);
+                break;
+            case 'r4':        //    4-Byte Real Number
+            case 'r8':        //    8-Byte Real Number
+            case 'decimal':   //    Decimal
+                return (float) $propertyValue;
+                break;
+            case 'lpstr':     //    LPSTR
+            case 'lpwstr':    //    LPWSTR
+            case 'bstr':      //    Basic String
+                return $propertyValue;
+                break;
+            case 'date':      //    Date and Time
+            case 'filetime':  //    File Time
+                return strtotime($propertyValue);
+                break;
+            case 'bool':     //    Boolean
+                return ($propertyValue == 'true') ? true : false;
+                break;
+            case 'cy':       //    Currency
+            case 'error':    //    Error Status Code
+            case 'vector':   //    Vector
+            case 'array':    //    Array
+            case 'blob':     //    Binary Blob
+            case 'oblob':    //    Binary Blob Object
+            case 'stream':   //    Binary Stream
+            case 'ostream':  //    Binary Stream Object
+            case 'storage':  //    Binary Storage
+            case 'ostorage': //    Binary Storage Object
+            case 'vstream':  //    Binary Versioned Stream
+            case 'clsid':    //    Class ID
+            case 'cf':       //    Clipboard Data
+                return $propertyValue;
+                break;
+        }
+        return $propertyValue;
+    }
+
+    public static function convertPropertyType($propertyType)
+    {
+        switch ($propertyType) {
+            case 'i1':       //    1-Byte Signed Integer
+            case 'i2':       //    2-Byte Signed Integer
+            case 'i4':       //    4-Byte Signed Integer
+            case 'i8':       //    8-Byte Signed Integer
+            case 'int':      //    Integer
+            case 'ui1':      //    1-Byte Unsigned Integer
+            case 'ui2':      //    2-Byte Unsigned Integer
+            case 'ui4':      //    4-Byte Unsigned Integer
+            case 'ui8':      //    8-Byte Unsigned Integer
+            case 'uint':     //    Unsigned Integer
+                return self::PROPERTY_TYPE_INTEGER;
+                break;
+            case 'r4':       //    4-Byte Real Number
+            case 'r8':       //    8-Byte Real Number
+            case 'decimal':  //    Decimal
+                return self::PROPERTY_TYPE_FLOAT;
+                break;
+            case 'empty':    //    Empty
+            case 'null':     //    Null
+            case 'lpstr':    //    LPSTR
+            case 'lpwstr':   //    LPWSTR
+            case 'bstr':     //    Basic String
+                return self::PROPERTY_TYPE_STRING;
+                break;
+            case 'date':     //    Date and Time
+            case 'filetime': //    File Time
+                return self::PROPERTY_TYPE_DATE;
+                break;
+            case 'bool':     //    Boolean
+                return self::PROPERTY_TYPE_BOOLEAN;
+                break;
+            case 'cy':       //    Currency
+            case 'error':    //    Error Status Code
+            case 'vector':   //    Vector
+            case 'array':    //    Array
+            case 'blob':     //    Binary Blob
+            case 'oblob':    //    Binary Blob Object
+            case 'stream':   //    Binary Stream
+            case 'ostream':  //    Binary Stream Object
+            case 'storage':  //    Binary Storage
+            case 'ostorage': //    Binary Storage Object
+            case 'vstream':  //    Binary Versioned Stream
+            case 'clsid':    //    Class ID
+            case 'cf':       //    Clipboard Data
+                return self::PROPERTY_TYPE_UNKNOWN;
+                break;
+        }
+        return self::PROPERTY_TYPE_UNKNOWN;
+    }
+}
diff --git a/lib/PHPExcel/DocumentSecurity.php b/lib/PHPExcel/DocumentSecurity.php
new file mode 100644
index 000000000..ecea0da1f
--- /dev/null
+++ b/lib/PHPExcel/DocumentSecurity.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * PHPExcel_DocumentSecurity
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_DocumentSecurity
+{
+    /**
+     * LockRevision
+     *
+     * @var boolean
+     */
+    private $lockRevision;
+
+    /**
+     * LockStructure
+     *
+     * @var boolean
+     */
+    private $lockStructure;
+
+    /**
+     * LockWindows
+     *
+     * @var boolean
+     */
+    private $lockWindows;
+
+    /**
+     * RevisionsPassword
+     *
+     * @var string
+     */
+    private $revisionsPassword;
+
+    /**
+     * WorkbookPassword
+     *
+     * @var string
+     */
+    private $workbookPassword;
+
+    /**
+     * Create a new PHPExcel_DocumentSecurity
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->lockRevision      = false;
+        $this->lockStructure     = false;
+        $this->lockWindows       = false;
+        $this->revisionsPassword = '';
+        $this->workbookPassword  = '';
+    }
+
+    /**
+     * Is some sort of document security enabled?
+     *
+     * @return boolean
+     */
+    public function isSecurityEnabled()
+    {
+        return  $this->lockRevision ||
+                $this->lockStructure ||
+                $this->lockWindows;
+    }
+
+    /**
+     * Get LockRevision
+     *
+     * @return boolean
+     */
+    public function getLockRevision()
+    {
+        return $this->lockRevision;
+    }
+
+    /**
+     * Set LockRevision
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_DocumentSecurity
+     */
+    public function setLockRevision($pValue = false)
+    {
+        $this->lockRevision = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get LockStructure
+     *
+     * @return boolean
+     */
+    public function getLockStructure()
+    {
+        return $this->lockStructure;
+    }
+
+    /**
+     * Set LockStructure
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_DocumentSecurity
+     */
+    public function setLockStructure($pValue = false)
+    {
+        $this->lockStructure = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get LockWindows
+     *
+     * @return boolean
+     */
+    public function getLockWindows()
+    {
+        return $this->lockWindows;
+    }
+
+    /**
+     * Set LockWindows
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_DocumentSecurity
+     */
+    public function setLockWindows($pValue = false)
+    {
+        $this->lockWindows = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get RevisionsPassword (hashed)
+     *
+     * @return string
+     */
+    public function getRevisionsPassword()
+    {
+        return $this->revisionsPassword;
+    }
+
+    /**
+     * Set RevisionsPassword
+     *
+     * @param string     $pValue
+     * @param boolean     $pAlreadyHashed If the password has already been hashed, set this to true
+     * @return PHPExcel_DocumentSecurity
+     */
+    public function setRevisionsPassword($pValue = '', $pAlreadyHashed = false)
+    {
+        if (!$pAlreadyHashed) {
+            $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
+        }
+        $this->revisionsPassword = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get WorkbookPassword (hashed)
+     *
+     * @return string
+     */
+    public function getWorkbookPassword()
+    {
+        return $this->workbookPassword;
+    }
+
+    /**
+     * Set WorkbookPassword
+     *
+     * @param string     $pValue
+     * @param boolean     $pAlreadyHashed If the password has already been hashed, set this to true
+     * @return PHPExcel_DocumentSecurity
+     */
+    public function setWorkbookPassword($pValue = '', $pAlreadyHashed = false)
+    {
+        if (!$pAlreadyHashed) {
+            $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
+        }
+        $this->workbookPassword = $pValue;
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Exception.php b/lib/PHPExcel/Exception.php
new file mode 100644
index 000000000..b27750ea2
--- /dev/null
+++ b/lib/PHPExcel/Exception.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Exception
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Exception extends Exception
+{
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
+}
diff --git a/lib/PHPExcel/HashTable.php b/lib/PHPExcel/HashTable.php
new file mode 100644
index 000000000..c21d18c3a
--- /dev/null
+++ b/lib/PHPExcel/HashTable.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * PHPExcel_HashTable
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_HashTable
+{
+    /**
+     * HashTable elements
+     *
+     * @var array
+     */
+    protected $items = array();
+
+    /**
+     * HashTable key map
+     *
+     * @var array
+     */
+    protected $keyMap = array();
+
+    /**
+     * Create a new PHPExcel_HashTable
+     *
+     * @param    PHPExcel_IComparable[] $pSource    Optional source array to create HashTable from
+     * @throws    PHPExcel_Exception
+     */
+    public function __construct($pSource = null)
+    {
+        if ($pSource !== null) {
+            // Create HashTable
+            $this->addFromSource($pSource);
+        }
+    }
+
+    /**
+     * Add HashTable items from source
+     *
+     * @param    PHPExcel_IComparable[] $pSource    Source array to create HashTable from
+     * @throws    PHPExcel_Exception
+     */
+    public function addFromSource($pSource = null)
+    {
+        // Check if an array was passed
+        if ($pSource == null) {
+            return;
+        } elseif (!is_array($pSource)) {
+            throw new PHPExcel_Exception('Invalid array parameter passed.');
+        }
+
+        foreach ($pSource as $item) {
+            $this->add($item);
+        }
+    }
+
+    /**
+     * Add HashTable item
+     *
+     * @param    PHPExcel_IComparable $pSource    Item to add
+     * @throws    PHPExcel_Exception
+     */
+    public function add(PHPExcel_IComparable $pSource = null)
+    {
+        $hash = $pSource->getHashCode();
+        if (!isset($this->items[$hash])) {
+            $this->items[$hash] = $pSource;
+            $this->keyMap[count($this->items) - 1] = $hash;
+        }
+    }
+
+    /**
+     * Remove HashTable item
+     *
+     * @param    PHPExcel_IComparable $pSource    Item to remove
+     * @throws    PHPExcel_Exception
+     */
+    public function remove(PHPExcel_IComparable $pSource = null)
+    {
+        $hash = $pSource->getHashCode();
+        if (isset($this->items[$hash])) {
+            unset($this->items[$hash]);
+
+            $deleteKey = -1;
+            foreach ($this->keyMap as $key => $value) {
+                if ($deleteKey >= 0) {
+                    $this->keyMap[$key - 1] = $value;
+                }
+
+                if ($value == $hash) {
+                    $deleteKey = $key;
+                }
+            }
+            unset($this->keyMap[count($this->keyMap) - 1]);
+        }
+    }
+
+    /**
+     * Clear HashTable
+     *
+     */
+    public function clear()
+    {
+        $this->items = array();
+        $this->keyMap = array();
+    }
+
+    /**
+     * Count
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->items);
+    }
+
+    /**
+     * Get index for hash code
+     *
+     * @param    string    $pHashCode
+     * @return    int    Index
+     */
+    public function getIndexForHashCode($pHashCode = '')
+    {
+        return array_search($pHashCode, $this->keyMap);
+    }
+
+    /**
+     * Get by index
+     *
+     * @param    int    $pIndex
+     * @return    PHPExcel_IComparable
+     *
+     */
+    public function getByIndex($pIndex = 0)
+    {
+        if (isset($this->keyMap[$pIndex])) {
+            return $this->getByHashCode($this->keyMap[$pIndex]);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get by hashcode
+     *
+     * @param    string    $pHashCode
+     * @return    PHPExcel_IComparable
+     *
+     */
+    public function getByHashCode($pHashCode = '')
+    {
+        if (isset($this->items[$pHashCode])) {
+            return $this->items[$pHashCode];
+        }
+
+        return null;
+    }
+
+    /**
+     * HashTable to array
+     *
+     * @return PHPExcel_IComparable[]
+     */
+    public function toArray()
+    {
+        return $this->items;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Helper/HTML.php b/lib/PHPExcel/Helper/HTML.php
new file mode 100644
index 000000000..a78f11c1f
--- /dev/null
+++ b/lib/PHPExcel/Helper/HTML.php
@@ -0,0 +1,808 @@
+<?php
+
+class PHPExcel_Helper_HTML
+{
+    protected static $colourMap = array(
+        'aliceblue' => 'f0f8ff',
+        'antiquewhite' => 'faebd7',
+        'antiquewhite1' => 'ffefdb',
+        'antiquewhite2' => 'eedfcc',
+        'antiquewhite3' => 'cdc0b0',
+        'antiquewhite4' => '8b8378',
+        'aqua' => '00ffff',
+        'aquamarine1' => '7fffd4',
+        'aquamarine2' => '76eec6',
+        'aquamarine4' => '458b74',
+        'azure1' => 'f0ffff',
+        'azure2' => 'e0eeee',
+        'azure3' => 'c1cdcd',
+        'azure4' => '838b8b',
+        'beige' => 'f5f5dc',
+        'bisque1' => 'ffe4c4',
+        'bisque2' => 'eed5b7',
+        'bisque3' => 'cdb79e',
+        'bisque4' => '8b7d6b',
+        'black' => '000000',
+        'blanchedalmond' => 'ffebcd',
+        'blue' => '0000ff',
+        'blue1' => '0000ff',
+        'blue2' => '0000ee',
+        'blue4' => '00008b',
+        'blueviolet' => '8a2be2',
+        'brown' => 'a52a2a',
+        'brown1' => 'ff4040',
+        'brown2' => 'ee3b3b',
+        'brown3' => 'cd3333',
+        'brown4' => '8b2323',
+        'burlywood' => 'deb887',
+        'burlywood1' => 'ffd39b',
+        'burlywood2' => 'eec591',
+        'burlywood3' => 'cdaa7d',
+        'burlywood4' => '8b7355',
+        'cadetblue' => '5f9ea0',
+        'cadetblue1' => '98f5ff',
+        'cadetblue2' => '8ee5ee',
+        'cadetblue3' => '7ac5cd',
+        'cadetblue4' => '53868b',
+        'chartreuse1' => '7fff00',
+        'chartreuse2' => '76ee00',
+        'chartreuse3' => '66cd00',
+        'chartreuse4' => '458b00',
+        'chocolate' => 'd2691e',
+        'chocolate1' => 'ff7f24',
+        'chocolate2' => 'ee7621',
+        'chocolate3' => 'cd661d',
+        'coral' => 'ff7f50',
+        'coral1' => 'ff7256',
+        'coral2' => 'ee6a50',
+        'coral3' => 'cd5b45',
+        'coral4' => '8b3e2f',
+        'cornflowerblue' => '6495ed',
+        'cornsilk1' => 'fff8dc',
+        'cornsilk2' => 'eee8cd',
+        'cornsilk3' => 'cdc8b1',
+        'cornsilk4' => '8b8878',
+        'cyan1' => '00ffff',
+        'cyan2' => '00eeee',
+        'cyan3' => '00cdcd',
+        'cyan4' => '008b8b',
+        'darkgoldenrod' => 'b8860b',
+        'darkgoldenrod1' => 'ffb90f',
+        'darkgoldenrod2' => 'eead0e',
+        'darkgoldenrod3' => 'cd950c',
+        'darkgoldenrod4' => '8b6508',
+        'darkgreen' => '006400',
+        'darkkhaki' => 'bdb76b',
+        'darkolivegreen' => '556b2f',
+        'darkolivegreen1' => 'caff70',
+        'darkolivegreen2' => 'bcee68',
+        'darkolivegreen3' => 'a2cd5a',
+        'darkolivegreen4' => '6e8b3d',
+        'darkorange' => 'ff8c00',
+        'darkorange1' => 'ff7f00',
+        'darkorange2' => 'ee7600',
+        'darkorange3' => 'cd6600',
+        'darkorange4' => '8b4500',
+        'darkorchid' => '9932cc',
+        'darkorchid1' => 'bf3eff',
+        'darkorchid2' => 'b23aee',
+        'darkorchid3' => '9a32cd',
+        'darkorchid4' => '68228b',
+        'darksalmon' => 'e9967a',
+        'darkseagreen' => '8fbc8f',
+        'darkseagreen1' => 'c1ffc1',
+        'darkseagreen2' => 'b4eeb4',
+        'darkseagreen3' => '9bcd9b',
+        'darkseagreen4' => '698b69',
+        'darkslateblue' => '483d8b',
+        'darkslategray' => '2f4f4f',
+        'darkslategray1' => '97ffff',
+        'darkslategray2' => '8deeee',
+        'darkslategray3' => '79cdcd',
+        'darkslategray4' => '528b8b',
+        'darkturquoise' => '00ced1',
+        'darkviolet' => '9400d3',
+        'deeppink1' => 'ff1493',
+        'deeppink2' => 'ee1289',
+        'deeppink3' => 'cd1076',
+        'deeppink4' => '8b0a50',
+        'deepskyblue1' => '00bfff',
+        'deepskyblue2' => '00b2ee',
+        'deepskyblue3' => '009acd',
+        'deepskyblue4' => '00688b',
+        'dimgray' => '696969',
+        'dodgerblue1' => '1e90ff',
+        'dodgerblue2' => '1c86ee',
+        'dodgerblue3' => '1874cd',
+        'dodgerblue4' => '104e8b',
+        'firebrick' => 'b22222',
+        'firebrick1' => 'ff3030',
+        'firebrick2' => 'ee2c2c',
+        'firebrick3' => 'cd2626',
+        'firebrick4' => '8b1a1a',
+        'floralwhite' => 'fffaf0',
+        'forestgreen' => '228b22',
+        'fuchsia' => 'ff00ff',
+        'gainsboro' => 'dcdcdc',
+        'ghostwhite' => 'f8f8ff',
+        'gold1' => 'ffd700',
+        'gold2' => 'eec900',
+        'gold3' => 'cdad00',
+        'gold4' => '8b7500',
+        'goldenrod' => 'daa520',
+        'goldenrod1' => 'ffc125',
+        'goldenrod2' => 'eeb422',
+        'goldenrod3' => 'cd9b1d',
+        'goldenrod4' => '8b6914',
+        'gray' => 'bebebe',
+        'gray1' => '030303',
+        'gray10' => '1a1a1a',
+        'gray11' => '1c1c1c',
+        'gray12' => '1f1f1f',
+        'gray13' => '212121',
+        'gray14' => '242424',
+        'gray15' => '262626',
+        'gray16' => '292929',
+        'gray17' => '2b2b2b',
+        'gray18' => '2e2e2e',
+        'gray19' => '303030',
+        'gray2' => '050505',
+        'gray20' => '333333',
+        'gray21' => '363636',
+        'gray22' => '383838',
+        'gray23' => '3b3b3b',
+        'gray24' => '3d3d3d',
+        'gray25' => '404040',
+        'gray26' => '424242',
+        'gray27' => '454545',
+        'gray28' => '474747',
+        'gray29' => '4a4a4a',
+        'gray3' => '080808',
+        'gray30' => '4d4d4d',
+        'gray31' => '4f4f4f',
+        'gray32' => '525252',
+        'gray33' => '545454',
+        'gray34' => '575757',
+        'gray35' => '595959',
+        'gray36' => '5c5c5c',
+        'gray37' => '5e5e5e',
+        'gray38' => '616161',
+        'gray39' => '636363',
+        'gray4' => '0a0a0a',
+        'gray40' => '666666',
+        'gray41' => '696969',
+        'gray42' => '6b6b6b',
+        'gray43' => '6e6e6e',
+        'gray44' => '707070',
+        'gray45' => '737373',
+        'gray46' => '757575',
+        'gray47' => '787878',
+        'gray48' => '7a7a7a',
+        'gray49' => '7d7d7d',
+        'gray5' => '0d0d0d',
+        'gray50' => '7f7f7f',
+        'gray51' => '828282',
+        'gray52' => '858585',
+        'gray53' => '878787',
+        'gray54' => '8a8a8a',
+        'gray55' => '8c8c8c',
+        'gray56' => '8f8f8f',
+        'gray57' => '919191',
+        'gray58' => '949494',
+        'gray59' => '969696',
+        'gray6' => '0f0f0f',
+        'gray60' => '999999',
+        'gray61' => '9c9c9c',
+        'gray62' => '9e9e9e',
+        'gray63' => 'a1a1a1',
+        'gray64' => 'a3a3a3',
+        'gray65' => 'a6a6a6',
+        'gray66' => 'a8a8a8',
+        'gray67' => 'ababab',
+        'gray68' => 'adadad',
+        'gray69' => 'b0b0b0',
+        'gray7' => '121212',
+        'gray70' => 'b3b3b3',
+        'gray71' => 'b5b5b5',
+        'gray72' => 'b8b8b8',
+        'gray73' => 'bababa',
+        'gray74' => 'bdbdbd',
+        'gray75' => 'bfbfbf',
+        'gray76' => 'c2c2c2',
+        'gray77' => 'c4c4c4',
+        'gray78' => 'c7c7c7',
+        'gray79' => 'c9c9c9',
+        'gray8' => '141414',
+        'gray80' => 'cccccc',
+        'gray81' => 'cfcfcf',
+        'gray82' => 'd1d1d1',
+        'gray83' => 'd4d4d4',
+        'gray84' => 'd6d6d6',
+        'gray85' => 'd9d9d9',
+        'gray86' => 'dbdbdb',
+        'gray87' => 'dedede',
+        'gray88' => 'e0e0e0',
+        'gray89' => 'e3e3e3',
+        'gray9' => '171717',
+        'gray90' => 'e5e5e5',
+        'gray91' => 'e8e8e8',
+        'gray92' => 'ebebeb',
+        'gray93' => 'ededed',
+        'gray94' => 'f0f0f0',
+        'gray95' => 'f2f2f2',
+        'gray97' => 'f7f7f7',
+        'gray98' => 'fafafa',
+        'gray99' => 'fcfcfc',
+        'green' => '00ff00',
+        'green1' => '00ff00',
+        'green2' => '00ee00',
+        'green3' => '00cd00',
+        'green4' => '008b00',
+        'greenyellow' => 'adff2f',
+        'honeydew1' => 'f0fff0',
+        'honeydew2' => 'e0eee0',
+        'honeydew3' => 'c1cdc1',
+        'honeydew4' => '838b83',
+        'hotpink' => 'ff69b4',
+        'hotpink1' => 'ff6eb4',
+        'hotpink2' => 'ee6aa7',
+        'hotpink3' => 'cd6090',
+        'hotpink4' => '8b3a62',
+        'indianred' => 'cd5c5c',
+        'indianred1' => 'ff6a6a',
+        'indianred2' => 'ee6363',
+        'indianred3' => 'cd5555',
+        'indianred4' => '8b3a3a',
+        'ivory1' => 'fffff0',
+        'ivory2' => 'eeeee0',
+        'ivory3' => 'cdcdc1',
+        'ivory4' => '8b8b83',
+        'khaki' => 'f0e68c',
+        'khaki1' => 'fff68f',
+        'khaki2' => 'eee685',
+        'khaki3' => 'cdc673',
+        'khaki4' => '8b864e',
+        'lavender' => 'e6e6fa',
+        'lavenderblush1' => 'fff0f5',
+        'lavenderblush2' => 'eee0e5',
+        'lavenderblush3' => 'cdc1c5',
+        'lavenderblush4' => '8b8386',
+        'lawngreen' => '7cfc00',
+        'lemonchiffon1' => 'fffacd',
+        'lemonchiffon2' => 'eee9bf',
+        'lemonchiffon3' => 'cdc9a5',
+        'lemonchiffon4' => '8b8970',
+        'light' => 'eedd82',
+        'lightblue' => 'add8e6',
+        'lightblue1' => 'bfefff',
+        'lightblue2' => 'b2dfee',
+        'lightblue3' => '9ac0cd',
+        'lightblue4' => '68838b',
+        'lightcoral' => 'f08080',
+        'lightcyan1' => 'e0ffff',
+        'lightcyan2' => 'd1eeee',
+        'lightcyan3' => 'b4cdcd',
+        'lightcyan4' => '7a8b8b',
+        'lightgoldenrod1' => 'ffec8b',
+        'lightgoldenrod2' => 'eedc82',
+        'lightgoldenrod3' => 'cdbe70',
+        'lightgoldenrod4' => '8b814c',
+        'lightgoldenrodyellow' => 'fafad2',
+        'lightgray' => 'd3d3d3',
+        'lightpink' => 'ffb6c1',
+        'lightpink1' => 'ffaeb9',
+        'lightpink2' => 'eea2ad',
+        'lightpink3' => 'cd8c95',
+        'lightpink4' => '8b5f65',
+        'lightsalmon1' => 'ffa07a',
+        'lightsalmon2' => 'ee9572',
+        'lightsalmon3' => 'cd8162',
+        'lightsalmon4' => '8b5742',
+        'lightseagreen' => '20b2aa',
+        'lightskyblue' => '87cefa',
+        'lightskyblue1' => 'b0e2ff',
+        'lightskyblue2' => 'a4d3ee',
+        'lightskyblue3' => '8db6cd',
+        'lightskyblue4' => '607b8b',
+        'lightslateblue' => '8470ff',
+        'lightslategray' => '778899',
+        'lightsteelblue' => 'b0c4de',
+        'lightsteelblue1' => 'cae1ff',
+        'lightsteelblue2' => 'bcd2ee',
+        'lightsteelblue3' => 'a2b5cd',
+        'lightsteelblue4' => '6e7b8b',
+        'lightyellow1' => 'ffffe0',
+        'lightyellow2' => 'eeeed1',
+        'lightyellow3' => 'cdcdb4',
+        'lightyellow4' => '8b8b7a',
+        'lime' => '00ff00',
+        'limegreen' => '32cd32',
+        'linen' => 'faf0e6',
+        'magenta' => 'ff00ff',
+        'magenta2' => 'ee00ee',
+        'magenta3' => 'cd00cd',
+        'magenta4' => '8b008b',
+        'maroon' => 'b03060',
+        'maroon1' => 'ff34b3',
+        'maroon2' => 'ee30a7',
+        'maroon3' => 'cd2990',
+        'maroon4' => '8b1c62',
+        'medium' => '66cdaa',
+        'mediumaquamarine' => '66cdaa',
+        'mediumblue' => '0000cd',
+        'mediumorchid' => 'ba55d3',
+        'mediumorchid1' => 'e066ff',
+        'mediumorchid2' => 'd15fee',
+        'mediumorchid3' => 'b452cd',
+        'mediumorchid4' => '7a378b',
+        'mediumpurple' => '9370db',
+        'mediumpurple1' => 'ab82ff',
+        'mediumpurple2' => '9f79ee',
+        'mediumpurple3' => '8968cd',
+        'mediumpurple4' => '5d478b',
+        'mediumseagreen' => '3cb371',
+        'mediumslateblue' => '7b68ee',
+        'mediumspringgreen' => '00fa9a',
+        'mediumturquoise' => '48d1cc',
+        'mediumvioletred' => 'c71585',
+        'midnightblue' => '191970',
+        'mintcream' => 'f5fffa',
+        'mistyrose1' => 'ffe4e1',
+        'mistyrose2' => 'eed5d2',
+        'mistyrose3' => 'cdb7b5',
+        'mistyrose4' => '8b7d7b',
+        'moccasin' => 'ffe4b5',
+        'navajowhite1' => 'ffdead',
+        'navajowhite2' => 'eecfa1',
+        'navajowhite3' => 'cdb38b',
+        'navajowhite4' => '8b795e',
+        'navy' => '000080',
+        'navyblue' => '000080',
+        'oldlace' => 'fdf5e6',
+        'olive' => '808000',
+        'olivedrab' => '6b8e23',
+        'olivedrab1' => 'c0ff3e',
+        'olivedrab2' => 'b3ee3a',
+        'olivedrab4' => '698b22',
+        'orange' => 'ffa500',
+        'orange1' => 'ffa500',
+        'orange2' => 'ee9a00',
+        'orange3' => 'cd8500',
+        'orange4' => '8b5a00',
+        'orangered1' => 'ff4500',
+        'orangered2' => 'ee4000',
+        'orangered3' => 'cd3700',
+        'orangered4' => '8b2500',
+        'orchid' => 'da70d6',
+        'orchid1' => 'ff83fa',
+        'orchid2' => 'ee7ae9',
+        'orchid3' => 'cd69c9',
+        'orchid4' => '8b4789',
+        'pale' => 'db7093',
+        'palegoldenrod' => 'eee8aa',
+        'palegreen' => '98fb98',
+        'palegreen1' => '9aff9a',
+        'palegreen2' => '90ee90',
+        'palegreen3' => '7ccd7c',
+        'palegreen4' => '548b54',
+        'paleturquoise' => 'afeeee',
+        'paleturquoise1' => 'bbffff',
+        'paleturquoise2' => 'aeeeee',
+        'paleturquoise3' => '96cdcd',
+        'paleturquoise4' => '668b8b',
+        'palevioletred' => 'db7093',
+        'palevioletred1' => 'ff82ab',
+        'palevioletred2' => 'ee799f',
+        'palevioletred3' => 'cd6889',
+        'palevioletred4' => '8b475d',
+        'papayawhip' => 'ffefd5',
+        'peachpuff1' => 'ffdab9',
+        'peachpuff2' => 'eecbad',
+        'peachpuff3' => 'cdaf95',
+        'peachpuff4' => '8b7765',
+        'pink' => 'ffc0cb',
+        'pink1' => 'ffb5c5',
+        'pink2' => 'eea9b8',
+        'pink3' => 'cd919e',
+        'pink4' => '8b636c',
+        'plum' => 'dda0dd',
+        'plum1' => 'ffbbff',
+        'plum2' => 'eeaeee',
+        'plum3' => 'cd96cd',
+        'plum4' => '8b668b',
+        'powderblue' => 'b0e0e6',
+        'purple' => 'a020f0',
+        'rebeccapurple' => '663399',
+        'purple1' => '9b30ff',
+        'purple2' => '912cee',
+        'purple3' => '7d26cd',
+        'purple4' => '551a8b',
+        'red' => 'ff0000',
+        'red1' => 'ff0000',
+        'red2' => 'ee0000',
+        'red3' => 'cd0000',
+        'red4' => '8b0000',
+        'rosybrown' => 'bc8f8f',
+        'rosybrown1' => 'ffc1c1',
+        'rosybrown2' => 'eeb4b4',
+        'rosybrown3' => 'cd9b9b',
+        'rosybrown4' => '8b6969',
+        'royalblue' => '4169e1',
+        'royalblue1' => '4876ff',
+        'royalblue2' => '436eee',
+        'royalblue3' => '3a5fcd',
+        'royalblue4' => '27408b',
+        'saddlebrown' => '8b4513',
+        'salmon' => 'fa8072',
+        'salmon1' => 'ff8c69',
+        'salmon2' => 'ee8262',
+        'salmon3' => 'cd7054',
+        'salmon4' => '8b4c39',
+        'sandybrown' => 'f4a460',
+        'seagreen1' => '54ff9f',
+        'seagreen2' => '4eee94',
+        'seagreen3' => '43cd80',
+        'seagreen4' => '2e8b57',
+        'seashell1' => 'fff5ee',
+        'seashell2' => 'eee5de',
+        'seashell3' => 'cdc5bf',
+        'seashell4' => '8b8682',
+        'sienna' => 'a0522d',
+        'sienna1' => 'ff8247',
+        'sienna2' => 'ee7942',
+        'sienna3' => 'cd6839',
+        'sienna4' => '8b4726',
+        'silver' => 'c0c0c0',
+        'skyblue' => '87ceeb',
+        'skyblue1' => '87ceff',
+        'skyblue2' => '7ec0ee',
+        'skyblue3' => '6ca6cd',
+        'skyblue4' => '4a708b',
+        'slateblue' => '6a5acd',
+        'slateblue1' => '836fff',
+        'slateblue2' => '7a67ee',
+        'slateblue3' => '6959cd',
+        'slateblue4' => '473c8b',
+        'slategray' => '708090',
+        'slategray1' => 'c6e2ff',
+        'slategray2' => 'b9d3ee',
+        'slategray3' => '9fb6cd',
+        'slategray4' => '6c7b8b',
+        'snow1' => 'fffafa',
+        'snow2' => 'eee9e9',
+        'snow3' => 'cdc9c9',
+        'snow4' => '8b8989',
+        'springgreen1' => '00ff7f',
+        'springgreen2' => '00ee76',
+        'springgreen3' => '00cd66',
+        'springgreen4' => '008b45',
+        'steelblue' => '4682b4',
+        'steelblue1' => '63b8ff',
+        'steelblue2' => '5cacee',
+        'steelblue3' => '4f94cd',
+        'steelblue4' => '36648b',
+        'tan' => 'd2b48c',
+        'tan1' => 'ffa54f',
+        'tan2' => 'ee9a49',
+        'tan3' => 'cd853f',
+        'tan4' => '8b5a2b',
+        'teal' => '008080',
+        'thistle' => 'd8bfd8',
+        'thistle1' => 'ffe1ff',
+        'thistle2' => 'eed2ee',
+        'thistle3' => 'cdb5cd',
+        'thistle4' => '8b7b8b',
+        'tomato1' => 'ff6347',
+        'tomato2' => 'ee5c42',
+        'tomato3' => 'cd4f39',
+        'tomato4' => '8b3626',
+        'turquoise' => '40e0d0',
+        'turquoise1' => '00f5ff',
+        'turquoise2' => '00e5ee',
+        'turquoise3' => '00c5cd',
+        'turquoise4' => '00868b',
+        'violet' => 'ee82ee',
+        'violetred' => 'd02090',
+        'violetred1' => 'ff3e96',
+        'violetred2' => 'ee3a8c',
+        'violetred3' => 'cd3278',
+        'violetred4' => '8b2252',
+        'wheat' => 'f5deb3',
+        'wheat1' => 'ffe7ba',
+        'wheat2' => 'eed8ae',
+        'wheat3' => 'cdba96',
+        'wheat4' => '8b7e66',
+        'white' => 'ffffff',
+        'whitesmoke' => 'f5f5f5',
+        'yellow' => 'ffff00',
+        'yellow1' => 'ffff00',
+        'yellow2' => 'eeee00',
+        'yellow3' => 'cdcd00',
+        'yellow4' => '8b8b00',
+        'yellowgreen' => '9acd32',
+    );
+
+    protected $face;
+    protected $size;
+    protected $color;
+
+    protected $bold = false;
+    protected $italic = false;
+    protected $underline = false;
+    protected $superscript = false;
+    protected $subscript = false;
+    protected $strikethrough = false;
+
+    protected $startTagCallbacks = array(
+        'font' => 'startFontTag',
+        'b' => 'startBoldTag',
+        'strong' => 'startBoldTag',
+        'i' => 'startItalicTag',
+        'em' => 'startItalicTag',
+        'u' => 'startUnderlineTag',
+        'ins' => 'startUnderlineTag',
+        'del' => 'startStrikethruTag',
+        'sup' => 'startSuperscriptTag',
+        'sub' => 'startSubscriptTag',
+    );
+
+    protected $endTagCallbacks = array(
+        'font' => 'endFontTag',
+        'b' => 'endBoldTag',
+        'strong' => 'endBoldTag',
+        'i' => 'endItalicTag',
+        'em' => 'endItalicTag',
+        'u' => 'endUnderlineTag',
+        'ins' => 'endUnderlineTag',
+        'del' => 'endStrikethruTag',
+        'sup' => 'endSuperscriptTag',
+        'sub' => 'endSubscriptTag',
+        'br' => 'breakTag',
+        'p' => 'breakTag',
+        'h1' => 'breakTag',
+        'h2' => 'breakTag',
+        'h3' => 'breakTag',
+        'h4' => 'breakTag',
+        'h5' => 'breakTag',
+        'h6' => 'breakTag',
+    );
+
+    protected $stack = array();
+
+    protected $stringData = '';
+
+    protected $richTextObject;
+
+    protected function initialise()
+    {
+        $this->face = $this->size = $this->color = null;
+        $this->bold = $this->italic = $this->underline = $this->superscript = $this->subscript = $this->strikethrough = false;
+
+        $this->stack = array();
+
+        $this->stringData = '';
+    }
+
+    public function toRichTextObject($html)
+    {
+        $this->initialise();
+
+        //  Create a new DOM object
+        $dom = new \DOMDocument;
+        //  Load the HTML file into the DOM object
+        //  Note the use of error suppression, because typically this will be an html fragment, so not fully valid markup
+        $loaded = @$dom->loadHTML($html);
+
+        //  Discard excess white space
+        $dom->preserveWhiteSpace = false;
+
+        $this->richTextObject = new PHPExcel_RichText();;
+        $this->parseElements($dom);
+
+        // Clean any further spurious whitespace
+        $this->cleanWhitespace();
+
+        return $this->richTextObject;
+    }
+
+    protected function cleanWhitespace()
+    {
+        foreach ($this->richTextObject->getRichTextElements() as $key => $element) {
+            $text = $element->getText();
+            // Trim any leading spaces on the first run
+            if ($key == 0) {
+                $text = ltrim($text);
+            }
+            // Trim any spaces immediately after a line break
+            $text = preg_replace('/\n */mu', "\n", $text);
+            $element->setText($text);
+        }
+    }
+
+    protected function buildTextRun()
+    {
+        $text = $this->stringData;
+        if (trim($text) === '') {
+            return;
+        }
+
+        $richtextRun = $this->richTextObject->createTextRun($this->stringData);
+        if ($this->face) {
+            $richtextRun->getFont()->setName($this->face);
+        }
+        if ($this->size) {
+            $richtextRun->getFont()->setSize($this->size);
+        }
+        if ($this->color) {
+            $richtextRun->getFont()->setColor(new PHPExcel_Style_Color('ff' . $this->color));
+        }
+        if ($this->bold) {
+            $richtextRun->getFont()->setBold(true);
+        }
+        if ($this->italic) {
+            $richtextRun->getFont()->setItalic(true);
+        }
+        if ($this->underline) {
+            $richtextRun->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+        }
+        if ($this->superscript) {
+            $richtextRun->getFont()->setSuperScript(true);
+        }
+        if ($this->subscript) {
+            $richtextRun->getFont()->setSubScript(true);
+        }
+        if ($this->strikethrough) {
+            $richtextRun->getFont()->setStrikethrough(true);
+        }
+        $this->stringData = '';
+    }
+
+    protected function rgbToColour($rgb)
+    {
+        preg_match_all('/\d+/', $rgb, $values);
+        foreach ($values[0] as &$value) {
+            $value = str_pad(dechex($value), 2, '0', STR_PAD_LEFT);
+        }
+        return implode($values[0]);
+    }
+
+    protected function colourNameLookup($rgb)
+    {
+        return self::$colourMap[$rgb];
+    }
+
+    protected function startFontTag($tag)
+    {
+        foreach ($tag->attributes as $attribute) {
+            $attributeName = strtolower($attribute->name);
+            $attributeValue = $attribute->value;
+
+            if ($attributeName == 'color') {
+                if (preg_match('/rgb\s*\(/', $attributeValue)) {
+                    $this->$attributeName = $this->rgbToColour($attributeValue);
+                } elseif (strpos(trim($attributeValue), '#') === 0) {
+                    $this->$attributeName = ltrim($attributeValue, '#');
+                } else {
+                    $this->$attributeName = $this->colourNameLookup($attributeValue);
+                }
+            } else {
+                $this->$attributeName = $attributeValue;
+            }
+        }
+    }
+
+    protected function endFontTag()
+    {
+        $this->face = $this->size = $this->color = null;
+    }
+
+    protected function startBoldTag()
+    {
+        $this->bold = true;
+    }
+
+    protected function endBoldTag()
+    {
+        $this->bold = false;
+    }
+
+    protected function startItalicTag()
+    {
+        $this->italic = true;
+    }
+
+    protected function endItalicTag()
+    {
+        $this->italic = false;
+    }
+
+    protected function startUnderlineTag()
+    {
+        $this->underline = true;
+    }
+
+    protected function endUnderlineTag()
+    {
+        $this->underline = false;
+    }
+
+    protected function startSubscriptTag()
+    {
+        $this->subscript = true;
+    }
+
+    protected function endSubscriptTag()
+    {
+        $this->subscript = false;
+    }
+
+    protected function startSuperscriptTag()
+    {
+        $this->superscript = true;
+    }
+
+    protected function endSuperscriptTag()
+    {
+        $this->superscript = false;
+    }
+
+    protected function startStrikethruTag()
+    {
+        $this->strikethrough = true;
+    }
+
+    protected function endStrikethruTag()
+    {
+        $this->strikethrough = false;
+    }
+
+    protected function breakTag()
+    {
+        $this->stringData .= "\n";
+    }
+
+    protected function parseTextNode(DOMText $textNode)
+    {
+        $domText = preg_replace(
+            '/\s+/u',
+            ' ',
+            str_replace(array("\r", "\n"), ' ', $textNode->nodeValue)
+        );
+        $this->stringData .= $domText;
+        $this->buildTextRun();
+    }
+
+    protected function handleCallback($element, $callbackTag, $callbacks)
+    {
+        if (isset($callbacks[$callbackTag])) {
+            $elementHandler = $callbacks[$callbackTag];
+            if (method_exists($this, $elementHandler)) {
+                call_user_func(array($this, $elementHandler), $element);
+            }
+        }
+    }
+
+    protected function parseElementNode(DOMElement $element)
+    {
+        $callbackTag = strtolower($element->nodeName);
+        $this->stack[] = $callbackTag;
+
+        $this->handleCallback($element, $callbackTag, $this->startTagCallbacks);
+
+        $this->parseElements($element);
+        array_pop($this->stack);
+
+        $this->handleCallback($element, $callbackTag, $this->endTagCallbacks);
+    }
+
+    protected function parseElements(DOMNode $element)
+    {
+        foreach ($element->childNodes as $child) {
+            if ($child instanceof DOMText) {
+                $this->parseTextNode($child);
+            } elseif ($child instanceof DOMElement) {
+                $this->parseElementNode($child);
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/IComparable.php b/lib/PHPExcel/IComparable.php
new file mode 100644
index 000000000..6dc36a948
--- /dev/null
+++ b/lib/PHPExcel/IComparable.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * PHPExcel_IComparable
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+interface PHPExcel_IComparable
+{
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode();
+}
diff --git a/lib/PHPExcel/IOFactory.php b/lib/PHPExcel/IOFactory.php
new file mode 100644
index 000000000..3ecda1777
--- /dev/null
+++ b/lib/PHPExcel/IOFactory.php
@@ -0,0 +1,289 @@
+<?php
+
+/**    PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_IOFactory
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_IOFactory
+{
+    /**
+     * Search locations
+     *
+     * @var    array
+     * @access    private
+     * @static
+     */
+    private static $searchLocations = array(
+        array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
+        array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
+    );
+
+    /**
+     * Autoresolve classes
+     *
+     * @var    array
+     * @access    private
+     * @static
+     */
+    private static $autoResolveClasses = array(
+        'Excel2007',
+        'Excel5',
+        'Excel2003XML',
+        'OOCalc',
+        'SYLK',
+        'Gnumeric',
+        'HTML',
+        'CSV',
+    );
+
+    /**
+     *    Private constructor for PHPExcel_IOFactory
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Get search locations
+     *
+     * @static
+     * @access    public
+     * @return    array
+     */
+    public static function getSearchLocations()
+    {
+        return self::$searchLocations;
+    }
+
+    /**
+     * Set search locations
+     *
+     * @static
+     * @access    public
+     * @param    array $value
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public static function setSearchLocations($value)
+    {
+        if (is_array($value)) {
+            self::$searchLocations = $value;
+        } else {
+            throw new PHPExcel_Reader_Exception('Invalid parameter passed.');
+        }
+    }
+
+    /**
+     * Add search location
+     *
+     * @static
+     * @access    public
+     * @param    string $type        Example: IWriter
+     * @param    string $location    Example: PHPExcel/Writer/{0}.php
+     * @param    string $classname     Example: PHPExcel_Writer_{0}
+     */
+    public static function addSearchLocation($type = '', $location = '', $classname = '')
+    {
+        self::$searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+    }
+
+    /**
+     * Create PHPExcel_Writer_IWriter
+     *
+     * @static
+     * @access    public
+     * @param    PHPExcel $phpExcel
+     * @param    string  $writerType    Example: Excel2007
+     * @return    PHPExcel_Writer_IWriter
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public static function createWriter(PHPExcel $phpExcel, $writerType = '')
+    {
+        // Search type
+        $searchType = 'IWriter';
+
+        // Include class
+        foreach (self::$searchLocations as $searchLocation) {
+            if ($searchLocation['type'] == $searchType) {
+                $className = str_replace('{0}', $writerType, $searchLocation['class']);
+
+                $instance = new $className($phpExcel);
+                if ($instance !== null) {
+                    return $instance;
+                }
+            }
+        }
+
+        // Nothing found...
+        throw new PHPExcel_Reader_Exception("No $searchType found for type $writerType");
+    }
+
+    /**
+     * Create PHPExcel_Reader_IReader
+     *
+     * @static
+     * @access    public
+     * @param    string $readerType    Example: Excel2007
+     * @return    PHPExcel_Reader_IReader
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public static function createReader($readerType = '')
+    {
+        // Search type
+        $searchType = 'IReader';
+
+        // Include class
+        foreach (self::$searchLocations as $searchLocation) {
+            if ($searchLocation['type'] == $searchType) {
+                $className = str_replace('{0}', $readerType, $searchLocation['class']);
+
+                $instance = new $className();
+                if ($instance !== null) {
+                    return $instance;
+                }
+            }
+        }
+
+        // Nothing found...
+        throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType");
+    }
+
+    /**
+     * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
+     *
+     * @static
+     * @access public
+     * @param     string         $pFilename        The name of the spreadsheet file
+     * @return    PHPExcel
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public static function load($pFilename)
+    {
+        $reader = self::createReaderForFile($pFilename);
+        return $reader->load($pFilename);
+    }
+
+    /**
+     * Identify file type using automatic PHPExcel_Reader_IReader resolution
+     *
+     * @static
+     * @access public
+     * @param     string         $pFilename        The name of the spreadsheet file to identify
+     * @return    string
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public static function identify($pFilename)
+    {
+        $reader = self::createReaderForFile($pFilename);
+        $className = get_class($reader);
+        $classType = explode('_', $className);
+        unset($reader);
+        return array_pop($classType);
+    }
+
+    /**
+     * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
+     *
+     * @static
+     * @access    public
+     * @param     string         $pFilename        The name of the spreadsheet file
+     * @return    PHPExcel_Reader_IReader
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public static function createReaderForFile($pFilename)
+    {
+        // First, lucky guess by inspecting file extension
+        $pathinfo = pathinfo($pFilename);
+
+        $extensionType = null;
+        if (isset($pathinfo['extension'])) {
+            switch (strtolower($pathinfo['extension'])) {
+                case 'xlsx':            //    Excel (OfficeOpenXML) Spreadsheet
+                case 'xlsm':            //    Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
+                case 'xltx':            //    Excel (OfficeOpenXML) Template
+                case 'xltm':            //    Excel (OfficeOpenXML) Macro Template (macros will be discarded)
+                    $extensionType = 'Excel2007';
+                    break;
+                case 'xls':                //    Excel (BIFF) Spreadsheet
+                case 'xlt':                //    Excel (BIFF) Template
+                    $extensionType = 'Excel5';
+                    break;
+                case 'ods':                //    Open/Libre Offic Calc
+                case 'ots':                //    Open/Libre Offic Calc Template
+                    $extensionType = 'OOCalc';
+                    break;
+                case 'slk':
+                    $extensionType = 'SYLK';
+                    break;
+                case 'xml':                //    Excel 2003 SpreadSheetML
+                    $extensionType = 'Excel2003XML';
+                    break;
+                case 'gnumeric':
+                    $extensionType = 'Gnumeric';
+                    break;
+                case 'htm':
+                case 'html':
+                    $extensionType = 'HTML';
+                    break;
+                case 'csv':
+                    // Do nothing
+                    // We must not try to use CSV reader since it loads
+                    // all files including Excel files etc.
+                    break;
+                default:
+                    break;
+            }
+
+            if ($extensionType !== null) {
+                $reader = self::createReader($extensionType);
+                // Let's see if we are lucky
+                if (isset($reader) && $reader->canRead($pFilename)) {
+                    return $reader;
+                }
+            }
+        }
+
+        // If we reach here then "lucky guess" didn't give any result
+        // Try walking through all the options in self::$autoResolveClasses
+        foreach (self::$autoResolveClasses as $autoResolveClass) {
+            //    Ignore our original guess, we know that won't work
+            if ($autoResolveClass !== $extensionType) {
+                $reader = self::createReader($autoResolveClass);
+                if ($reader->canRead($pFilename)) {
+                    return $reader;
+                }
+            }
+        }
+
+        throw new PHPExcel_Reader_Exception('Unable to identify a reader for this file');
+    }
+}
diff --git a/lib/PHPExcel/NamedRange.php b/lib/PHPExcel/NamedRange.php
new file mode 100644
index 000000000..2848db838
--- /dev/null
+++ b/lib/PHPExcel/NamedRange.php
@@ -0,0 +1,249 @@
+<?php
+
+/**
+ * PHPExcel_NamedRange
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_NamedRange
+{
+    /**
+     * Range name
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Worksheet on which the named range can be resolved
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $worksheet;
+
+    /**
+     * Range of the referenced cells
+     *
+     * @var string
+     */
+    private $range;
+
+    /**
+     * Is the named range local? (i.e. can only be used on $this->worksheet)
+     *
+     * @var bool
+     */
+    private $localOnly;
+
+    /**
+     * Scope
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $scope;
+
+    /**
+     * Create a new NamedRange
+     *
+     * @param string $pName
+     * @param PHPExcel_Worksheet $pWorksheet
+     * @param string $pRange
+     * @param bool $pLocalOnly
+     * @param PHPExcel_Worksheet|null $pScope    Scope. Only applies when $pLocalOnly = true. Null for global scope.
+     * @throws PHPExcel_Exception
+     */
+    public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
+    {
+        // Validate data
+        if (($pName === null) || ($pWorksheet === null) || ($pRange === null)) {
+            throw new PHPExcel_Exception('Parameters can not be null.');
+        }
+
+        // Set local members
+        $this->name       = $pName;
+        $this->worksheet  = $pWorksheet;
+        $this->range      = $pRange;
+        $this->localOnly  = $pLocalOnly;
+        $this->scope      = ($pLocalOnly == true) ? (($pScope == null) ? $pWorksheet : $pScope) : null;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set name
+     *
+     * @param string $value
+     * @return PHPExcel_NamedRange
+     */
+    public function setName($value = null)
+    {
+        if ($value !== null) {
+            // Old title
+            $oldTitle = $this->name;
+
+            // Re-attach
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
+            }
+            $this->name = $value;
+
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParent()->addNamedRange($this);
+            }
+
+            // New title
+            $newTitle = $this->name;
+            PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
+        }
+        return $this;
+    }
+
+    /**
+     * Get worksheet
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function getWorksheet()
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set worksheet
+     *
+     * @param PHPExcel_Worksheet $value
+     * @return PHPExcel_NamedRange
+     */
+    public function setWorksheet(PHPExcel_Worksheet $value = null)
+    {
+        if ($value !== null) {
+            $this->worksheet = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * Get range
+     *
+     * @return string
+     */
+    public function getRange()
+    {
+        return $this->range;
+    }
+
+    /**
+     * Set range
+     *
+     * @param string $value
+     * @return PHPExcel_NamedRange
+     */
+    public function setRange($value = null)
+    {
+        if ($value !== null) {
+            $this->range = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * Get localOnly
+     *
+     * @return bool
+     */
+    public function getLocalOnly()
+    {
+        return $this->localOnly;
+    }
+
+    /**
+     * Set localOnly
+     *
+     * @param bool $value
+     * @return PHPExcel_NamedRange
+     */
+    public function setLocalOnly($value = false)
+    {
+        $this->localOnly = $value;
+        $this->scope = $value ? $this->worksheet : null;
+        return $this;
+    }
+
+    /**
+     * Get scope
+     *
+     * @return PHPExcel_Worksheet|null
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    /**
+     * Set scope
+     *
+     * @param PHPExcel_Worksheet|null $value
+     * @return PHPExcel_NamedRange
+     */
+    public function setScope(PHPExcel_Worksheet $value = null)
+    {
+        $this->scope = $value;
+        $this->localOnly = ($value == null) ? false : true;
+        return $this;
+    }
+
+    /**
+     * Resolve a named range to a regular cell range
+     *
+     * @param string $pNamedRange Named range
+     * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
+     * @return PHPExcel_NamedRange
+     */
+    public static function resolveRange($pNamedRange = '', PHPExcel_Worksheet $pSheet)
+    {
+        return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Reader/Abstract.php b/lib/PHPExcel/Reader/Abstract.php
new file mode 100644
index 000000000..189c70a1b
--- /dev/null
+++ b/lib/PHPExcel/Reader/Abstract.php
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Abstract
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * Read data only?
+     * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+     *        or whether it should read both data and formatting
+     *
+     * @var    boolean
+     */
+    protected $readDataOnly = false;
+
+    /**
+     * Read empty cells?
+     * Identifies whether the Reader should read data values for cells all cells, or should ignore cells containing
+     *         null value or empty string
+     *
+     * @var    boolean
+     */
+    protected $readEmptyCells = true;
+
+    /**
+     * Read charts that are defined in the workbook?
+     * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;
+     *
+     * @var    boolean
+     */
+    protected $includeCharts = false;
+
+    /**
+     * Restrict which sheets should be loaded?
+     * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+     *
+     * @var array of string
+     */
+    protected $loadSheetsOnly;
+
+    /**
+     * PHPExcel_Reader_IReadFilter instance
+     *
+     * @var PHPExcel_Reader_IReadFilter
+     */
+    protected $readFilter;
+
+    protected $fileHandle = null;
+
+
+    /**
+     * Read data only?
+     *        If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
+     *        If false (the default) it will read data and formatting.
+     *
+     * @return    boolean
+     */
+    public function getReadDataOnly()
+    {
+        return $this->readDataOnly;
+    }
+
+    /**
+     * Set read data only
+     *        Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
+     *        Set to false (the default) to advise the Reader to read both data and formatting for cells.
+     *
+     * @param    boolean    $pValue
+     *
+     * @return    PHPExcel_Reader_IReader
+     */
+    public function setReadDataOnly($pValue = false)
+    {
+        $this->readDataOnly = $pValue;
+        return $this;
+    }
+
+    /**
+     * Read empty cells?
+     *        If this is true (the default), then the Reader will read data values for all cells, irrespective of value.
+     *        If false it will not read data for cells containing a null value or an empty string.
+     *
+     * @return    boolean
+     */
+    public function getReadEmptyCells()
+    {
+        return $this->readEmptyCells;
+    }
+
+    /**
+     * Set read empty cells
+     *        Set to true (the default) to advise the Reader read data values for all cells, irrespective of value.
+     *        Set to false to advise the Reader to ignore cells containing a null value or an empty string.
+     *
+     * @param    boolean    $pValue
+     *
+     * @return    PHPExcel_Reader_IReader
+     */
+    public function setReadEmptyCells($pValue = true)
+    {
+        $this->readEmptyCells = $pValue;
+        return $this;
+    }
+
+    /**
+     * Read charts in workbook?
+     *        If this is true, then the Reader will include any charts that exist in the workbook.
+     *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *        If false (the default) it will ignore any charts defined in the workbook file.
+     *
+     * @return    boolean
+     */
+    public function getIncludeCharts()
+    {
+        return $this->includeCharts;
+    }
+
+    /**
+     * Set read charts in workbook
+     *        Set to true, to advise the Reader to include any charts that exist in the workbook.
+     *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *        Set to false (the default) to discard charts.
+     *
+     * @param    boolean    $pValue
+     *
+     * @return    PHPExcel_Reader_IReader
+     */
+    public function setIncludeCharts($pValue = false)
+    {
+        $this->includeCharts = (boolean) $pValue;
+        return $this;
+    }
+
+    /**
+     * Get which sheets to load
+     * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
+     *        indicating that all worksheets in the workbook should be loaded.
+     *
+     * @return mixed
+     */
+    public function getLoadSheetsOnly()
+    {
+        return $this->loadSheetsOnly;
+    }
+
+    /**
+     * Set which sheets to load
+     *
+     * @param mixed $value
+     *        This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
+     *        If NULL, then it tells the Reader to read all worksheets in the workbook
+     *
+     * @return PHPExcel_Reader_IReader
+     */
+    public function setLoadSheetsOnly($value = null)
+    {
+        if ($value === null) {
+            return $this->setLoadAllSheets();
+        }
+
+        $this->loadSheetsOnly = is_array($value) ? $value : array($value);
+        return $this;
+    }
+
+    /**
+     * Set all sheets to load
+     *        Tells the Reader to load all worksheets from the workbook.
+     *
+     * @return PHPExcel_Reader_IReader
+     */
+    public function setLoadAllSheets()
+    {
+        $this->loadSheetsOnly = null;
+        return $this;
+    }
+
+    /**
+     * Read filter
+     *
+     * @return PHPExcel_Reader_IReadFilter
+     */
+    public function getReadFilter()
+    {
+        return $this->readFilter;
+    }
+
+    /**
+     * Set read filter
+     *
+     * @param PHPExcel_Reader_IReadFilter $pValue
+     * @return PHPExcel_Reader_IReader
+     */
+    public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue)
+    {
+        $this->readFilter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Open file for reading
+     *
+     * @param string $pFilename
+     * @throws    PHPExcel_Reader_Exception
+     * @return resource
+     */
+    protected function openFile($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename) || !is_readable($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        // Open file
+        $this->fileHandle = fopen($pFilename, 'r');
+        if ($this->fileHandle === false) {
+            throw new PHPExcel_Reader_Exception("Could not open file " . $pFilename . " for reading.");
+        }
+    }
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+        // Check if file exists
+        try {
+            $this->openFile($pFilename);
+        } catch (Exception $e) {
+            return false;
+        }
+
+        $readable = $this->isValidFormat();
+        fclose($this->fileHandle);
+        return $readable;
+    }
+
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
+     *
+     * @param     string         $xml
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function securityScan($xml)
+    {
+        $pattern = '/\\0?' . implode('\\0?', str_split('<!DOCTYPE')) . '\\0?/';
+        if (preg_match($pattern, $xml)) {
+            throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
+        }
+        return $xml;
+    }
+
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
+     *
+     * @param     string         $filestream
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function securityScanFile($filestream)
+    {
+        return $this->securityScan(file_get_contents($filestream));
+    }
+}
diff --git a/lib/PHPExcel/Reader/CSV.php b/lib/PHPExcel/Reader/CSV.php
new file mode 100644
index 000000000..21329dad6
--- /dev/null
+++ b/lib/PHPExcel/Reader/CSV.php
@@ -0,0 +1,406 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_CSV
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * Input encoding
+     *
+     * @access    private
+     * @var    string
+     */
+    private $inputEncoding = 'UTF-8';
+
+    /**
+     * Delimiter
+     *
+     * @access    private
+     * @var string
+     */
+    private $delimiter = ',';
+
+    /**
+     * Enclosure
+     *
+     * @access    private
+     * @var    string
+     */
+    private $enclosure = '"';
+
+    /**
+     * Sheet index to read
+     *
+     * @access    private
+     * @var    int
+     */
+    private $sheetIndex = 0;
+
+    /**
+     * Load rows contiguously
+     *
+     * @access    private
+     * @var    int
+     */
+    private $contiguous = false;
+
+    /**
+     * Row counter for loading rows contiguously
+     *
+     * @var    int
+     */
+    private $contiguousRow = -1;
+
+
+    /**
+     * Create a new PHPExcel_Reader_CSV
+     */
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
+
+    /**
+     * Validate that the current file is a CSV file
+     *
+     * @return boolean
+     */
+    protected function isValidFormat()
+    {
+        return true;
+    }
+
+    /**
+     * Set input encoding
+     *
+     * @param string $pValue Input encoding
+     */
+    public function setInputEncoding($pValue = 'UTF-8')
+    {
+        $this->inputEncoding = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get input encoding
+     *
+     * @return string
+     */
+    public function getInputEncoding()
+    {
+        return $this->inputEncoding;
+    }
+
+    /**
+     * Move filepointer past any BOM marker
+     *
+     */
+    protected function skipBOM()
+    {
+        rewind($this->fileHandle);
+
+        switch ($this->inputEncoding) {
+            case 'UTF-8':
+                fgets($this->fileHandle, 4) == "\xEF\xBB\xBF" ?
+                    fseek($this->fileHandle, 3) : fseek($this->fileHandle, 0);
+                break;
+            case 'UTF-16LE':
+                fgets($this->fileHandle, 3) == "\xFF\xFE" ?
+                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
+                break;
+            case 'UTF-16BE':
+                fgets($this->fileHandle, 3) == "\xFE\xFF" ?
+                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
+                break;
+            case 'UTF-32LE':
+                fgets($this->fileHandle, 5) == "\xFF\xFE\x00\x00" ?
+                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
+                break;
+            case 'UTF-32BE':
+                fgets($this->fileHandle, 5) == "\x00\x00\xFE\xFF" ?
+                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Identify any separator that is explicitly set in the file
+     *
+     */
+    protected function checkSeparator()
+    {
+        $line = fgets($this->fileHandle);
+        if ($line === false) {
+            return;
+        }
+
+        if ((strlen(trim($line, "\r\n")) == 5) && (stripos($line, 'sep=') === 0)) {
+            $this->delimiter = substr($line, 4, 1);
+            return;
+        }
+        return $this->skipBOM();
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param     string         $pFilename
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Open file
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+        $fileHandle = $this->fileHandle;
+
+        // Skip BOM, if any
+        $this->skipBOM();
+        $this->checkSeparator();
+
+        $escapeEnclosures = array( "\\" . $this->enclosure, $this->enclosure . $this->enclosure );
+
+        $worksheetInfo = array();
+        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
+        $worksheetInfo[0]['lastColumnLetter'] = 'A';
+        $worksheetInfo[0]['lastColumnIndex'] = 0;
+        $worksheetInfo[0]['totalRows'] = 0;
+        $worksheetInfo[0]['totalColumns'] = 0;
+
+        // Loop through each line of the file in turn
+        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure)) !== false) {
+            $worksheetInfo[0]['totalRows']++;
+            $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
+        }
+
+        $worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
+        $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+
+        // Close file
+        fclose($fileHandle);
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return PHPExcel
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
+
+        // Load into this instance
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
+
+    /**
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param     string         $pFilename
+     * @param    PHPExcel    $objPHPExcel
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        $lineEnding = ini_get('auto_detect_line_endings');
+        ini_set('auto_detect_line_endings', true);
+
+        // Open file
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+        $fileHandle = $this->fileHandle;
+
+        // Skip BOM, if any
+        $this->skipBOM();
+        $this->checkSeparator();
+
+        // Create new PHPExcel object
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
+            $objPHPExcel->createSheet();
+        }
+        $sheet = $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
+
+        $escapeEnclosures = array( "\\" . $this->enclosure,
+                                   $this->enclosure . $this->enclosure
+                                 );
+
+        // Set our starting row based on whether we're in contiguous mode or not
+        $currentRow = 1;
+        if ($this->contiguous) {
+            $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow(): $this->contiguousRow;
+        }
+
+        // Loop through each line of the file in turn
+        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure)) !== false) {
+            $columnLetter = 'A';
+            foreach ($rowData as $rowDatum) {
+                if ($rowDatum != '' && $this->readFilter->readCell($columnLetter, $currentRow)) {
+                    // Unescape enclosures
+                    $rowDatum = str_replace($escapeEnclosures, $this->enclosure, $rowDatum);
+
+                    // Convert encoding if necessary
+                    if ($this->inputEncoding !== 'UTF-8') {
+                        $rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->inputEncoding);
+                    }
+
+                    // Set cell value
+                    $sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+                }
+                ++$columnLetter;
+            }
+            ++$currentRow;
+        }
+
+        // Close file
+        fclose($fileHandle);
+
+        if ($this->contiguous) {
+            $this->contiguousRow = $currentRow;
+        }
+
+        ini_set('auto_detect_line_endings', $lineEnding);
+
+        // Return
+        return $objPHPExcel;
+    }
+
+    /**
+     * Get delimiter
+     *
+     * @return string
+     */
+    public function getDelimiter()
+    {
+        return $this->delimiter;
+    }
+
+    /**
+     * Set delimiter
+     *
+     * @param    string    $pValue        Delimiter, defaults to ,
+     * @return    PHPExcel_Reader_CSV
+     */
+    public function setDelimiter($pValue = ',')
+    {
+        $this->delimiter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get enclosure
+     *
+     * @return string
+     */
+    public function getEnclosure()
+    {
+        return $this->enclosure;
+    }
+
+    /**
+     * Set enclosure
+     *
+     * @param    string    $pValue        Enclosure, defaults to "
+     * @return PHPExcel_Reader_CSV
+     */
+    public function setEnclosure($pValue = '"')
+    {
+        if ($pValue == '') {
+            $pValue = '"';
+        }
+        $this->enclosure = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return integer
+     */
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param    integer        $pValue        Sheet index
+     * @return PHPExcel_Reader_CSV
+     */
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+        return $this;
+    }
+
+    /**
+     * Set Contiguous
+     *
+     * @param boolean $contiguous
+     */
+    public function setContiguous($contiguous = false)
+    {
+        $this->contiguous = (bool) $contiguous;
+        if (!$contiguous) {
+            $this->contiguousRow = -1;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Contiguous
+     *
+     * @return boolean
+     */
+    public function getContiguous()
+    {
+        return $this->contiguous;
+    }
+}
diff --git a/lib/PHPExcel/Reader/DefaultReadFilter.php b/lib/PHPExcel/Reader/DefaultReadFilter.php
new file mode 100644
index 000000000..ea25f63c5
--- /dev/null
+++ b/lib/PHPExcel/Reader/DefaultReadFilter.php
@@ -0,0 +1,51 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_DefaultReadFilter
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_DefaultReadFilter implements PHPExcel_Reader_IReadFilter
+{
+    /**
+     * Should this cell be read?
+     *
+     * @param    $column           Column address (as a string value like "A", or "IV")
+     * @param    $row              Row number
+     * @param    $worksheetName    Optional worksheet name
+     * @return   boolean
+     */
+    public function readCell($column, $row, $worksheetName = '')
+    {
+        return true;
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel2003XML.php b/lib/PHPExcel/Reader/Excel2003XML.php
new file mode 100644
index 000000000..3e21c9d91
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel2003XML.php
@@ -0,0 +1,801 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Excel2003XML
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * Formats
+     *
+     * @var array
+     */
+    protected $styles = array();
+
+    /**
+     * Character set used in the file
+     *
+     * @var string
+     */
+    protected $charSet = 'UTF-8';
+
+    /**
+     * Create a new PHPExcel_Reader_Excel2003XML
+     */
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
+
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return     boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+
+        //    Office                    xmlns:o="urn:schemas-microsoft-com:office:office"
+        //    Excel                    xmlns:x="urn:schemas-microsoft-com:office:excel"
+        //    XML Spreadsheet            xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+        //    Spreadsheet component    xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
+        //    XML schema                 xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
+        //    XML data type            xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+        //    MS-persist recordset    xmlns:rs="urn:schemas-microsoft-com:rowset"
+        //    Rowset                    xmlns:z="#RowsetSchema"
+        //
+
+        $signature = array(
+                '<?xml version="1.0"',
+                '<?mso-application progid="Excel.Sheet"?>'
+            );
+
+        // Open file
+        $this->openFile($pFilename);
+        $fileHandle = $this->fileHandle;
+        
+        // Read sample data (first 2 KB will do)
+        $data = fread($fileHandle, 2048);
+        fclose($fileHandle);
+
+        $valid = true;
+        foreach ($signature as $match) {
+            // every part of the signature must be present
+            if (strpos($data, $match) === false) {
+                $valid = false;
+                break;
+            }
+        }
+
+        //    Retrieve charset encoding
+        if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um', $data, $matches)) {
+            $this->charSet = strtoupper($matches[1]);
+        }
+//        echo 'Character Set is ', $this->charSet,'<br />';
+
+        return $valid;
+    }
+
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+     *
+     * @param     string         $pFilename
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function listWorksheetNames($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+        if (!$this->canRead($pFilename)) {
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+
+        $worksheetNames = array();
+
+        $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+        $namespaces = $xml->getNamespaces(true);
+
+        $xml_ss = $xml->children($namespaces['ss']);
+        foreach ($xml_ss->Worksheet as $worksheet) {
+            $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+            $worksheetNames[] = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
+        }
+
+        return $worksheetNames;
+    }
+
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param   string     $pFilename
+     * @throws   PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $worksheetInfo = array();
+
+        $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+        $namespaces = $xml->getNamespaces(true);
+
+        $worksheetID = 1;
+        $xml_ss = $xml->children($namespaces['ss']);
+        foreach ($xml_ss->Worksheet as $worksheet) {
+            $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+
+            $tmpInfo = array();
+            $tmpInfo['worksheetName'] = '';
+            $tmpInfo['lastColumnLetter'] = 'A';
+            $tmpInfo['lastColumnIndex'] = 0;
+            $tmpInfo['totalRows'] = 0;
+            $tmpInfo['totalColumns'] = 0;
+
+            if (isset($worksheet_ss['Name'])) {
+                $tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
+            } else {
+                $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
+            }
+
+            if (isset($worksheet->Table->Row)) {
+                $rowIndex = 0;
+
+                foreach ($worksheet->Table->Row as $rowData) {
+                    $columnIndex = 0;
+                    $rowHasData = false;
+
+                    foreach ($rowData->Cell as $cell) {
+                        if (isset($cell->Data)) {
+                            $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+                            $rowHasData = true;
+                        }
+
+                        ++$columnIndex;
+                    }
+
+                    ++$rowIndex;
+
+                    if ($rowHasData) {
+                        $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+                    }
+                }
+            }
+
+            $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+            $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+            $worksheetInfo[] = $tmpInfo;
+            ++$worksheetID;
+        }
+
+        return $worksheetInfo;
+    }
+
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
+        $objPHPExcel->removeSheetByIndex(0);
+
+        // Load into this instance
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
+
+    protected static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
+    {
+        $styleAttributeValue = strtolower($styleAttributeValue);
+        foreach ($styleList as $style) {
+            if ($styleAttributeValue == strtolower($style)) {
+                $styleAttributeValue = $style;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * pixel units to excel width units(units of 1/256th of a character width)
+     * @param pxs
+     * @return
+     */
+    protected static function pixel2WidthUnits($pxs)
+    {
+        $UNIT_OFFSET_MAP = array(0, 36, 73, 109, 146, 182, 219);
+
+        $widthUnits = 256 * ($pxs / 7);
+        $widthUnits += $UNIT_OFFSET_MAP[($pxs % 7)];
+        return $widthUnits;
+    }
+
+    /**
+     * excel width units(units of 1/256th of a character width) to pixel units
+     * @param widthUnits
+     * @return
+     */
+    protected static function widthUnits2Pixel($widthUnits)
+    {
+        $pixels = ($widthUnits / 256) * 7;
+        $offsetWidthUnits = $widthUnits % 256;
+        $pixels += round($offsetWidthUnits / (256 / 7));
+        return $pixels;
+    }
+
+    protected static function hex2str($hex)
+    {
+        return chr(hexdec($hex[1]));
+    }
+
+    /**
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param     string         $pFilename
+     * @param    PHPExcel    $objPHPExcel
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        $fromFormats    = array('\-', '\ ');
+        $toFormats      = array('-', ' ');
+
+        $underlineStyles = array (
+            PHPExcel_Style_Font::UNDERLINE_NONE,
+            PHPExcel_Style_Font::UNDERLINE_DOUBLE,
+            PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING,
+            PHPExcel_Style_Font::UNDERLINE_SINGLE,
+            PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING
+        );
+        $verticalAlignmentStyles = array (
+            PHPExcel_Style_Alignment::VERTICAL_BOTTOM,
+            PHPExcel_Style_Alignment::VERTICAL_TOP,
+            PHPExcel_Style_Alignment::VERTICAL_CENTER,
+            PHPExcel_Style_Alignment::VERTICAL_JUSTIFY
+        );
+        $horizontalAlignmentStyles = array (
+            PHPExcel_Style_Alignment::HORIZONTAL_GENERAL,
+            PHPExcel_Style_Alignment::HORIZONTAL_LEFT,
+            PHPExcel_Style_Alignment::HORIZONTAL_RIGHT,
+            PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
+            PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+            PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY
+        );
+
+        $timezoneObj = new DateTimeZone('Europe/London');
+        $GMT = new DateTimeZone('UTC');
+
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        if (!$this->canRead($pFilename)) {
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+
+        $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+        $namespaces = $xml->getNamespaces(true);
+
+        $docProps = $objPHPExcel->getProperties();
+        if (isset($xml->DocumentProperties[0])) {
+            foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+                switch ($propertyName) {
+                    case 'Title':
+                        $docProps->setTitle(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Subject':
+                        $docProps->setSubject(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Author':
+                        $docProps->setCreator(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Created':
+                        $creationDate = strtotime($propertyValue);
+                        $docProps->setCreated($creationDate);
+                        break;
+                    case 'LastAuthor':
+                        $docProps->setLastModifiedBy(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'LastSaved':
+                        $lastSaveDate = strtotime($propertyValue);
+                        $docProps->setModified($lastSaveDate);
+                        break;
+                    case 'Company':
+                        $docProps->setCompany(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Category':
+                        $docProps->setCategory(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Manager':
+                        $docProps->setManager(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Keywords':
+                        $docProps->setKeywords(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                    case 'Description':
+                        $docProps->setDescription(self::convertStringEncoding($propertyValue, $this->charSet));
+                        break;
+                }
+            }
+        }
+        if (isset($xml->CustomDocumentProperties)) {
+            foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
+                $propertyAttributes = $propertyValue->attributes($namespaces['dt']);
+                $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', 'PHPExcel_Reader_Excel2003XML::hex2str', $propertyName);
+                $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
+                switch ((string) $propertyAttributes) {
+                    case 'string':
+                        $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+                        $propertyValue = trim($propertyValue);
+                        break;
+                    case 'boolean':
+                        $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+                        $propertyValue = (bool) $propertyValue;
+                        break;
+                    case 'integer':
+                        $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_INTEGER;
+                        $propertyValue = intval($propertyValue);
+                        break;
+                    case 'float':
+                        $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
+                        $propertyValue = floatval($propertyValue);
+                        break;
+                    case 'dateTime.tz':
+                        $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
+                        $propertyValue = strtotime(trim($propertyValue));
+                        break;
+                }
+                $docProps->setCustomProperty($propertyName, $propertyValue, $propertyType);
+            }
+        }
+
+        foreach ($xml->Styles[0] as $style) {
+            $style_ss = $style->attributes($namespaces['ss']);
+            $styleID = (string) $style_ss['ID'];
+//            echo 'Style ID = '.$styleID.'<br />';
+            $this->styles[$styleID] = (isset($this->styles['Default'])) ? $this->styles['Default'] : array();
+            foreach ($style as $styleType => $styleData) {
+                $styleAttributes = $styleData->attributes($namespaces['ss']);
+//                echo $styleType.'<br />';
+                switch ($styleType) {
+                    case 'Alignment':
+                        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+//                                echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+                            $styleAttributeValue = (string) $styleAttributeValue;
+                            switch ($styleAttributeKey) {
+                                case 'Vertical':
+                                    if (self::identifyFixedStyleValue($verticalAlignmentStyles, $styleAttributeValue)) {
+                                        $this->styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
+                                    }
+                                    break;
+                                case 'Horizontal':
+                                    if (self::identifyFixedStyleValue($horizontalAlignmentStyles, $styleAttributeValue)) {
+                                        $this->styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
+                                    }
+                                    break;
+                                case 'WrapText':
+                                    $this->styles[$styleID]['alignment']['wrap'] = true;
+                                    break;
+                            }
+                        }
+                        break;
+                    case 'Borders':
+                        foreach ($styleData->Border as $borderStyle) {
+                            $borderAttributes = $borderStyle->attributes($namespaces['ss']);
+                            $thisBorder = array();
+                            foreach ($borderAttributes as $borderStyleKey => $borderStyleValue) {
+//                                    echo $borderStyleKey.' = '.$borderStyleValue.'<br />';
+                                switch ($borderStyleKey) {
+                                    case 'LineStyle':
+                                        $thisBorder['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
+//                                                $thisBorder['style'] = $borderStyleValue;
+                                        break;
+                                    case 'Weight':
+//                                                $thisBorder['style'] = $borderStyleValue;
+                                        break;
+                                    case 'Position':
+                                        $borderPosition = strtolower($borderStyleValue);
+                                        break;
+                                    case 'Color':
+                                        $borderColour = substr($borderStyleValue, 1);
+                                        $thisBorder['color']['rgb'] = $borderColour;
+                                        break;
+                                }
+                            }
+                            if (!empty($thisBorder)) {
+                                if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
+                                    $this->styles[$styleID]['borders'][$borderPosition] = $thisBorder;
+                                }
+                            }
+                        }
+                        break;
+                    case 'Font':
+                        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+//                                echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+                            $styleAttributeValue = (string) $styleAttributeValue;
+                            switch ($styleAttributeKey) {
+                                case 'FontName':
+                                    $this->styles[$styleID]['font']['name'] = $styleAttributeValue;
+                                    break;
+                                case 'Size':
+                                    $this->styles[$styleID]['font']['size'] = $styleAttributeValue;
+                                    break;
+                                case 'Color':
+                                    $this->styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue, 1);
+                                    break;
+                                case 'Bold':
+                                    $this->styles[$styleID]['font']['bold'] = true;
+                                    break;
+                                case 'Italic':
+                                    $this->styles[$styleID]['font']['italic'] = true;
+                                    break;
+                                case 'Underline':
+                                    if (self::identifyFixedStyleValue($underlineStyles, $styleAttributeValue)) {
+                                        $this->styles[$styleID]['font']['underline'] = $styleAttributeValue;
+                                    }
+                                    break;
+                            }
+                        }
+                        break;
+                    case 'Interior':
+                        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+//                                echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+                            switch ($styleAttributeKey) {
+                                case 'Color':
+                                    $this->styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue, 1);
+                                    break;
+                            }
+                        }
+                        break;
+                    case 'NumberFormat':
+                        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+//                                echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+                            $styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
+                            switch ($styleAttributeValue) {
+                                case 'Short Date':
+                                    $styleAttributeValue = 'dd/mm/yyyy';
+                                    break;
+                            }
+                            if ($styleAttributeValue > '') {
+                                $this->styles[$styleID]['numberformat']['code'] = $styleAttributeValue;
+                            }
+                        }
+                        break;
+                    case 'Protection':
+                        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+//                                echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+                        }
+                        break;
+                }
+            }
+//            print_r($this->styles[$styleID]);
+//            echo '<hr />';
+        }
+//        echo '<hr />';
+
+        $worksheetID = 0;
+        $xml_ss = $xml->children($namespaces['ss']);
+
+        foreach ($xml_ss->Worksheet as $worksheet) {
+            $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+
+            if ((isset($this->loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
+                (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))) {
+                continue;
+            }
+
+//            echo '<h3>Worksheet: ', $worksheet_ss['Name'],'<h3>';
+//
+            // Create new Worksheet
+            $objPHPExcel->createSheet();
+            $objPHPExcel->setActiveSheetIndex($worksheetID);
+            if (isset($worksheet_ss['Name'])) {
+                $worksheetName = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
+                //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+                //        formula cells... during the load, all formulae should be correct, and we're simply bringing
+                //        the worksheet name in line with the formula, not the reverse
+                $objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
+            }
+
+            $columnID = 'A';
+            if (isset($worksheet->Table->Column)) {
+                foreach ($worksheet->Table->Column as $columnData) {
+                    $columnData_ss = $columnData->attributes($namespaces['ss']);
+                    if (isset($columnData_ss['Index'])) {
+                        $columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1);
+                    }
+                    if (isset($columnData_ss['Width'])) {
+                        $columnWidth = $columnData_ss['Width'];
+//                        echo '<b>Setting column width for '.$columnID.' to '.$columnWidth.'</b><br />';
+                        $objPHPExcel->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
+                    }
+                    ++$columnID;
+                }
+            }
+
+            $rowID = 1;
+            if (isset($worksheet->Table->Row)) {
+                $additionalMergedCells = 0;
+                foreach ($worksheet->Table->Row as $rowData) {
+                    $rowHasData = false;
+                    $row_ss = $rowData->attributes($namespaces['ss']);
+                    if (isset($row_ss['Index'])) {
+                        $rowID = (integer) $row_ss['Index'];
+                    }
+//                    echo '<b>Row '.$rowID.'</b><br />';
+
+                    $columnID = 'A';
+                    foreach ($rowData->Cell as $cell) {
+                        $cell_ss = $cell->attributes($namespaces['ss']);
+                        if (isset($cell_ss['Index'])) {
+                            $columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
+                        }
+                        $cellRange = $columnID.$rowID;
+
+                        if ($this->getReadFilter() !== null) {
+                            if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+                                continue;
+                            }
+                        }
+
+                        if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
+                            $columnTo = $columnID;
+                            if (isset($cell_ss['MergeAcross'])) {
+                                $additionalMergedCells += (int)$cell_ss['MergeAcross'];
+                                $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
+                            }
+                            $rowTo = $rowID;
+                            if (isset($cell_ss['MergeDown'])) {
+                                $rowTo = $rowTo + $cell_ss['MergeDown'];
+                            }
+                            $cellRange .= ':'.$columnTo.$rowTo;
+                            $objPHPExcel->getActiveSheet()->mergeCells($cellRange);
+                        }
+
+                        $cellIsSet = $hasCalculatedValue = false;
+                        $cellDataFormula = '';
+                        if (isset($cell_ss['Formula'])) {
+                            $cellDataFormula = $cell_ss['Formula'];
+                            // added this as a check for array formulas
+                            if (isset($cell_ss['ArrayRange'])) {
+                                $cellDataCSEFormula = $cell_ss['ArrayRange'];
+//                                echo "found an array formula at ".$columnID.$rowID."<br />";
+                            }
+                            $hasCalculatedValue = true;
+                        }
+                        if (isset($cell->Data)) {
+                            $cellValue = $cellData = $cell->Data;
+                            $type = PHPExcel_Cell_DataType::TYPE_NULL;
+                            $cellData_ss = $cellData->attributes($namespaces['ss']);
+                            if (isset($cellData_ss['Type'])) {
+                                $cellDataType = $cellData_ss['Type'];
+                                switch ($cellDataType) {
+                                    /*
+                                    const TYPE_STRING        = 's';
+                                    const TYPE_FORMULA        = 'f';
+                                    const TYPE_NUMERIC        = 'n';
+                                    const TYPE_BOOL            = 'b';
+                                    const TYPE_NULL            = 'null';
+                                    const TYPE_INLINE        = 'inlineStr';
+                                    const TYPE_ERROR        = 'e';
+                                    */
+                                    case 'String':
+                                        $cellValue = self::convertStringEncoding($cellValue, $this->charSet);
+                                        $type = PHPExcel_Cell_DataType::TYPE_STRING;
+                                        break;
+                                    case 'Number':
+                                        $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                        $cellValue = (float) $cellValue;
+                                        if (floor($cellValue) == $cellValue) {
+                                            $cellValue = (integer) $cellValue;
+                                        }
+                                        break;
+                                    case 'Boolean':
+                                        $type = PHPExcel_Cell_DataType::TYPE_BOOL;
+                                        $cellValue = ($cellValue != 0);
+                                        break;
+                                    case 'DateTime':
+                                        $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                        $cellValue = PHPExcel_Shared_Date::PHPToExcel(strtotime($cellValue));
+                                        break;
+                                    case 'Error':
+                                        $type = PHPExcel_Cell_DataType::TYPE_ERROR;
+                                        break;
+                                }
+                            }
+
+                            if ($hasCalculatedValue) {
+//                                echo 'FORMULA<br />';
+                                $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+                                $columnNumber = PHPExcel_Cell::columnIndexFromString($columnID);
+                                if (substr($cellDataFormula, 0, 3) == 'of:') {
+                                    $cellDataFormula = substr($cellDataFormula, 3);
+//                                    echo 'Before: ', $cellDataFormula,'<br />';
+                                    $temp = explode('"', $cellDataFormula);
+                                    $key = false;
+                                    foreach ($temp as &$value) {
+                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
+                                        if ($key = !$key) {
+                                            $value = str_replace(array('[.', '.', ']'), '', $value);
+                                        }
+                                    }
+                                } else {
+                                    //    Convert R1C1 style references to A1 style references (but only when not quoted)
+//                                    echo 'Before: ', $cellDataFormula,'<br />';
+                                    $temp = explode('"', $cellDataFormula);
+                                    $key = false;
+                                    foreach ($temp as &$value) {
+                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
+                                        if ($key = !$key) {
+                                            preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
+                                            //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                                            //        through the formula from left to right. Reversing means that we work right to left.through
+                                            //        the formula
+                                            $cellReferences = array_reverse($cellReferences);
+                                            //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
+                                            //        then modify the formula to use that new reference
+                                            foreach ($cellReferences as $cellReference) {
+                                                $rowReference = $cellReference[2][0];
+                                                //    Empty R reference is the current row
+                                                if ($rowReference == '') {
+                                                    $rowReference = $rowID;
+                                                }
+                                                //    Bracketed R references are relative to the current row
+                                                if ($rowReference[0] == '[') {
+                                                    $rowReference = $rowID + trim($rowReference, '[]');
+                                                }
+                                                $columnReference = $cellReference[4][0];
+                                                //    Empty C reference is the current column
+                                                if ($columnReference == '') {
+                                                    $columnReference = $columnNumber;
+                                                }
+                                                //    Bracketed C references are relative to the current column
+                                                if ($columnReference[0] == '[') {
+                                                    $columnReference = $columnNumber + trim($columnReference, '[]');
+                                                }
+                                                $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+                                                $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                                            }
+                                        }
+                                    }
+                                }
+                                unset($value);
+                                //    Then rebuild the formula string
+                                $cellDataFormula = implode('"', $temp);
+//                                echo 'After: ', $cellDataFormula,'<br />';
+                            }
+
+//                            echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
+//
+                            $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
+                            if ($hasCalculatedValue) {
+//                                echo 'Formula result is '.$cellValue.'<br />';
+                                $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
+                            }
+                            $cellIsSet = $rowHasData = true;
+                        }
+
+                        if (isset($cell->Comment)) {
+//                            echo '<b>comment found</b><br />';
+                            $commentAttributes = $cell->Comment->attributes($namespaces['ss']);
+                            $author = 'unknown';
+                            if (isset($commentAttributes->Author)) {
+                                $author = (string)$commentAttributes->Author;
+//                                echo 'Author: ', $author,'<br />';
+                            }
+                            $node = $cell->Comment->Data->asXML();
+//                            $annotation = str_replace('html:','',substr($node,49,-10));
+//                            echo $annotation,'<br />';
+                            $annotation = strip_tags($node);
+//                            echo 'Annotation: ', $annotation,'<br />';
+                            $objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
+                        }
+
+                        if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
+                            $style = (string) $cell_ss['StyleID'];
+//                            echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
+                            if ((isset($this->styles[$style])) && (!empty($this->styles[$style]))) {
+//                                echo 'Cell '.$columnID.$rowID.'<br />';
+//                                print_r($this->styles[$style]);
+//                                echo '<br />';
+                                if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
+                                    $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(null);
+                                }
+                                $objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
+                            }
+                        }
+                        ++$columnID;
+                        while ($additionalMergedCells > 0) {
+                            ++$columnID;
+                            $additionalMergedCells--;
+                        }
+                    }
+
+                    if ($rowHasData) {
+                        if (isset($row_ss['StyleID'])) {
+                            $rowStyle = $row_ss['StyleID'];
+                        }
+                        if (isset($row_ss['Height'])) {
+                            $rowHeight = $row_ss['Height'];
+//                            echo '<b>Setting row height to '.$rowHeight.'</b><br />';
+                            $objPHPExcel->getActiveSheet()->getRowDimension($rowID)->setRowHeight($rowHeight);
+                        }
+                    }
+
+                    ++$rowID;
+                }
+            }
+            ++$worksheetID;
+        }
+
+        // Return
+        return $objPHPExcel;
+    }
+
+
+    protected static function convertStringEncoding($string, $charset)
+    {
+        if ($charset != 'UTF-8') {
+            return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $charset);
+        }
+        return $string;
+    }
+
+
+    protected function parseRichText($is = '')
+    {
+        $value = new PHPExcel_RichText();
+
+        $value->createText(self::convertStringEncoding($is, $this->charSet));
+
+        return $value;
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel2007.php b/lib/PHPExcel/Reader/Excel2007.php
new file mode 100644
index 000000000..1932df4b6
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel2007.php
@@ -0,0 +1,2051 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Excel2007
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * PHPExcel_ReferenceHelper instance
+     *
+     * @var PHPExcel_ReferenceHelper
+     */
+    private $referenceHelper = null;
+
+    /**
+     * PHPExcel_Reader_Excel2007_Theme instance
+     *
+     * @var PHPExcel_Reader_Excel2007_Theme
+     */
+    private static $theme = null;
+
+    /**
+     * Create a new PHPExcel_Reader_Excel2007 instance
+     */
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+        $this->referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+    }
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return     boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        // Check if zip class exists
+//        if (!class_exists($zipClass, false)) {
+//            throw new PHPExcel_Reader_Exception($zipClass . " library is not enabled");
+//        }
+
+        $xl = false;
+        // Load file
+        $zip = new $zipClass;
+        if ($zip->open($pFilename) === true) {
+            // check if it is an OOXML archive
+            $rels = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "_rels/.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+            if ($rels !== false) {
+                foreach ($rels->Relationship as $rel) {
+                    switch ($rel["Type"]) {
+                        case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
+                            if (basename($rel["Target"]) == 'workbook.xml') {
+                                $xl = true;
+                            }
+                            break;
+
+                    }
+                }
+            }
+            $zip->close();
+        }
+
+        return $xl;
+    }
+
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+     *
+     * @param     string         $pFilename
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function listWorksheetNames($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $worksheetNames = array();
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
+        $zip->open($pFilename);
+
+        //    The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
+        $rels = simplexml_load_string(
+            $this->securityScan($this->getFromZipArchive($zip, "_rels/.rels"), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())
+        ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+        foreach ($rels->Relationship as $rel) {
+            switch ($rel["Type"]) {
+                case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
+                    $xmlWorkbook = simplexml_load_string(
+                        $this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}"), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())
+                    );  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+
+                    if ($xmlWorkbook->sheets) {
+                        foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                            // Check if sheet should be skipped
+                            $worksheetNames[] = (string) $eleSheet["name"];
+                        }
+                    }
+            }
+        }
+
+        $zip->close();
+
+        return $worksheetNames;
+    }
+
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param   string     $pFilename
+     * @throws   PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $worksheetInfo = array();
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
+        $zip->open($pFilename);
+
+        $rels = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "_rels/.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+        foreach ($rels->Relationship as $rel) {
+            if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
+                $dir = dirname($rel["Target"]);
+                $relsWorkbook = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                $relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
+
+                $worksheets = array();
+                foreach ($relsWorkbook->Relationship as $ele) {
+                    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
+                        $worksheets[(string) $ele["Id"]] = $ele["Target"];
+                    }
+                }
+
+                $xmlWorkbook = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+                if ($xmlWorkbook->sheets) {
+                    $dir = dirname($rel["Target"]);
+                    foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                        $tmpInfo = array(
+                            'worksheetName' => (string) $eleSheet["name"],
+                            'lastColumnLetter' => 'A',
+                            'lastColumnIndex' => 0,
+                            'totalRows' => 0,
+                            'totalColumns' => 0,
+                        );
+
+                        $fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
+
+                        $xml = new XMLReader();
+                        $res = $xml->xml($this->securityScanFile('zip://'.PHPExcel_Shared_File::realpath($pFilename).'#'."$dir/$fileWorksheet"), null, PHPExcel_Settings::getLibXmlLoaderOptions());
+                        $xml->setParserProperty(2, true);
+
+                        $currCells = 0;
+                        while ($xml->read()) {
+                            if ($xml->name == 'row' && $xml->nodeType == XMLReader::ELEMENT) {
+                                $row = $xml->getAttribute('r');
+                                $tmpInfo['totalRows'] = $row;
+                                $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                                $currCells = 0;
+                            } elseif ($xml->name == 'c' && $xml->nodeType == XMLReader::ELEMENT) {
+                                $currCells++;
+                            }
+                        }
+                        $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                        $xml->close();
+
+                        $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
+                        $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+
+                        $worksheetInfo[] = $tmpInfo;
+                    }
+                }
+            }
+        }
+
+        $zip->close();
+
+        return $worksheetInfo;
+    }
+
+    private static function castToBoolean($c)
+    {
+//        echo 'Initial Cast to Boolean', PHP_EOL;
+        $value = isset($c->v) ? (string) $c->v : null;
+        if ($value == '0') {
+            return false;
+        } elseif ($value == '1') {
+            return true;
+        } else {
+            return (bool)$c->v;
+        }
+        return $value;
+    }
+
+    private static function castToError($c)
+    {
+//        echo 'Initial Cast to Error', PHP_EOL;
+        return isset($c->v) ? (string) $c->v : null;
+    }
+
+    private static function castToString($c)
+    {
+//        echo 'Initial Cast to String, PHP_EOL;
+        return isset($c->v) ? (string) $c->v : null;
+    }
+
+    private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType)
+    {
+//        echo 'Formula', PHP_EOL;
+//        echo '$c->f is ', $c->f, PHP_EOL;
+        $cellDataType       = 'f';
+        $value              = "={$c->f}";
+        $calculatedValue    = self::$castBaseType($c);
+
+        // Shared formula?
+        if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
+//            echo 'SHARED FORMULA', PHP_EOL;
+            $instance = (string)$c->f['si'];
+
+//            echo 'Instance ID = ', $instance, PHP_EOL;
+//
+//            echo 'Shared Formula Array:', PHP_EOL;
+//            print_r($sharedFormulas);
+            if (!isset($sharedFormulas[(string)$c->f['si']])) {
+//                echo 'SETTING NEW SHARED FORMULA', PHP_EOL;
+//                echo 'Master is ', $r, PHP_EOL;
+//                echo 'Formula is ', $value, PHP_EOL;
+                $sharedFormulas[$instance] = array('master' => $r, 'formula' => $value);
+//                echo 'New Shared Formula Array:', PHP_EOL;
+//                print_r($sharedFormulas);
+            } else {
+//                echo 'GETTING SHARED FORMULA', PHP_EOL;
+//                echo 'Master is ', $sharedFormulas[$instance]['master'], PHP_EOL;
+//                echo 'Formula is ', $sharedFormulas[$instance]['formula'], PHP_EOL;
+                $master = PHPExcel_Cell::coordinateFromString($sharedFormulas[$instance]['master']);
+                $current = PHPExcel_Cell::coordinateFromString($r);
+
+                $difference = array(0, 0);
+                $difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]);
+                $difference[1] = $current[1] - $master[1];
+
+                $value = $this->referenceHelper->updateFormulaReferences($sharedFormulas[$instance]['formula'], 'A1', $difference[0], $difference[1]);
+//                echo 'Adjusted Formula is ', $value, PHP_EOL;
+            }
+        }
+    }
+
+
+    private function getFromZipArchive($archive, $fileName = '')
+    {
+        // Root-relative paths
+        if (strpos($fileName, '//') !== false) {
+            $fileName = substr($fileName, strpos($fileName, '//') + 1);
+        }
+        $fileName = PHPExcel_Shared_File::realpath($fileName);
+
+        // Sadly, some 3rd party xlsx generators don't use consistent case for filenaming
+        //    so we need to load case-insensitively from the zip file
+        
+        // Apache POI fixes
+        $contents = $archive->getFromIndex(
+            $archive->locateName($fileName, ZIPARCHIVE::FL_NOCASE)
+        );
+        if ($contents === false) {
+            $contents = $archive->getFromIndex(
+                $archive->locateName(substr($fileName, 1), ZIPARCHIVE::FL_NOCASE)
+            );
+        }
+
+        return $contents;
+    }
+
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return  PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        // Initialisations
+        $excel = new PHPExcel;
+        $excel->removeSheetByIndex(0);
+        if (!$this->readDataOnly) {
+            $excel->removeCellStyleXfByIndex(0); // remove the default style
+            $excel->removeCellXfByIndex(0); // remove the default style
+        }
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
+        $zip->open($pFilename);
+
+        //    Read the theme first, because we need the colour scheme when reading the styles
+        $wbRels = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "xl/_rels/workbook.xml.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+        foreach ($wbRels->Relationship as $rel) {
+            switch ($rel["Type"]) {
+                case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
+                    $themeOrderArray = array('lt1', 'dk1', 'lt2', 'dk2');
+                    $themeOrderAdditional = count($themeOrderArray);
+
+                    $xmlTheme = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "xl/{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                    if (is_object($xmlTheme)) {
+                        $xmlThemeName = $xmlTheme->attributes();
+                        $xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
+                        $themeName = (string)$xmlThemeName['name'];
+
+                        $colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
+                        $colourSchemeName = (string)$colourScheme['name'];
+                        $colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
+
+                        $themeColours = array();
+                        foreach ($colourScheme as $k => $xmlColour) {
+                            $themePos = array_search($k, $themeOrderArray);
+                            if ($themePos === false) {
+                                $themePos = $themeOrderAdditional++;
+                            }
+                            if (isset($xmlColour->sysClr)) {
+                                $xmlColourData = $xmlColour->sysClr->attributes();
+                                $themeColours[$themePos] = $xmlColourData['lastClr'];
+                            } elseif (isset($xmlColour->srgbClr)) {
+                                $xmlColourData = $xmlColour->srgbClr->attributes();
+                                $themeColours[$themePos] = $xmlColourData['val'];
+                            }
+                        }
+                        self::$theme = new PHPExcel_Reader_Excel2007_Theme($themeName, $colourSchemeName, $themeColours);
+                    }
+                    break;
+            }
+        }
+
+        $rels = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "_rels/.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+        foreach ($rels->Relationship as $rel) {
+            switch ($rel["Type"]) {
+                case "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties":
+                    $xmlCore = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                    if (is_object($xmlCore)) {
+                        $xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/");
+                        $xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/");
+                        $xmlCore->registerXPathNamespace("cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
+                        $docProps = $excel->getProperties();
+                        $docProps->setCreator((string) self::getArrayItem($xmlCore->xpath("dc:creator")));
+                        $docProps->setLastModifiedBy((string) self::getArrayItem($xmlCore->xpath("cp:lastModifiedBy")));
+                        $docProps->setCreated(strtotime(self::getArrayItem($xmlCore->xpath("dcterms:created")))); //! respect xsi:type
+                        $docProps->setModified(strtotime(self::getArrayItem($xmlCore->xpath("dcterms:modified")))); //! respect xsi:type
+                        $docProps->setTitle((string) self::getArrayItem($xmlCore->xpath("dc:title")));
+                        $docProps->setDescription((string) self::getArrayItem($xmlCore->xpath("dc:description")));
+                        $docProps->setSubject((string) self::getArrayItem($xmlCore->xpath("dc:subject")));
+                        $docProps->setKeywords((string) self::getArrayItem($xmlCore->xpath("cp:keywords")));
+                        $docProps->setCategory((string) self::getArrayItem($xmlCore->xpath("cp:category")));
+                    }
+                    break;
+                case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties":
+                    $xmlCore = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                    if (is_object($xmlCore)) {
+                        $docProps = $excel->getProperties();
+                        if (isset($xmlCore->Company)) {
+                            $docProps->setCompany((string) $xmlCore->Company);
+                        }
+                        if (isset($xmlCore->Manager)) {
+                            $docProps->setManager((string) $xmlCore->Manager);
+                        }
+                    }
+                    break;
+                case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties":
+                    $xmlCore = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                    if (is_object($xmlCore)) {
+                        $docProps = $excel->getProperties();
+                        foreach ($xmlCore as $xmlProperty) {
+                            $cellDataOfficeAttributes = $xmlProperty->attributes();
+                            if (isset($cellDataOfficeAttributes['name'])) {
+                                $propertyName = (string) $cellDataOfficeAttributes['name'];
+                                $cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+                                $attributeType = $cellDataOfficeChildren->getName();
+                                $attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
+                                $attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue, $attributeType);
+                                $attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType);
+                                $docProps->setCustomProperty($propertyName, $attributeValue, $attributeType);
+                            }
+                        }
+                    }
+                    break;
+                //Ribbon
+                case "http://schemas.microsoft.com/office/2006/relationships/ui/extensibility":
+                    $customUI = $rel['Target'];
+                    if (!is_null($customUI)) {
+                        $this->readRibbon($excel, $customUI, $zip);
+                    }
+                    break;
+                case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
+                    $dir = dirname($rel["Target"]);
+                    $relsWorkbook = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                    $relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
+
+                    $sharedStrings = array();
+                    $xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
+                    $xmlStrings = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "$dir/$xpath[Target]")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+                    if (isset($xmlStrings) && isset($xmlStrings->si)) {
+                        foreach ($xmlStrings->si as $val) {
+                            if (isset($val->t)) {
+                                $sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $val->t);
+                            } elseif (isset($val->r)) {
+                                $sharedStrings[] = $this->parseRichText($val);
+                            }
+                        }
+                    }
+
+                    $worksheets = array();
+                    $macros = $customUI = null;
+                    foreach ($relsWorkbook->Relationship as $ele) {
+                        switch ($ele['Type']) {
+                            case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
+                                $worksheets[(string) $ele["Id"]] = $ele["Target"];
+                                break;
+                            // a vbaProject ? (: some macros)
+                            case "http://schemas.microsoft.com/office/2006/relationships/vbaProject":
+                                $macros = $ele["Target"];
+                                break;
+                        }
+                    }
+
+                    if (!is_null($macros)) {
+                        $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin');//vbaProject.bin always in 'xl' dir and always named vbaProject.bin
+                        if ($macrosCode !== false) {
+                            $excel->setMacrosCode($macrosCode);
+                            $excel->setHasMacros(true);
+                            //short-circuit : not reading vbaProject.bin.rel to get Signature =>allways vbaProjectSignature.bin in 'xl' dir
+                            $Certificate = $this->getFromZipArchive($zip, 'xl/vbaProjectSignature.bin');
+                            if ($Certificate !== false) {
+                                $excel->setMacrosCertificate($Certificate);
+                            }
+                        }
+                    }
+                    $styles     = array();
+                    $cellStyles = array();
+                    $xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
+                    $xmlStyles = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "$dir/$xpath[Target]")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                    //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+
+                    $numFmts = null;
+                    if ($xmlStyles && $xmlStyles->numFmts[0]) {
+                        $numFmts = $xmlStyles->numFmts[0];
+                    }
+                    if (isset($numFmts) && ($numFmts !== null)) {
+                        $numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+                    }
+                    if (!$this->readDataOnly && $xmlStyles) {
+                        foreach ($xmlStyles->cellXfs->xf as $xf) {
+                            $numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+                            if ($xf["numFmtId"]) {
+                                if (isset($numFmts)) {
+                                    $tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
+
+                                    if (isset($tmpNumFmt["formatCode"])) {
+                                        $numFmt = (string) $tmpNumFmt["formatCode"];
+                                    }
+                                }
+
+                                // We shouldn't override any of the built-in MS Excel values (values below id 164)
+                                //  But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
+                                //  So we make allowance for them rather than lose formatting masks
+                                if ((int)$xf["numFmtId"] < 164 && PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]) !== '') {
+                                    $numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+                                }
+                            }
+                            $quotePrefix = false;
+                            if (isset($xf["quotePrefix"])) {
+                                $quotePrefix = (boolean) $xf["quotePrefix"];
+                            }
+
+                            $style = (object) array(
+                                "numFmt" => $numFmt,
+                                "font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
+                                "fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
+                                "border" => $xmlStyles->borders->border[intval($xf["borderId"])],
+                                "alignment" => $xf->alignment,
+                                "protection" => $xf->protection,
+                                "quotePrefix" => $quotePrefix,
+                            );
+                            $styles[] = $style;
+
+                            // add style to cellXf collection
+                            $objStyle = new PHPExcel_Style;
+                            self::readStyle($objStyle, $style);
+                            $excel->addCellXf($objStyle);
+                        }
+
+                        foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
+                            $numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+                            if ($numFmts && $xf["numFmtId"]) {
+                                $tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
+                                if (isset($tmpNumFmt["formatCode"])) {
+                                    $numFmt = (string) $tmpNumFmt["formatCode"];
+                                } elseif ((int)$xf["numFmtId"] < 165) {
+                                    $numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+                                }
+                            }
+
+                            $cellStyle = (object) array(
+                                "numFmt" => $numFmt,
+                                "font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
+                                "fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
+                                "border" => $xmlStyles->borders->border[intval($xf["borderId"])],
+                                "alignment" => $xf->alignment,
+                                "protection" => $xf->protection,
+                                "quotePrefix" => $quotePrefix,
+                            );
+                            $cellStyles[] = $cellStyle;
+
+                            // add style to cellStyleXf collection
+                            $objStyle = new PHPExcel_Style;
+                            self::readStyle($objStyle, $cellStyle);
+                            $excel->addCellStyleXf($objStyle);
+                        }
+                    }
+
+                    $dxfs = array();
+                    if (!$this->readDataOnly && $xmlStyles) {
+                        //    Conditional Styles
+                        if ($xmlStyles->dxfs) {
+                            foreach ($xmlStyles->dxfs->dxf as $dxf) {
+                                $style = new PHPExcel_Style(false, true);
+                                self::readStyle($style, $dxf);
+                                $dxfs[] = $style;
+                            }
+                        }
+                        //    Cell Styles
+                        if ($xmlStyles->cellStyles) {
+                            foreach ($xmlStyles->cellStyles->cellStyle as $cellStyle) {
+                                if (intval($cellStyle['builtinId']) == 0) {
+                                    if (isset($cellStyles[intval($cellStyle['xfId'])])) {
+                                        // Set default style
+                                        $style = new PHPExcel_Style;
+                                        self::readStyle($style, $cellStyles[intval($cellStyle['xfId'])]);
+
+                                        // normal style, currently not using it for anything
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    $xmlWorkbook = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+
+                    // Set base date
+                    if ($xmlWorkbook->workbookPr) {
+                        PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
+                        if (isset($xmlWorkbook->workbookPr['date1904'])) {
+                            if (self::boolean((string) $xmlWorkbook->workbookPr['date1904'])) {
+                                PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
+                            }
+                        }
+                    }
+
+                    $sheetId = 0; // keep track of new sheet id in final workbook
+                    $oldSheetId = -1; // keep track of old sheet id in final workbook
+                    $countSkippedSheets = 0; // keep track of number of skipped sheets
+                    $mapSheetId = array(); // mapping of sheet ids from old to new
+
+                    $charts = $chartDetails = array();
+
+                    if ($xmlWorkbook->sheets) {
+                        foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                            ++$oldSheetId;
+
+                            // Check if sheet should be skipped
+                            if (isset($this->loadSheetsOnly) && !in_array((string) $eleSheet["name"], $this->loadSheetsOnly)) {
+                                ++$countSkippedSheets;
+                                $mapSheetId[$oldSheetId] = null;
+                                continue;
+                            }
+
+                            // Map old sheet id in original workbook to new sheet id.
+                            // They will differ if loadSheetsOnly() is being used
+                            $mapSheetId[$oldSheetId] = $oldSheetId - $countSkippedSheets;
+
+                            // Load sheet
+                            $docSheet = $excel->createSheet();
+                            //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet
+                            //        references in formula cells... during the load, all formulae should be correct,
+                            //        and we're simply bringing the worksheet name in line with the formula, not the
+                            //        reverse
+                            $docSheet->setTitle((string) $eleSheet["name"], false);
+                            $fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
+                            $xmlSheet = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "$dir/$fileWorksheet")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+
+                            $sharedFormulas = array();
+
+                            if (isset($eleSheet["state"]) && (string) $eleSheet["state"] != '') {
+                                $docSheet->setSheetState((string) $eleSheet["state"]);
+                            }
+
+                            if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
+                                if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
+                                    $docSheet->getSheetView()->setZoomScale(intval($xmlSheet->sheetViews->sheetView['zoomScale']));
+                                }
+                                if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
+                                    $docSheet->getSheetView()->setZoomScaleNormal(intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']));
+                                }
+                                if (isset($xmlSheet->sheetViews->sheetView['view'])) {
+                                    $docSheet->getSheetView()->setView((string) $xmlSheet->sheetViews->sheetView['view']);
+                                }
+                                if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
+                                    $docSheet->setShowGridLines(self::boolean((string)$xmlSheet->sheetViews->sheetView['showGridLines']));
+                                }
+                                if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
+                                    $docSheet->setShowRowColHeaders(self::boolean((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders']));
+                                }
+                                if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
+                                    $docSheet->setRightToLeft(self::boolean((string)$xmlSheet->sheetViews->sheetView['rightToLeft']));
+                                }
+                                if (isset($xmlSheet->sheetViews->sheetView->pane)) {
+                                    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
+                                        $docSheet->freezePane((string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell']);
+                                    } else {
+                                        $xSplit = 0;
+                                        $ySplit = 0;
+
+                                        if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
+                                            $xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
+                                        }
+
+                                        if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
+                                            $ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
+                                        }
+
+                                        $docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
+                                    }
+                                }
+
+                                if (isset($xmlSheet->sheetViews->sheetView->selection)) {
+                                    if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
+                                        $sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
+                                        $sqref = explode(' ', $sqref);
+                                        $sqref = $sqref[0];
+                                        $docSheet->setSelectedCells($sqref);
+                                    }
+                                }
+                            }
+
+                            if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
+                                if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
+                                    $docSheet->getTabColor()->setARGB((string)$xmlSheet->sheetPr->tabColor['rgb']);
+                                }
+                            }
+                            if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr['codeName'])) {
+                                $docSheet->setCodeName((string) $xmlSheet->sheetPr['codeName']);
+                            }
+                            if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->outlinePr)) {
+                                if (isset($xmlSheet->sheetPr->outlinePr['summaryRight']) &&
+                                    !self::boolean((string) $xmlSheet->sheetPr->outlinePr['summaryRight'])) {
+                                    $docSheet->setShowSummaryRight(false);
+                                } else {
+                                    $docSheet->setShowSummaryRight(true);
+                                }
+
+                                if (isset($xmlSheet->sheetPr->outlinePr['summaryBelow']) &&
+                                    !self::boolean((string) $xmlSheet->sheetPr->outlinePr['summaryBelow'])) {
+                                    $docSheet->setShowSummaryBelow(false);
+                                } else {
+                                    $docSheet->setShowSummaryBelow(true);
+                                }
+                            }
+
+                            if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->pageSetUpPr)) {
+                                if (isset($xmlSheet->sheetPr->pageSetUpPr['fitToPage']) &&
+                                    !self::boolean((string) $xmlSheet->sheetPr->pageSetUpPr['fitToPage'])) {
+                                    $docSheet->getPageSetup()->setFitToPage(false);
+                                } else {
+                                    $docSheet->getPageSetup()->setFitToPage(true);
+                                }
+                            }
+
+                            if (isset($xmlSheet->sheetFormatPr)) {
+                                if (isset($xmlSheet->sheetFormatPr['customHeight']) &&
+                                    self::boolean((string) $xmlSheet->sheetFormatPr['customHeight']) &&
+                                    isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
+                                    $docSheet->getDefaultRowDimension()->setRowHeight((float)$xmlSheet->sheetFormatPr['defaultRowHeight']);
+                                }
+                                if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
+                                    $docSheet->getDefaultColumnDimension()->setWidth((float)$xmlSheet->sheetFormatPr['defaultColWidth']);
+                                }
+                                if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
+                                    ((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
+                                    $docSheet->getDefaultRowDimension()->setZeroHeight(true);
+                                }
+                            }
+
+                            if (isset($xmlSheet->cols) && !$this->readDataOnly) {
+                                foreach ($xmlSheet->cols->col as $col) {
+                                    for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) {
+                                        if ($col["style"] && !$this->readDataOnly) {
+                                            $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"]));
+                                        }
+                                        if (self::boolean($col["bestFit"])) {
+                                            //$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setAutoSize(true);
+                                        }
+                                        if (self::boolean($col["hidden"])) {
+                                        // echo PHPExcel_Cell::stringFromColumnIndex($i), ': HIDDEN COLUMN',PHP_EOL;
+                                            $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setVisible(false);
+                                        }
+                                        if (self::boolean($col["collapsed"])) {
+                                            $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setCollapsed(true);
+                                        }
+                                        if ($col["outlineLevel"] > 0) {
+                                            $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setOutlineLevel(intval($col["outlineLevel"]));
+                                        }
+                                        $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setWidth(floatval($col["width"]));
+
+                                        if (intval($col["max"]) == 16384) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (isset($xmlSheet->printOptions) && !$this->readDataOnly) {
+                                if (self::boolean((string) $xmlSheet->printOptions['gridLinesSet'])) {
+                                    $docSheet->setShowGridlines(true);
+                                }
+                                if (self::boolean((string) $xmlSheet->printOptions['gridLines'])) {
+                                    $docSheet->setPrintGridlines(true);
+                                }
+                                if (self::boolean((string) $xmlSheet->printOptions['horizontalCentered'])) {
+                                    $docSheet->getPageSetup()->setHorizontalCentered(true);
+                                }
+                                if (self::boolean((string) $xmlSheet->printOptions['verticalCentered'])) {
+                                    $docSheet->getPageSetup()->setVerticalCentered(true);
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
+                                foreach ($xmlSheet->sheetData->row as $row) {
+                                    if ($row["ht"] && !$this->readDataOnly) {
+                                        $docSheet->getRowDimension(intval($row["r"]))->setRowHeight(floatval($row["ht"]));
+                                    }
+                                    if (self::boolean($row["hidden"]) && !$this->readDataOnly) {
+                                        $docSheet->getRowDimension(intval($row["r"]))->setVisible(false);
+                                    }
+                                    if (self::boolean($row["collapsed"])) {
+                                        $docSheet->getRowDimension(intval($row["r"]))->setCollapsed(true);
+                                    }
+                                    if ($row["outlineLevel"] > 0) {
+                                        $docSheet->getRowDimension(intval($row["r"]))->setOutlineLevel(intval($row["outlineLevel"]));
+                                    }
+                                    if ($row["s"] && !$this->readDataOnly) {
+                                        $docSheet->getRowDimension(intval($row["r"]))->setXfIndex(intval($row["s"]));
+                                    }
+
+                                    foreach ($row->c as $c) {
+                                        $r                     = (string) $c["r"];
+                                        $cellDataType         = (string) $c["t"];
+                                        $value                = null;
+                                        $calculatedValue     = null;
+
+                                        // Read cell?
+                                        if ($this->getReadFilter() !== null) {
+                                            $coordinates = PHPExcel_Cell::coordinateFromString($r);
+
+                                            if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
+                                                continue;
+                                            }
+                                        }
+
+    //                                    echo 'Reading cell ', $coordinates[0], $coordinates[1], PHP_EOL;
+    //                                    print_r($c);
+    //                                    echo PHP_EOL;
+    //                                    echo 'Cell Data Type is ', $cellDataType, ': ';
+    //
+                                        // Read cell!
+                                        switch ($cellDataType) {
+                                            case "s":
+    //                                            echo 'String', PHP_EOL;
+                                                if ((string)$c->v != '') {
+                                                    $value = $sharedStrings[intval($c->v)];
+
+                                                    if ($value instanceof PHPExcel_RichText) {
+                                                        $value = clone $value;
+                                                    }
+                                                } else {
+                                                    $value = '';
+                                                }
+                                                break;
+                                            case "b":
+    //                                            echo 'Boolean', PHP_EOL;
+                                                if (!isset($c->f)) {
+                                                    $value = self::castToBoolean($c);
+                                                } else {
+                                                    // Formula
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToBoolean');
+                                                    if (isset($c->f['t'])) {
+                                                        $att = array();
+                                                        $att = $c->f;
+                                                        $docSheet->getCell($r)->setFormulaAttributes($att);
+                                                    }
+    //                                                echo '$calculatedValue = ', $calculatedValue, PHP_EOL;
+                                                }
+                                                break;
+                                            case "inlineStr":
+//                                                echo 'Inline String', PHP_EOL;
+                                                if (isset($c->f)) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                } else {
+                                                    $value = $this->parseRichText($c->is);
+                                                }
+                                                break;
+                                            case "e":
+    //                                            echo 'Error', PHP_EOL;
+                                                if (!isset($c->f)) {
+                                                    $value = self::castToError($c);
+                                                } else {
+                                                    // Formula
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+    //                                                echo '$calculatedValue = ', $calculatedValue, PHP_EOL;
+                                                }
+                                                break;
+                                            default:
+//                                                echo 'Default', PHP_EOL;
+                                                if (!isset($c->f)) {
+    //                                                echo 'Not a Formula', PHP_EOL;
+                                                    $value = self::castToString($c);
+                                                } else {
+    //                                                echo 'Treat as Formula', PHP_EOL;
+                                                    // Formula
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToString');
+    //                                                echo '$calculatedValue = ', $calculatedValue, PHP_EOL;
+                                                }
+                                                break;
+                                        }
+    //                                    echo 'Value is ', $value, PHP_EOL;
+
+                                        // Check for numeric values
+                                        if (is_numeric($value) && $cellDataType != 's') {
+                                            if ($value == (int)$value) {
+                                                $value = (int)$value;
+                                            } elseif ($value == (float)$value) {
+                                                $value = (float)$value;
+                                            } elseif ($value == (double)$value) {
+                                                $value = (double)$value;
+                                            }
+                                        }
+
+                                        // Rich text?
+                                        if ($value instanceof PHPExcel_RichText && $this->readDataOnly) {
+                                            $value = $value->getPlainText();
+                                        }
+
+                                        $cell = $docSheet->getCell($r);
+                                        // Assign value
+                                        if ($cellDataType != '') {
+                                            $cell->setValueExplicit($value, $cellDataType);
+                                        } else {
+                                            $cell->setValue($value);
+                                        }
+                                        if ($calculatedValue !== null) {
+                                            $cell->setCalculatedValue($calculatedValue);
+                                        }
+
+                                        // Style information?
+                                        if ($c["s"] && !$this->readDataOnly) {
+                                            // no style index means 0, it seems
+                                            $cell->setXfIndex(isset($styles[intval($c["s"])]) ?
+                                                intval($c["s"]) : 0);
+                                        }
+                                    }
+                                }
+                            }
+
+                            $conditionals = array();
+                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
+                                foreach ($xmlSheet->conditionalFormatting as $conditional) {
+                                    foreach ($conditional->cfRule as $cfRule) {
+                                        if (((string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE || (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS || (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT || (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) && isset($dxfs[intval($cfRule["dxfId"])])) {
+                                            $conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
+                                        }
+                                    }
+                                }
+
+                                foreach ($conditionals as $ref => $cfRules) {
+                                    ksort($cfRules);
+                                    $conditionalStyles = array();
+                                    foreach ($cfRules as $cfRule) {
+                                        $objConditional = new PHPExcel_Style_Conditional();
+                                        $objConditional->setConditionType((string)$cfRule["type"]);
+                                        $objConditional->setOperatorType((string)$cfRule["operator"]);
+
+                                        if ((string)$cfRule["text"] != '') {
+                                            $objConditional->setText((string)$cfRule["text"]);
+                                        }
+
+                                        if (count($cfRule->formula) > 1) {
+                                            foreach ($cfRule->formula as $formula) {
+                                                $objConditional->addCondition((string)$formula);
+                                            }
+                                        } else {
+                                            $objConditional->addCondition((string)$cfRule->formula);
+                                        }
+                                        $objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
+                                        $conditionalStyles[] = $objConditional;
+                                    }
+
+                                    // Extract all cell references in $ref
+                                    $cellBlocks = explode(' ', str_replace('$', '', strtoupper($ref)));
+                                    foreach ($cellBlocks as $cellBlock) {
+                                        $docSheet->getStyle($cellBlock)->setConditionalStyles($conditionalStyles);
+                                    }
+                                }
+                            }
+
+                            $aKeys = array("sheet", "objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells");
+                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+                                foreach ($aKeys as $key) {
+                                    $method = "set" . ucfirst($key);
+                                    $docSheet->getProtection()->$method(self::boolean((string) $xmlSheet->sheetProtection[$key]));
+                                }
+                            }
+
+                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+                                $docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection["password"], true);
+                                if ($xmlSheet->protectedRanges->protectedRange) {
+                                    foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
+                                        $docSheet->protectCells((string) $protectedRange["sqref"], (string) $protectedRange["password"], true);
+                                    }
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->autoFilter && !$this->readDataOnly) {
+                                $autoFilterRange = (string) $xmlSheet->autoFilter["ref"];
+                                if (strpos($autoFilterRange, ':') !== false) {
+                                    $autoFilter = $docSheet->getAutoFilter();
+                                    $autoFilter->setRange($autoFilterRange);
+
+                                    foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
+                                        $column = $autoFilter->getColumnByOffset((integer) $filterColumn["colId"]);
+                                        //    Check for standard filters
+                                        if ($filterColumn->filters) {
+                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER);
+                                            $filters = $filterColumn->filters;
+                                            if ((isset($filters["blank"])) && ($filters["blank"] == 1)) {
+                                                //    Operator is undefined, but always treated as EQUAL
+                                                $column->createRule()->setRule(null, '')->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
+                                            }
+                                            //    Standard filters are always an OR join, so no join rule needs to be set
+                                            //    Entries can be either filter elements
+                                            foreach ($filters->filter as $filterRule) {
+                                                //    Operator is undefined, but always treated as EQUAL
+                                                $column->createRule()->setRule(null, (string) $filterRule["val"])->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
+                                            }
+                                            //    Or Date Group elements
+                                            foreach ($filters->dateGroupItem as $dateGroupItem) {
+                                                $column->createRule()->setRule(
+                                                    //    Operator is undefined, but always treated as EQUAL
+                                                    null,
+                                                    array(
+                                                        'year' => (string) $dateGroupItem["year"],
+                                                        'month' => (string) $dateGroupItem["month"],
+                                                        'day' => (string) $dateGroupItem["day"],
+                                                        'hour' => (string) $dateGroupItem["hour"],
+                                                        'minute' => (string) $dateGroupItem["minute"],
+                                                        'second' => (string) $dateGroupItem["second"],
+                                                    ),
+                                                    (string) $dateGroupItem["dateTimeGrouping"]
+                                                )
+                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP);
+                                            }
+                                        }
+                                        //    Check for custom filters
+                                        if ($filterColumn->customFilters) {
+                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
+                                            $customFilters = $filterColumn->customFilters;
+                                            //    Custom filters can an AND or an OR join;
+                                            //        and there should only ever be one or two entries
+                                            if ((isset($customFilters["and"])) && ($customFilters["and"] == 1)) {
+                                                $column->setJoin(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
+                                            }
+                                            foreach ($customFilters->customFilter as $filterRule) {
+                                                $column->createRule()->setRule(
+                                                    (string) $filterRule["operator"],
+                                                    (string) $filterRule["val"]
+                                                )
+                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
+                                            }
+                                        }
+                                        //    Check for dynamic filters
+                                        if ($filterColumn->dynamicFilter) {
+                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
+                                            //    We should only ever have one dynamic filter
+                                            foreach ($filterColumn->dynamicFilter as $filterRule) {
+                                                $column->createRule()->setRule(
+                                                    //    Operator is undefined, but always treated as EQUAL
+                                                    null,
+                                                    (string) $filterRule["val"],
+                                                    (string) $filterRule["type"]
+                                                )
+                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
+                                                if (isset($filterRule["val"])) {
+                                                    $column->setAttribute('val', (string) $filterRule["val"]);
+                                                }
+                                                if (isset($filterRule["maxVal"])) {
+                                                    $column->setAttribute('maxVal', (string) $filterRule["maxVal"]);
+                                                }
+                                            }
+                                        }
+                                        //    Check for dynamic filters
+                                        if ($filterColumn->top10) {
+                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
+                                            //    We should only ever have one top10 filter
+                                            foreach ($filterColumn->top10 as $filterRule) {
+                                                $column->createRule()->setRule(
+                                                    (((isset($filterRule["percent"])) && ($filterRule["percent"] == 1))
+                                                        ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
+                                                        : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
+                                                    ),
+                                                    (string) $filterRule["val"],
+                                                    (((isset($filterRule["top"])) && ($filterRule["top"] == 1))
+                                                        ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
+                                                        : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
+                                                    )
+                                                )
+                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->readDataOnly) {
+                                foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
+                                    $mergeRef = (string) $mergeCell["ref"];
+                                    if (strpos($mergeRef, ':') !== false) {
+                                        $docSheet->mergeCells((string) $mergeCell["ref"]);
+                                    }
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->pageMargins && !$this->readDataOnly) {
+                                $docPageMargins = $docSheet->getPageMargins();
+                                $docPageMargins->setLeft(floatval($xmlSheet->pageMargins["left"]));
+                                $docPageMargins->setRight(floatval($xmlSheet->pageMargins["right"]));
+                                $docPageMargins->setTop(floatval($xmlSheet->pageMargins["top"]));
+                                $docPageMargins->setBottom(floatval($xmlSheet->pageMargins["bottom"]));
+                                $docPageMargins->setHeader(floatval($xmlSheet->pageMargins["header"]));
+                                $docPageMargins->setFooter(floatval($xmlSheet->pageMargins["footer"]));
+                            }
+
+                            if ($xmlSheet && $xmlSheet->pageSetup && !$this->readDataOnly) {
+                                $docPageSetup = $docSheet->getPageSetup();
+
+                                if (isset($xmlSheet->pageSetup["orientation"])) {
+                                    $docPageSetup->setOrientation((string) $xmlSheet->pageSetup["orientation"]);
+                                }
+                                if (isset($xmlSheet->pageSetup["paperSize"])) {
+                                    $docPageSetup->setPaperSize(intval($xmlSheet->pageSetup["paperSize"]));
+                                }
+                                if (isset($xmlSheet->pageSetup["scale"])) {
+                                    $docPageSetup->setScale(intval($xmlSheet->pageSetup["scale"]), false);
+                                }
+                                if (isset($xmlSheet->pageSetup["fitToHeight"]) && intval($xmlSheet->pageSetup["fitToHeight"]) >= 0) {
+                                    $docPageSetup->setFitToHeight(intval($xmlSheet->pageSetup["fitToHeight"]), false);
+                                }
+                                if (isset($xmlSheet->pageSetup["fitToWidth"]) && intval($xmlSheet->pageSetup["fitToWidth"]) >= 0) {
+                                    $docPageSetup->setFitToWidth(intval($xmlSheet->pageSetup["fitToWidth"]), false);
+                                }
+                                if (isset($xmlSheet->pageSetup["firstPageNumber"]) && isset($xmlSheet->pageSetup["useFirstPageNumber"]) &&
+                                    self::boolean((string) $xmlSheet->pageSetup["useFirstPageNumber"])) {
+                                    $docPageSetup->setFirstPageNumber(intval($xmlSheet->pageSetup["firstPageNumber"]));
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->headerFooter && !$this->readDataOnly) {
+                                $docHeaderFooter = $docSheet->getHeaderFooter();
+
+                                if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
+                                    self::boolean((string)$xmlSheet->headerFooter["differentOddEven"])) {
+                                    $docHeaderFooter->setDifferentOddEven(true);
+                                } else {
+                                    $docHeaderFooter->setDifferentOddEven(false);
+                                }
+                                if (isset($xmlSheet->headerFooter["differentFirst"]) &&
+                                    self::boolean((string)$xmlSheet->headerFooter["differentFirst"])) {
+                                    $docHeaderFooter->setDifferentFirst(true);
+                                } else {
+                                    $docHeaderFooter->setDifferentFirst(false);
+                                }
+                                if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
+                                    !self::boolean((string)$xmlSheet->headerFooter["scaleWithDoc"])) {
+                                    $docHeaderFooter->setScaleWithDocument(false);
+                                } else {
+                                    $docHeaderFooter->setScaleWithDocument(true);
+                                }
+                                if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
+                                    !self::boolean((string)$xmlSheet->headerFooter["alignWithMargins"])) {
+                                    $docHeaderFooter->setAlignWithMargins(false);
+                                } else {
+                                    $docHeaderFooter->setAlignWithMargins(true);
+                                }
+
+                                $docHeaderFooter->setOddHeader((string) $xmlSheet->headerFooter->oddHeader);
+                                $docHeaderFooter->setOddFooter((string) $xmlSheet->headerFooter->oddFooter);
+                                $docHeaderFooter->setEvenHeader((string) $xmlSheet->headerFooter->evenHeader);
+                                $docHeaderFooter->setEvenFooter((string) $xmlSheet->headerFooter->evenFooter);
+                                $docHeaderFooter->setFirstHeader((string) $xmlSheet->headerFooter->firstHeader);
+                                $docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
+                            }
+
+                            if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && !$this->readDataOnly) {
+                                foreach ($xmlSheet->rowBreaks->brk as $brk) {
+                                    if ($brk["man"]) {
+                                        $docSheet->setBreak("A$brk[id]", PHPExcel_Worksheet::BREAK_ROW);
+                                    }
+                                }
+                            }
+                            if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->readDataOnly) {
+                                foreach ($xmlSheet->colBreaks->brk as $brk) {
+                                    if ($brk["man"]) {
+                                        $docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex((string) $brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
+                                    }
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->dataValidations && !$this->readDataOnly) {
+                                foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
+                                    // Uppercase coordinate
+                                    $range = strtoupper($dataValidation["sqref"]);
+                                    $rangeSet = explode(' ', $range);
+                                    foreach ($rangeSet as $range) {
+                                        $stRange = $docSheet->shrinkRangeToFit($range);
+
+                                        // Extract all cell references in $range
+                                        foreach (PHPExcel_Cell::extractAllCellReferencesInRange($stRange) as $reference) {
+                                            // Create validation
+                                            $docValidation = $docSheet->getCell($reference)->getDataValidation();
+                                            $docValidation->setType((string) $dataValidation["type"]);
+                                            $docValidation->setErrorStyle((string) $dataValidation["errorStyle"]);
+                                            $docValidation->setOperator((string) $dataValidation["operator"]);
+                                            $docValidation->setAllowBlank($dataValidation["allowBlank"] != 0);
+                                            $docValidation->setShowDropDown($dataValidation["showDropDown"] == 0);
+                                            $docValidation->setShowInputMessage($dataValidation["showInputMessage"] != 0);
+                                            $docValidation->setShowErrorMessage($dataValidation["showErrorMessage"] != 0);
+                                            $docValidation->setErrorTitle((string) $dataValidation["errorTitle"]);
+                                            $docValidation->setError((string) $dataValidation["error"]);
+                                            $docValidation->setPromptTitle((string) $dataValidation["promptTitle"]);
+                                            $docValidation->setPrompt((string) $dataValidation["prompt"]);
+                                            $docValidation->setFormula1((string) $dataValidation->formula1);
+                                            $docValidation->setFormula2((string) $dataValidation->formula2);
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Add hyperlinks
+                            $hyperlinks = array();
+                            if (!$this->readDataOnly) {
+                                // Locate hyperlink relations
+                                if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
+                                    $relsWorksheet = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                                    foreach ($relsWorksheet->Relationship as $ele) {
+                                        if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
+                                            $hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
+                                        }
+                                    }
+                                }
+
+                                // Loop through hyperlinks
+                                if ($xmlSheet && $xmlSheet->hyperlinks) {
+                                    foreach ($xmlSheet->hyperlinks->hyperlink as $hyperlink) {
+                                        // Link url
+                                        $linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+
+                                        foreach (PHPExcel_Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
+                                            $cell = $docSheet->getCell($cellReference);
+                                            if (isset($linkRel['id'])) {
+                                                $hyperlinkUrl = $hyperlinks[ (string)$linkRel['id'] ];
+                                                if (isset($hyperlink['location'])) {
+                                                    $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
+                                                }
+                                                $cell->getHyperlink()->setUrl($hyperlinkUrl);
+                                            } elseif (isset($hyperlink['location'])) {
+                                                $cell->getHyperlink()->setUrl('sheet://' . (string)$hyperlink['location']);
+                                            }
+
+                                            // Tooltip
+                                            if (isset($hyperlink['tooltip'])) {
+                                                $cell->getHyperlink()->setTooltip((string)$hyperlink['tooltip']);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Add comments
+                            $comments = array();
+                            $vmlComments = array();
+                            if (!$this->readDataOnly) {
+                                // Locate comment relations
+                                if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
+                                    $relsWorksheet = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                                    foreach ($relsWorksheet->Relationship as $ele) {
+                                        if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
+                                            $comments[(string)$ele["Id"]] = (string)$ele["Target"];
+                                        }
+                                        if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
+                                            $vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
+                                        }
+                                    }
+                                }
+
+                                // Loop through comments
+                                foreach ($comments as $relName => $relPath) {
+                                    // Load comments file
+                                    $relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
+                                    $commentsFile = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, $relPath)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+
+                                    // Utility variables
+                                    $authors = array();
+
+                                    // Loop through authors
+                                    foreach ($commentsFile->authors->author as $author) {
+                                        $authors[] = (string)$author;
+                                    }
+
+                                    // Loop through contents
+                                    foreach ($commentsFile->commentList->comment as $comment) {
+                                        if (!empty($comment['authorId'])) {
+                                            $docSheet->getComment((string)$comment['ref'])->setAuthor($authors[(string)$comment['authorId']]);
+                                        }
+                                        $docSheet->getComment((string)$comment['ref'])->setText($this->parseRichText($comment->text));
+                                    }
+                                }
+
+                                // Loop through VML comments
+                                foreach ($vmlComments as $relName => $relPath) {
+                                    // Load VML comments file
+                                    $relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
+                                    $vmlCommentsFile = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, $relPath)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                                    $vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+
+                                    $shapes = $vmlCommentsFile->xpath('//v:shape');
+                                    foreach ($shapes as $shape) {
+                                        $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+
+                                        if (isset($shape['style'])) {
+                                            $style        = (string)$shape['style'];
+                                            $fillColor    = strtoupper(substr((string)$shape['fillcolor'], 1));
+                                            $column       = null;
+                                            $row          = null;
+
+                                            $clientData   = $shape->xpath('.//x:ClientData');
+                                            if (is_array($clientData) && !empty($clientData)) {
+                                                $clientData   = $clientData[0];
+
+                                                if (isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note') {
+                                                    $temp = $clientData->xpath('.//x:Row');
+                                                    if (is_array($temp)) {
+                                                        $row = $temp[0];
+                                                    }
+
+                                                    $temp = $clientData->xpath('.//x:Column');
+                                                    if (is_array($temp)) {
+                                                        $column = $temp[0];
+                                                    }
+                                                }
+                                            }
+
+                                            if (($column !== null) && ($row !== null)) {
+                                                // Set comment properties
+                                                $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
+                                                $comment->getFillColor()->setRGB($fillColor);
+
+                                                // Parse style
+                                                $styleArray = explode(';', str_replace(' ', '', $style));
+                                                foreach ($styleArray as $stylePair) {
+                                                    $stylePair = explode(':', $stylePair);
+
+                                                    if ($stylePair[0] == 'margin-left') {
+                                                        $comment->setMarginLeft($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'margin-top') {
+                                                        $comment->setMarginTop($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'width') {
+                                                        $comment->setWidth($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'height') {
+                                                        $comment->setHeight($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'visibility') {
+                                                        $comment->setVisible($stylePair[1] == 'visible');
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                // Header/footer images
+                                if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->readDataOnly) {
+                                    if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
+                                        $relsWorksheet = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                                        $vmlRelationship = '';
+
+                                        foreach ($relsWorksheet->Relationship as $ele) {
+                                            if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
+                                                $vmlRelationship = self::dirAdd("$dir/$fileWorksheet", $ele["Target"]);
+                                            }
+                                        }
+
+                                        if ($vmlRelationship != '') {
+                                            // Fetch linked images
+                                            $relsVML = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels')), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                                            $drawings = array();
+                                            foreach ($relsVML->Relationship as $ele) {
+                                                if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
+                                                    $drawings[(string) $ele["Id"]] = self::dirAdd($vmlRelationship, $ele["Target"]);
+                                                }
+                                            }
+
+                                            // Fetch VML document
+                                            $vmlDrawing = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, $vmlRelationship)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                                            $vmlDrawing->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+
+                                            $hfImages = array();
+
+                                            $shapes = $vmlDrawing->xpath('//v:shape');
+                                            foreach ($shapes as $idx => $shape) {
+                                                $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+                                                $imageData = $shape->xpath('//v:imagedata');
+                                                $imageData = $imageData[$idx];
+
+                                                $imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
+                                                $style = self::toCSSArray((string)$shape['style']);
+
+                                                $hfImages[ (string)$shape['id'] ] = new PHPExcel_Worksheet_HeaderFooterDrawing();
+                                                if (isset($imageData['title'])) {
+                                                    $hfImages[ (string)$shape['id'] ]->setName((string)$imageData['title']);
+                                                }
+
+                                                $hfImages[ (string)$shape['id'] ]->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $drawings[(string)$imageData['relid']], false);
+                                                $hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
+                                                $hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
+                                                $hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
+                                                if (isset($style['margin-left'])) {
+                                                    $hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
+                                                }
+                                                $hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
+                                                $hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
+                                            }
+
+                                            $docSheet->getHeaderFooter()->setImages($hfImages);
+                                        }
+                                    }
+                                }
+
+                            }
+
+                            // TODO: Autoshapes from twoCellAnchors!
+                            if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
+                                $relsWorksheet = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                                $drawings = array();
+                                foreach ($relsWorksheet->Relationship as $ele) {
+                                    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing") {
+                                        $drawings[(string) $ele["Id"]] = self::dirAdd("$dir/$fileWorksheet", $ele["Target"]);
+                                    }
+                                }
+                                if ($xmlSheet->drawing && !$this->readDataOnly) {
+                                    foreach ($xmlSheet->drawing as $drawing) {
+                                        $fileDrawing = $drawings[(string) self::getArrayItem($drawing->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
+                                        $relsDrawing = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, dirname($fileDrawing) . "/_rels/" . basename($fileDrawing) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+                                        $images = array();
+
+                                        if ($relsDrawing && $relsDrawing->Relationship) {
+                                            foreach ($relsDrawing->Relationship as $ele) {
+                                                if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
+                                                    $images[(string) $ele["Id"]] = self::dirAdd($fileDrawing, $ele["Target"]);
+                                                } elseif ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart") {
+                                                    if ($this->includeCharts) {
+                                                        $charts[self::dirAdd($fileDrawing, $ele["Target"])] = array(
+                                                            'id'        => (string) $ele["Id"],
+                                                            'sheet'    => $docSheet->getTitle()
+                                                        );
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        $xmlDrawing = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, $fileDrawing)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())->children("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
+
+                                        if ($xmlDrawing->oneCellAnchor) {
+                                            foreach ($xmlDrawing->oneCellAnchor as $oneCellAnchor) {
+                                                if ($oneCellAnchor->pic->blipFill) {
+                                                    $blip = $oneCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
+                                                    $xfrm = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
+                                                    $outerShdw = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
+                                                    $objDrawing = new PHPExcel_Worksheet_Drawing;
+                                                    $objDrawing->setName((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
+                                                    $objDrawing->setDescription((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
+                                                    $objDrawing->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $images[(string) self::getArrayItem($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+                                                    $objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
+                                                    $objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
+                                                    $objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
+                                                    $objDrawing->setResizeProportional(false);
+                                                    $objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), "cx")));
+                                                    $objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), "cy")));
+                                                    if ($xfrm) {
+                                                        $objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::getArrayItem($xfrm->attributes(), "rot")));
+                                                    }
+                                                    if ($outerShdw) {
+                                                        $shadow = $objDrawing->getShadow();
+                                                        $shadow->setVisible(true);
+                                                        $shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::getArrayItem($outerShdw->attributes(), "blurRad")));
+                                                        $shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::getArrayItem($outerShdw->attributes(), "dist")));
+                                                        $shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::getArrayItem($outerShdw->attributes(), "dir")));
+                                                        $shadow->setAlignment((string) self::getArrayItem($outerShdw->attributes(), "algn"));
+                                                        $shadow->getColor()->setRGB(self::getArrayItem($outerShdw->srgbClr->attributes(), "val"));
+                                                        $shadow->setAlpha(self::getArrayItem($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
+                                                    }
+                                                    $objDrawing->setWorksheet($docSheet);
+                                                } else {
+                                                    //    ? Can charts be positioned with a oneCellAnchor ?
+                                                    $coordinates    = PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
+                                                    $offsetX        = PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
+                                                    $offsetY        = PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
+                                                    $width          = PHPExcel_Shared_Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), "cx"));
+                                                    $height         = PHPExcel_Shared_Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), "cy"));
+                                                }
+                                            }
+                                        }
+                                        if ($xmlDrawing->twoCellAnchor) {
+                                            foreach ($xmlDrawing->twoCellAnchor as $twoCellAnchor) {
+                                                if ($twoCellAnchor->pic->blipFill) {
+                                                    $blip = $twoCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
+                                                    $xfrm = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
+                                                    $outerShdw = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
+                                                    $objDrawing = new PHPExcel_Worksheet_Drawing;
+                                                    $objDrawing->setName((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
+                                                    $objDrawing->setDescription((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
+                                                    $objDrawing->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $images[(string) self::getArrayItem($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+                                                    $objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
+                                                    $objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
+                                                    $objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
+                                                    $objDrawing->setResizeProportional(false);
+
+                                                    if ($xfrm) {
+                                                        $objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::getArrayItem($xfrm->ext->attributes(), "cx")));
+                                                        $objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::getArrayItem($xfrm->ext->attributes(), "cy")));
+                                                        $objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::getArrayItem($xfrm->attributes(), "rot")));
+                                                    }
+                                                    if ($outerShdw) {
+                                                        $shadow = $objDrawing->getShadow();
+                                                        $shadow->setVisible(true);
+                                                        $shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::getArrayItem($outerShdw->attributes(), "blurRad")));
+                                                        $shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::getArrayItem($outerShdw->attributes(), "dist")));
+                                                        $shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::getArrayItem($outerShdw->attributes(), "dir")));
+                                                        $shadow->setAlignment((string) self::getArrayItem($outerShdw->attributes(), "algn"));
+                                                        $shadow->getColor()->setRGB(self::getArrayItem($outerShdw->srgbClr->attributes(), "val"));
+                                                        $shadow->setAlpha(self::getArrayItem($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
+                                                    }
+                                                    $objDrawing->setWorksheet($docSheet);
+                                                } elseif (($this->includeCharts) && ($twoCellAnchor->graphicFrame)) {
+                                                    $fromCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
+                                                    $fromOffsetX    = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
+                                                    $fromOffsetY    = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
+                                                    $toCoordinate   = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
+                                                    $toOffsetX      = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
+                                                    $toOffsetY      = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
+                                                    $graphic        = $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
+                                                    $chartRef       = $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
+                                                    $thisChart      = (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+
+                                                    $chartDetails[$docSheet->getTitle().'!'.$thisChart] = array(
+                                                        'fromCoordinate'    => $fromCoordinate,
+                                                        'fromOffsetX'       => $fromOffsetX,
+                                                        'fromOffsetY'       => $fromOffsetY,
+                                                        'toCoordinate'      => $toCoordinate,
+                                                        'toOffsetX'         => $toOffsetX,
+                                                        'toOffsetY'         => $toOffsetY,
+                                                        'worksheetTitle'    => $docSheet->getTitle()
+                                                    );
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Loop through definedNames
+                            if ($xmlWorkbook->definedNames) {
+                                foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
+                                    // Extract range
+                                    $extractedRange = (string)$definedName;
+                                    $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
+                                    if (($spos = strpos($extractedRange, '!')) !== false) {
+                                        $extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
+                                    } else {
+                                        $extractedRange = str_replace('$', '', $extractedRange);
+                                    }
+
+                                    // Valid range?
+                                    if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+                                        continue;
+                                    }
+
+                                    // Some definedNames are only applicable if we are on the same sheet...
+                                    if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
+                                        // Switch on type
+                                        switch ((string)$definedName['name']) {
+                                            case '_xlnm._FilterDatabase':
+                                                if ((string)$definedName['hidden'] !== '1') {
+                                                    $extractedRange = explode(',', $extractedRange);
+                                                    foreach ($extractedRange as $range) {
+                                                        $autoFilterRange = $range;
+                                                        if (strpos($autoFilterRange, ':') !== false) {
+                                                            $docSheet->getAutoFilter()->setRange($autoFilterRange);
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case '_xlnm.Print_Titles':
+                                                // Split $extractedRange
+                                                $extractedRange = explode(',', $extractedRange);
+
+                                                // Set print titles
+                                                foreach ($extractedRange as $range) {
+                                                    $matches = array();
+                                                    $range = str_replace('$', '', $range);
+
+                                                    // check for repeating columns, e g. 'A:A' or 'A:D'
+                                                    if (preg_match('/!?([A-Z]+)\:([A-Z]+)$/', $range, $matches)) {
+                                                        $docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($matches[1], $matches[2]));
+                                                    } elseif (preg_match('/!?(\d+)\:(\d+)$/', $range, $matches)) {
+                                                        // check for repeating rows, e.g. '1:1' or '1:5'
+                                                        $docSheet->getPageSetup()->setRowsToRepeatAtTop(array($matches[1], $matches[2]));
+                                                    }
+                                                }
+                                                break;
+                                            case '_xlnm.Print_Area':
+                                                $rangeSets = explode(',', $extractedRange);        // FIXME: what if sheetname contains comma?
+                                                $newRangeSets = array();
+                                                foreach ($rangeSets as $rangeSet) {
+                                                    $range = explode('!', $rangeSet);    // FIXME: what if sheetname contains exclamation mark?
+                                                    $rangeSet = isset($range[1]) ? $range[1] : $range[0];
+                                                    if (strpos($rangeSet, ':') === false) {
+                                                        $rangeSet = $rangeSet . ':' . $rangeSet;
+                                                    }
+                                                    $newRangeSets[] = str_replace('$', '', $rangeSet);
+                                                }
+                                                $docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
+                                                break;
+
+                                            default:
+                                                break;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Next sheet id
+                            ++$sheetId;
+                        }
+
+                        // Loop through definedNames
+                        if ($xmlWorkbook->definedNames) {
+                            foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
+                                // Extract range
+                                $extractedRange = (string)$definedName;
+                                $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
+                                if (($spos = strpos($extractedRange, '!')) !== false) {
+                                    $extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
+                                } else {
+                                    $extractedRange = str_replace('$', '', $extractedRange);
+                                }
+
+                                // Valid range?
+                                if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+                                    continue;
+                                }
+
+                                // Some definedNames are only applicable if we are on the same sheet...
+                                if ((string)$definedName['localSheetId'] != '') {
+                                    // Local defined name
+                                    // Switch on type
+                                    switch ((string)$definedName['name']) {
+                                        case '_xlnm._FilterDatabase':
+                                        case '_xlnm.Print_Titles':
+                                        case '_xlnm.Print_Area':
+                                            break;
+                                        default:
+                                            if ($mapSheetId[(integer) $definedName['localSheetId']] !== null) {
+                                                $range = explode('!', (string)$definedName);
+                                                if (count($range) == 2) {
+                                                    $range[0] = str_replace("''", "'", $range[0]);
+                                                    $range[0] = str_replace("'", "", $range[0]);
+                                                    if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
+                                                        $extractedRange = str_replace('$', '', $range[1]);
+                                                        $scope = $docSheet->getParent()->getSheet($mapSheetId[(integer) $definedName['localSheetId']]);
+                                                        $excel->addNamedRange(new PHPExcel_NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                    }
+                                                }
+                                            }
+                                            break;
+                                    }
+                                } elseif (!isset($definedName['localSheetId'])) {
+                                    // "Global" definedNames
+                                    $locatedSheet = null;
+                                    $extractedSheetName = '';
+                                    if (strpos((string)$definedName, '!') !== false) {
+                                        // Extract sheet name
+                                        $extractedSheetName = PHPExcel_Worksheet::extractSheetTitle((string)$definedName, true);
+                                        $extractedSheetName = $extractedSheetName[0];
+
+                                        // Locate sheet
+                                        $locatedSheet = $excel->getSheetByName($extractedSheetName);
+
+                                        // Modify range
+                                        $range = explode('!', $extractedRange);
+                                        $extractedRange = isset($range[1]) ? $range[1] : $range[0];
+                                    }
+
+                                    if ($locatedSheet !== null) {
+                                        $excel->addNamedRange(new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false));
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if ((!$this->readDataOnly) || (!empty($this->loadSheetsOnly))) {
+                        // active sheet index
+                        $activeTab = intval($xmlWorkbook->bookViews->workbookView["activeTab"]); // refers to old sheet index
+
+                        // keep active sheet index if sheet is still loaded, else first sheet is set as the active
+                        if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
+                            $excel->setActiveSheetIndex($mapSheetId[$activeTab]);
+                        } else {
+                            if ($excel->getSheetCount() == 0) {
+                                $excel->createSheet();
+                            }
+                            $excel->setActiveSheetIndex(0);
+                        }
+                    }
+                    break;
+            }
+        }
+
+        if (!$this->readDataOnly) {
+            $contentTypes = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, "[Content_Types].xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+            foreach ($contentTypes->Override as $contentType) {
+                switch ($contentType["ContentType"]) {
+                    case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
+                        if ($this->includeCharts) {
+                            $chartEntryRef = ltrim($contentType['PartName'], '/');
+                            $chartElements = simplexml_load_string($this->securityScan($this->getFromZipArchive($zip, $chartEntryRef)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                            $objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements, basename($chartEntryRef, '.xml'));
+
+//                            echo 'Chart ', $chartEntryRef, '<br />';
+//                            var_dump($charts[$chartEntryRef]);
+//
+                            if (isset($charts[$chartEntryRef])) {
+                                $chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
+//                                echo 'Position Ref ', $chartPositionRef, '<br />';
+                                if (isset($chartDetails[$chartPositionRef])) {
+//                                    var_dump($chartDetails[$chartPositionRef]);
+
+                                    $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+                                    $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
+                                    $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
+                                    $objChart->setBottomRightPosition($chartDetails[$chartPositionRef]['toCoordinate'], $chartDetails[$chartPositionRef]['toOffsetX'], $chartDetails[$chartPositionRef]['toOffsetY']);
+                                }
+                            }
+                        }
+                }
+            }
+        }
+
+        $zip->close();
+
+        return $excel;
+    }
+
+    private static function readColor($color, $background = false)
+    {
+        if (isset($color["rgb"])) {
+            return (string)$color["rgb"];
+        } elseif (isset($color["indexed"])) {
+            return PHPExcel_Style_Color::indexedColor($color["indexed"]-7, $background)->getARGB();
+        } elseif (isset($color["theme"])) {
+            if (self::$theme !== null) {
+                $returnColour = self::$theme->getColourByIndex((int)$color["theme"]);
+                if (isset($color["tint"])) {
+                    $tintAdjust = (float) $color["tint"];
+                    $returnColour = PHPExcel_Style_Color::changeBrightness($returnColour, $tintAdjust);
+                }
+                return 'FF'.$returnColour;
+            }
+        }
+
+        if ($background) {
+            return 'FFFFFFFF';
+        }
+        return 'FF000000';
+    }
+
+    private static function readStyle($docStyle, $style)
+    {
+        // format code
+//        if (isset($style->numFmt)) {
+//            if (isset($style->numFmt['formatCode'])) {
+//                $docStyle->getNumberFormat()->setFormatCode((string) $style->numFmt['formatCode']);
+//            } else {
+                $docStyle->getNumberFormat()->setFormatCode($style->numFmt);
+//            }
+//        }
+
+        // font
+        if (isset($style->font)) {
+            $docStyle->getFont()->setName((string) $style->font->name["val"]);
+            $docStyle->getFont()->setSize((string) $style->font->sz["val"]);
+            if (isset($style->font->b)) {
+                $docStyle->getFont()->setBold(!isset($style->font->b["val"]) || self::boolean((string) $style->font->b["val"]));
+            }
+            if (isset($style->font->i)) {
+                $docStyle->getFont()->setItalic(!isset($style->font->i["val"]) || self::boolean((string) $style->font->i["val"]));
+            }
+            if (isset($style->font->strike)) {
+                $docStyle->getFont()->setStrikethrough(!isset($style->font->strike["val"]) || self::boolean((string) $style->font->strike["val"]));
+            }
+            $docStyle->getFont()->getColor()->setARGB(self::readColor($style->font->color));
+
+            if (isset($style->font->u) && !isset($style->font->u["val"])) {
+                $docStyle->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+            } elseif (isset($style->font->u) && isset($style->font->u["val"])) {
+                $docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
+            }
+
+            if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
+                $vertAlign = strtolower((string)$style->font->vertAlign["val"]);
+                if ($vertAlign == 'superscript') {
+                    $docStyle->getFont()->setSuperScript(true);
+                }
+                if ($vertAlign == 'subscript') {
+                    $docStyle->getFont()->setSubScript(true);
+                }
+            }
+        }
+
+        // fill
+        if (isset($style->fill)) {
+            if ($style->fill->gradientFill) {
+                $gradientFill = $style->fill->gradientFill[0];
+                if (!empty($gradientFill["type"])) {
+                    $docStyle->getFill()->setFillType((string) $gradientFill["type"]);
+                }
+                $docStyle->getFill()->setRotation(floatval($gradientFill["degree"]));
+                $gradientFill->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+                $docStyle->getFill()->getStartColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath("sml:stop[@position=0]"))->color));
+                $docStyle->getFill()->getEndColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath("sml:stop[@position=1]"))->color));
+            } elseif ($style->fill->patternFill) {
+                $patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
+                $docStyle->getFill()->setFillType($patternType);
+                if ($style->fill->patternFill->fgColor) {
+                    $docStyle->getFill()->getStartColor()->setARGB(self::readColor($style->fill->patternFill->fgColor, true));
+                } else {
+                    $docStyle->getFill()->getStartColor()->setARGB('FF000000');
+                }
+                if ($style->fill->patternFill->bgColor) {
+                    $docStyle->getFill()->getEndColor()->setARGB(self::readColor($style->fill->patternFill->bgColor, true));
+                }
+            }
+        }
+
+        // border
+        if (isset($style->border)) {
+            $diagonalUp = self::boolean((string) $style->border["diagonalUp"]);
+            $diagonalDown = self::boolean((string) $style->border["diagonalDown"]);
+            if (!$diagonalUp && !$diagonalDown) {
+                $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
+            } elseif ($diagonalUp && !$diagonalDown) {
+                $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
+            } elseif (!$diagonalUp && $diagonalDown) {
+                $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
+            } else {
+                $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
+            }
+            self::readBorder($docStyle->getBorders()->getLeft(), $style->border->left);
+            self::readBorder($docStyle->getBorders()->getRight(), $style->border->right);
+            self::readBorder($docStyle->getBorders()->getTop(), $style->border->top);
+            self::readBorder($docStyle->getBorders()->getBottom(), $style->border->bottom);
+            self::readBorder($docStyle->getBorders()->getDiagonal(), $style->border->diagonal);
+        }
+
+        // alignment
+        if (isset($style->alignment)) {
+            $docStyle->getAlignment()->setHorizontal((string) $style->alignment["horizontal"]);
+            $docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
+
+            $textRotation = 0;
+            if ((int)$style->alignment["textRotation"] <= 90) {
+                $textRotation = (int)$style->alignment["textRotation"];
+            } elseif ((int)$style->alignment["textRotation"] > 90) {
+                $textRotation = 90 - (int)$style->alignment["textRotation"];
+            }
+
+            $docStyle->getAlignment()->setTextRotation(intval($textRotation));
+            $docStyle->getAlignment()->setWrapText(self::boolean((string) $style->alignment["wrapText"]));
+            $docStyle->getAlignment()->setShrinkToFit(self::boolean((string) $style->alignment["shrinkToFit"]));
+            $docStyle->getAlignment()->setIndent(intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0);
+            $docStyle->getAlignment()->setReadorder(intval((string)$style->alignment["readingOrder"]) > 0 ? intval((string)$style->alignment["readingOrder"]) : 0);
+        }
+
+        // protection
+        if (isset($style->protection)) {
+            if (isset($style->protection['locked'])) {
+                if (self::boolean((string) $style->protection['locked'])) {
+                    $docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
+                } else {
+                    $docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
+                }
+            }
+
+            if (isset($style->protection['hidden'])) {
+                if (self::boolean((string) $style->protection['hidden'])) {
+                    $docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
+                } else {
+                    $docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
+                }
+            }
+        }
+
+        // top-level style settings
+        if (isset($style->quotePrefix)) {
+            $docStyle->setQuotePrefix($style->quotePrefix);
+        }
+    }
+
+    private static function readBorder($docBorder, $eleBorder)
+    {
+        if (isset($eleBorder["style"])) {
+            $docBorder->setBorderStyle((string) $eleBorder["style"]);
+        }
+        if (isset($eleBorder->color)) {
+            $docBorder->getColor()->setARGB(self::readColor($eleBorder->color));
+        }
+    }
+
+    private function parseRichText($is = null)
+    {
+        $value = new PHPExcel_RichText();
+
+        if (isset($is->t)) {
+            $value->createText(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $is->t));
+        } else {
+            if (is_object($is->r)) {
+                foreach ($is->r as $run) {
+                    if (!isset($run->rPr)) {
+                        $objText = $value->createText(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $run->t));
+
+                    } else {
+                        $objText = $value->createTextRun(PHPExcel_Shared_String::ControlCharacterOOXML2PHP((string) $run->t));
+
+                        if (isset($run->rPr->rFont["val"])) {
+                            $objText->getFont()->setName((string) $run->rPr->rFont["val"]);
+                        }
+                        if (isset($run->rPr->sz["val"])) {
+                            $objText->getFont()->setSize((string) $run->rPr->sz["val"]);
+                        }
+                        if (isset($run->rPr->color)) {
+                            $objText->getFont()->setColor(new PHPExcel_Style_Color(self::readColor($run->rPr->color)));
+                        }
+                        if ((isset($run->rPr->b["val"]) && self::boolean((string) $run->rPr->b["val"])) ||
+                            (isset($run->rPr->b) && !isset($run->rPr->b["val"]))) {
+                            $objText->getFont()->setBold(true);
+                        }
+                        if ((isset($run->rPr->i["val"]) && self::boolean((string) $run->rPr->i["val"])) ||
+                            (isset($run->rPr->i) && !isset($run->rPr->i["val"]))) {
+                            $objText->getFont()->setItalic(true);
+                        }
+                        if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
+                            $vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
+                            if ($vertAlign == 'superscript') {
+                                $objText->getFont()->setSuperScript(true);
+                            }
+                            if ($vertAlign == 'subscript') {
+                                $objText->getFont()->setSubScript(true);
+                            }
+                        }
+                        if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
+                            $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+                        } elseif (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
+                            $objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
+                        }
+                        if ((isset($run->rPr->strike["val"]) && self::boolean((string) $run->rPr->strike["val"])) ||
+                            (isset($run->rPr->strike) && !isset($run->rPr->strike["val"]))) {
+                            $objText->getFont()->setStrikethrough(true);
+                        }
+                    }
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    private function readRibbon($excel, $customUITarget, $zip)
+    {
+        $baseDir = dirname($customUITarget);
+        $nameCustomUI = basename($customUITarget);
+        // get the xml file (ribbon)
+        $localRibbon = $this->getFromZipArchive($zip, $customUITarget);
+        $customUIImagesNames = array();
+        $customUIImagesBinaries = array();
+        // something like customUI/_rels/customUI.xml.rels
+        $pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';
+        $dataRels = $this->getFromZipArchive($zip, $pathRels);
+        if ($dataRels) {
+            // exists and not empty if the ribbon have some pictures (other than internal MSO)
+            $UIRels = simplexml_load_string($this->securityScan($dataRels), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+            if ($UIRels) {
+                // we need to save id and target to avoid parsing customUI.xml and "guess" if it's a pseudo callback who load the image
+                foreach ($UIRels->Relationship as $ele) {
+                    if ($ele["Type"] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
+                        // an image ?
+                        $customUIImagesNames[(string) $ele['Id']] = (string)$ele['Target'];
+                        $customUIImagesBinaries[(string)$ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
+                    }
+                }
+            }
+        }
+        if ($localRibbon) {
+            $excel->setRibbonXMLData($customUITarget, $localRibbon);
+            if (count($customUIImagesNames) > 0 && count($customUIImagesBinaries) > 0) {
+                $excel->setRibbonBinObjects($customUIImagesNames, $customUIImagesBinaries);
+            } else {
+                $excel->setRibbonBinObjects(null);
+            }
+        } else {
+            $excel->setRibbonXMLData(null);
+            $excel->setRibbonBinObjects(null);
+        }
+    }
+
+    private static function getArrayItem($array, $key = 0)
+    {
+        return (isset($array[$key]) ? $array[$key] : null);
+    }
+
+    private static function dirAdd($base, $add)
+    {
+        return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+    }
+
+    private static function toCSSArray($style)
+    {
+        $style = str_replace(array("\r","\n"), "", $style);
+
+        $temp = explode(';', $style);
+        $style = array();
+        foreach ($temp as $item) {
+            $item = explode(':', $item);
+
+            if (strpos($item[1], 'px') !== false) {
+                $item[1] = str_replace('px', '', $item[1]);
+            }
+            if (strpos($item[1], 'pt') !== false) {
+                $item[1] = str_replace('pt', '', $item[1]);
+                $item[1] = PHPExcel_Shared_Font::fontSizeToPixels($item[1]);
+            }
+            if (strpos($item[1], 'in') !== false) {
+                $item[1] = str_replace('in', '', $item[1]);
+                $item[1] = PHPExcel_Shared_Font::inchSizeToPixels($item[1]);
+            }
+            if (strpos($item[1], 'cm') !== false) {
+                $item[1] = str_replace('cm', '', $item[1]);
+                $item[1] = PHPExcel_Shared_Font::centimeterSizeToPixels($item[1]);
+            }
+
+            $style[$item[0]] = $item[1];
+        }
+
+        return $style;
+    }
+
+    private static function boolean($value = null)
+    {
+        if (is_object($value)) {
+            $value = (string) $value;
+        }
+        if (is_numeric($value)) {
+            return (bool) $value;
+        }
+        return ($value === 'true' || $value === 'TRUE');
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel2007/Chart.php b/lib/PHPExcel/Reader/Excel2007/Chart.php
new file mode 100644
index 000000000..590bf2d8f
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel2007/Chart.php
@@ -0,0 +1,520 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Reader_Excel2007
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+
+/**
+ * PHPExcel_Reader_Excel2007_Chart
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Reader_Excel2007
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_Excel2007_Chart
+{
+    private static function getAttribute($component, $name, $format)
+    {
+        $attributes = $component->attributes();
+        if (isset($attributes[$name])) {
+            if ($format == 'string') {
+                return (string) $attributes[$name];
+            } elseif ($format == 'integer') {
+                return (integer) $attributes[$name];
+            } elseif ($format == 'boolean') {
+                return (boolean) ($attributes[$name] === '0' || $attributes[$name] !== 'true') ? false : true;
+            } else {
+                return (float) $attributes[$name];
+            }
+        }
+        return null;
+    }
+
+
+    private static function readColor($color, $background = false)
+    {
+        if (isset($color["rgb"])) {
+            return (string)$color["rgb"];
+        } elseif (isset($color["indexed"])) {
+            return PHPExcel_Style_Color::indexedColor($color["indexed"]-7, $background)->getARGB();
+        }
+    }
+
+    public static function readChart($chartElements, $chartName)
+    {
+        $namespacesChartMeta = $chartElements->getNamespaces(true);
+        $chartElementsC = $chartElements->children($namespacesChartMeta['c']);
+
+        $XaxisLabel = $YaxisLabel = $legend = $title = null;
+        $dispBlanksAs = $plotVisOnly = null;
+
+        foreach ($chartElementsC as $chartElementKey => $chartElement) {
+            switch ($chartElementKey) {
+                case "chart":
+                    foreach ($chartElement as $chartDetailsKey => $chartDetails) {
+                        $chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
+                        switch ($chartDetailsKey) {
+                            case "plotArea":
+                                $plotAreaLayout = $XaxisLable = $YaxisLable = null;
+                                $plotSeries = $plotAttributes = array();
+                                foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    switch ($chartDetailKey) {
+                                        case "layout":
+                                            $plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
+                                            break;
+                                        case "catAx":
+                                            if (isset($chartDetail->title)) {
+                                                $XaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
+                                            }
+                                            break;
+                                        case "dateAx":
+                                            if (isset($chartDetail->title)) {
+                                                $XaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
+                                            }
+                                            break;
+                                        case "valAx":
+                                            if (isset($chartDetail->title)) {
+                                                $YaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
+                                            }
+                                            break;
+                                        case "barChart":
+                                        case "bar3DChart":
+                                            $barDirection = self::getAttribute($chartDetail->barDir, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotDirection($barDirection);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "lineChart":
+                                        case "line3DChart":
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "areaChart":
+                                        case "area3DChart":
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "doughnutChart":
+                                        case "pieChart":
+                                        case "pie3DChart":
+                                            $explosion = isset($chartDetail->ser->explosion);
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($explosion);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "scatterChart":
+                                            $scatterStyle = self::getAttribute($chartDetail->scatterStyle, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($scatterStyle);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "bubbleChart":
+                                            $bubbleScale = self::getAttribute($chartDetail->bubbleScale, 'val', 'integer');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($bubbleScale);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "radarChart":
+                                            $radarStyle = self::getAttribute($chartDetail->radarStyle, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($radarStyle);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "surfaceChart":
+                                        case "surface3DChart":
+                                            $wireFrame = self::getAttribute($chartDetail->wireframe, 'val', 'boolean');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($wireFrame);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "stockChart":
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($plotAreaLayout);
+                                            break;
+                                    }
+                                }
+                                if ($plotAreaLayout == null) {
+                                    $plotAreaLayout = new PHPExcel_Chart_Layout();
+                                }
+                                $plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout, $plotSeries);
+                                self::setChartAttributes($plotAreaLayout, $plotAttributes);
+                                break;
+                            case "plotVisOnly":
+                                $plotVisOnly = self::getAttribute($chartDetails, 'val', 'string');
+                                break;
+                            case "dispBlanksAs":
+                                $dispBlanksAs = self::getAttribute($chartDetails, 'val', 'string');
+                                break;
+                            case "title":
+                                $title = self::chartTitle($chartDetails, $namespacesChartMeta, 'title');
+                                break;
+                            case "legend":
+                                $legendPos = 'r';
+                                $legendLayout = null;
+                                $legendOverlay = false;
+                                foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    switch ($chartDetailKey) {
+                                        case "legendPos":
+                                            $legendPos = self::getAttribute($chartDetail, 'val', 'string');
+                                            break;
+                                        case "overlay":
+                                            $legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
+                                            break;
+                                        case "layout":
+                                            $legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
+                                            break;
+                                    }
+                                }
+                                $legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay);
+                                break;
+                        }
+                    }
+            }
+        }
+        $chart = new PHPExcel_Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel);
+
+        return $chart;
+    }
+
+    private static function chartTitle($titleDetails, $namespacesChartMeta, $type)
+    {
+        $caption = array();
+        $titleLayout = null;
+        foreach ($titleDetails as $titleDetailKey => $chartDetail) {
+            switch ($titleDetailKey) {
+                case "tx":
+                    $titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
+                    foreach ($titleDetails as $titleKey => $titleDetail) {
+                        switch ($titleKey) {
+                            case "p":
+                                $titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
+                                $caption[] = self::parseRichText($titleDetailPart);
+                        }
+                    }
+                    break;
+                case "layout":
+                    $titleLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
+                    break;
+            }
+        }
+
+        return new PHPExcel_Chart_Title($caption, $titleLayout);
+    }
+
+    private static function chartLayoutDetails($chartDetail, $namespacesChartMeta)
+    {
+        if (!isset($chartDetail->manualLayout)) {
+            return null;
+        }
+        $details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
+        if (is_null($details)) {
+            return null;
+        }
+        $layout = array();
+        foreach ($details as $detailKey => $detail) {
+//            echo $detailKey, ' => ',self::getAttribute($detail, 'val', 'string'),PHP_EOL;
+            $layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
+        }
+        return new PHPExcel_Chart_Layout($layout);
+    }
+
+    private static function chartDataSeries($chartDetail, $namespacesChartMeta, $plotType)
+    {
+        $multiSeriesType = null;
+        $smoothLine = false;
+        $seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
+
+        $seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
+        foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+            switch ($seriesDetailKey) {
+                case "grouping":
+                    $multiSeriesType = self::getAttribute($chartDetail->grouping, 'val', 'string');
+                    break;
+                case "ser":
+                    $marker = null;
+                    foreach ($seriesDetails as $seriesKey => $seriesDetail) {
+                        switch ($seriesKey) {
+                            case "idx":
+                                $seriesIndex = self::getAttribute($seriesDetail, 'val', 'integer');
+                                break;
+                            case "order":
+                                $seriesOrder = self::getAttribute($seriesDetail, 'val', 'integer');
+                                $plotOrder[$seriesIndex] = $seriesOrder;
+                                break;
+                            case "tx":
+                                $seriesLabel[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                break;
+                            case "marker":
+                                $marker = self::getAttribute($seriesDetail->symbol, 'val', 'string');
+                                break;
+                            case "smooth":
+                                $smoothLine = self::getAttribute($seriesDetail, 'val', 'boolean');
+                                break;
+                            case "cat":
+                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                break;
+                            case "val":
+                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                break;
+                            case "xVal":
+                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                break;
+                            case "yVal":
+                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                break;
+                        }
+                    }
+            }
+        }
+        return new PHPExcel_Chart_DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
+    }
+
+
+    private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false)
+    {
+        if (isset($seriesDetail->strRef)) {
+            $seriesSource = (string) $seriesDetail->strRef->f;
+            $seriesData = self::chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
+
+            return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
+        } elseif (isset($seriesDetail->numRef)) {
+            $seriesSource = (string) $seriesDetail->numRef->f;
+            $seriesData = self::chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
+
+            return new PHPExcel_Chart_DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
+        } elseif (isset($seriesDetail->multiLvlStrRef)) {
+            $seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
+            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
+            $seriesData['pointCount'] = count($seriesData['dataValues']);
+
+            return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
+        } elseif (isset($seriesDetail->multiLvlNumRef)) {
+            $seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
+            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's');
+            $seriesData['pointCount'] = count($seriesData['dataValues']);
+
+            return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
+        }
+        return null;
+    }
+
+
+    private static function chartDataSeriesValues($seriesValueSet, $dataType = 'n')
+    {
+        $seriesVal = array();
+        $formatCode = '';
+        $pointCount = 0;
+
+        foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
+            switch ($seriesValueIdx) {
+                case 'ptCount':
+                    $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
+                    break;
+                case 'formatCode':
+                    $formatCode = (string) $seriesValue;
+                    break;
+                case 'pt':
+                    $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
+                    if ($dataType == 's') {
+                        $seriesVal[$pointVal] = (string) $seriesValue->v;
+                    } else {
+                        $seriesVal[$pointVal] = (float) $seriesValue->v;
+                    }
+                    break;
+            }
+        }
+
+        return array(
+            'formatCode'    => $formatCode,
+            'pointCount'    => $pointCount,
+            'dataValues'    => $seriesVal
+        );
+    }
+
+    private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n')
+    {
+        $seriesVal = array();
+        $formatCode = '';
+        $pointCount = 0;
+
+        foreach ($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
+            foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
+                switch ($seriesValueIdx) {
+                    case 'ptCount':
+                        $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
+                        break;
+                    case 'formatCode':
+                        $formatCode = (string) $seriesValue;
+                        break;
+                    case 'pt':
+                        $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
+                        if ($dataType == 's') {
+                            $seriesVal[$pointVal][] = (string) $seriesValue->v;
+                        } else {
+                            $seriesVal[$pointVal][] = (float) $seriesValue->v;
+                        }
+                        break;
+                }
+            }
+        }
+
+        return array(
+            'formatCode'    => $formatCode,
+            'pointCount'    => $pointCount,
+            'dataValues'    => $seriesVal
+        );
+    }
+
+    private static function parseRichText($titleDetailPart = null)
+    {
+        $value = new PHPExcel_RichText();
+
+        foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+            if (isset($titleDetailElement->t)) {
+                $objText = $value->createTextRun((string) $titleDetailElement->t);
+            }
+            if (isset($titleDetailElement->rPr)) {
+                if (isset($titleDetailElement->rPr->rFont["val"])) {
+                    $objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
+                }
+
+                $fontSize = (self::getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
+                if (!is_null($fontSize)) {
+                    $objText->getFont()->setSize(floor($fontSize / 100));
+                }
+
+                $fontColor = (self::getAttribute($titleDetailElement->rPr, 'color', 'string'));
+                if (!is_null($fontColor)) {
+                    $objText->getFont()->setColor(new PHPExcel_Style_Color(self::readColor($fontColor)));
+                }
+
+                $bold = self::getAttribute($titleDetailElement->rPr, 'b', 'boolean');
+                if (!is_null($bold)) {
+                    $objText->getFont()->setBold($bold);
+                }
+
+                $italic = self::getAttribute($titleDetailElement->rPr, 'i', 'boolean');
+                if (!is_null($italic)) {
+                    $objText->getFont()->setItalic($italic);
+                }
+
+                $baseline = self::getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
+                if (!is_null($baseline)) {
+                    if ($baseline > 0) {
+                        $objText->getFont()->setSuperScript(true);
+                    } elseif ($baseline < 0) {
+                        $objText->getFont()->setSubScript(true);
+                    }
+                }
+
+                $underscore = (self::getAttribute($titleDetailElement->rPr, 'u', 'string'));
+                if (!is_null($underscore)) {
+                    if ($underscore == 'sng') {
+                        $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+                    } elseif ($underscore == 'dbl') {
+                        $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
+                    } else {
+                        $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
+                    }
+                }
+
+                $strikethrough = (self::getAttribute($titleDetailElement->rPr, 's', 'string'));
+                if (!is_null($strikethrough)) {
+                    if ($strikethrough == 'noStrike') {
+                        $objText->getFont()->setStrikethrough(false);
+                    } else {
+                        $objText->getFont()->setStrikethrough(true);
+                    }
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    private static function readChartAttributes($chartDetail)
+    {
+        $plotAttributes = array();
+        if (isset($chartDetail->dLbls)) {
+            if (isset($chartDetail->dLbls->howLegendKey)) {
+                $plotAttributes['showLegendKey'] = self::getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showVal)) {
+                $plotAttributes['showVal'] = self::getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showCatName)) {
+                $plotAttributes['showCatName'] = self::getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showSerName)) {
+                $plotAttributes['showSerName'] = self::getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showPercent)) {
+                $plotAttributes['showPercent'] = self::getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showBubbleSize)) {
+                $plotAttributes['showBubbleSize'] = self::getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showLeaderLines)) {
+                $plotAttributes['showLeaderLines'] = self::getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
+            }
+        }
+
+        return $plotAttributes;
+    }
+
+    private static function setChartAttributes($plotArea, $plotAttributes)
+    {
+        foreach ($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
+            switch ($plotAttributeKey) {
+                case 'showLegendKey':
+                    $plotArea->setShowLegendKey($plotAttributeValue);
+                    break;
+                case 'showVal':
+                    $plotArea->setShowVal($plotAttributeValue);
+                    break;
+                case 'showCatName':
+                    $plotArea->setShowCatName($plotAttributeValue);
+                    break;
+                case 'showSerName':
+                    $plotArea->setShowSerName($plotAttributeValue);
+                    break;
+                case 'showPercent':
+                    $plotArea->setShowPercent($plotAttributeValue);
+                    break;
+                case 'showBubbleSize':
+                    $plotArea->setShowBubbleSize($plotAttributeValue);
+                    break;
+                case 'showLeaderLines':
+                    $plotArea->setShowLeaderLines($plotAttributeValue);
+                    break;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel2007/Theme.php b/lib/PHPExcel/Reader/Excel2007/Theme.php
new file mode 100644
index 000000000..134f4b609
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel2007/Theme.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Reader_Excel2007_Theme
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_Excel2007_Theme
+{
+    /**
+     * Theme Name
+     *
+     * @var string
+     */
+    private $themeName;
+
+    /**
+     * Colour Scheme Name
+     *
+     * @var string
+     */
+    private $colourSchemeName;
+
+    /**
+     * Colour Map indexed by position
+     *
+     * @var array of string
+     */
+    private $colourMapValues;
+
+
+    /**
+     * Colour Map
+     *
+     * @var array of string
+     */
+    private $colourMap;
+
+
+    /**
+     * Create a new PHPExcel_Theme
+     *
+     */
+    public function __construct($themeName, $colourSchemeName, $colourMap)
+    {
+        // Initialise values
+        $this->themeName        = $themeName;
+        $this->colourSchemeName = $colourSchemeName;
+        $this->colourMap        = $colourMap;
+    }
+
+    /**
+     * Get Theme Name
+     *
+     * @return string
+     */
+    public function getThemeName()
+    {
+        return $this->themeName;
+    }
+
+    /**
+     * Get colour Scheme Name
+     *
+     * @return string
+     */
+    public function getColourSchemeName()
+    {
+        return $this->colourSchemeName;
+    }
+
+    /**
+     * Get colour Map Value by Position
+     *
+     * @return string
+     */
+    public function getColourByIndex($index = 0)
+    {
+        if (isset($this->colourMap[$index])) {
+            return $this->colourMap[$index];
+        }
+        return null;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ((is_object($value)) && ($key != '_parent')) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel5.php b/lib/PHPExcel/Reader/Excel5.php
new file mode 100644
index 000000000..7190bdbf7
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5.php
@@ -0,0 +1,7594 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Excel5
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+// Original file header of ParseXL (used as the base for this class):
+// --------------------------------------------------------------------------------
+// Adapted from Excel_Spreadsheet_Reader developed by users bizon153,
+// trex005, and mmp11 (SourceForge.net)
+// http://sourceforge.net/projects/phpexcelreader/
+// Primary changes made by canyoncasa (dvc) for ParseXL 1.00 ...
+//     Modelled moreso after Perl Excel Parse/Write modules
+//     Added Parse_Excel_Spreadsheet object
+//         Reads a whole worksheet or tab as row,column array or as
+//         associated hash of indexed rows and named column fields
+//     Added variables for worksheet (tab) indexes and names
+//     Added an object call for loading individual woorksheets
+//     Changed default indexing defaults to 0 based arrays
+//     Fixed date/time and percent formats
+//     Includes patches found at SourceForge...
+//         unicode patch by nobody
+//         unpack("d") machine depedency patch by matchy
+//         boundsheet utf16 patch by bjaenichen
+//     Renamed functions for shorter names
+//     General code cleanup and rigor, including <80 column width
+//     Included a testcase Excel file and PHP example calls
+//     Code works for PHP 5.x
+
+// Primary changes made by canyoncasa (dvc) for ParseXL 1.10 ...
+// http://sourceforge.net/tracker/index.php?func=detail&aid=1466964&group_id=99160&atid=623334
+//     Decoding of formula conditions, results, and tokens.
+//     Support for user-defined named cells added as an array "namedcells"
+//         Patch code for user-defined named cells supports single cells only.
+//         NOTE: this patch only works for BIFF8 as BIFF5-7 use a different
+//         external sheet reference structure
+class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    // ParseXL definitions
+    const XLS_BIFF8                     = 0x0600;
+    const XLS_BIFF7                     = 0x0500;
+    const XLS_WorkbookGlobals           = 0x0005;
+    const XLS_Worksheet                 = 0x0010;
+
+    // record identifiers
+    const XLS_TYPE_FORMULA              = 0x0006;
+    const XLS_TYPE_EOF                  = 0x000a;
+    const XLS_TYPE_PROTECT              = 0x0012;
+    const XLS_TYPE_OBJECTPROTECT        = 0x0063;
+    const XLS_TYPE_SCENPROTECT          = 0x00dd;
+    const XLS_TYPE_PASSWORD             = 0x0013;
+    const XLS_TYPE_HEADER               = 0x0014;
+    const XLS_TYPE_FOOTER               = 0x0015;
+    const XLS_TYPE_EXTERNSHEET          = 0x0017;
+    const XLS_TYPE_DEFINEDNAME          = 0x0018;
+    const XLS_TYPE_VERTICALPAGEBREAKS   = 0x001a;
+    const XLS_TYPE_HORIZONTALPAGEBREAKS = 0x001b;
+    const XLS_TYPE_NOTE                 = 0x001c;
+    const XLS_TYPE_SELECTION            = 0x001d;
+    const XLS_TYPE_DATEMODE             = 0x0022;
+    const XLS_TYPE_EXTERNNAME           = 0x0023;
+    const XLS_TYPE_LEFTMARGIN           = 0x0026;
+    const XLS_TYPE_RIGHTMARGIN          = 0x0027;
+    const XLS_TYPE_TOPMARGIN            = 0x0028;
+    const XLS_TYPE_BOTTOMMARGIN         = 0x0029;
+    const XLS_TYPE_PRINTGRIDLINES       = 0x002b;
+    const XLS_TYPE_FILEPASS             = 0x002f;
+    const XLS_TYPE_FONT                 = 0x0031;
+    const XLS_TYPE_CONTINUE             = 0x003c;
+    const XLS_TYPE_PANE                 = 0x0041;
+    const XLS_TYPE_CODEPAGE             = 0x0042;
+    const XLS_TYPE_DEFCOLWIDTH          = 0x0055;
+    const XLS_TYPE_OBJ                  = 0x005d;
+    const XLS_TYPE_COLINFO              = 0x007d;
+    const XLS_TYPE_IMDATA               = 0x007f;
+    const XLS_TYPE_SHEETPR              = 0x0081;
+    const XLS_TYPE_HCENTER              = 0x0083;
+    const XLS_TYPE_VCENTER              = 0x0084;
+    const XLS_TYPE_SHEET                = 0x0085;
+    const XLS_TYPE_PALETTE              = 0x0092;
+    const XLS_TYPE_SCL                  = 0x00a0;
+    const XLS_TYPE_PAGESETUP            = 0x00a1;
+    const XLS_TYPE_MULRK                = 0x00bd;
+    const XLS_TYPE_MULBLANK             = 0x00be;
+    const XLS_TYPE_DBCELL               = 0x00d7;
+    const XLS_TYPE_XF                   = 0x00e0;
+    const XLS_TYPE_MERGEDCELLS          = 0x00e5;
+    const XLS_TYPE_MSODRAWINGGROUP      = 0x00eb;
+    const XLS_TYPE_MSODRAWING           = 0x00ec;
+    const XLS_TYPE_SST                  = 0x00fc;
+    const XLS_TYPE_LABELSST             = 0x00fd;
+    const XLS_TYPE_EXTSST               = 0x00ff;
+    const XLS_TYPE_EXTERNALBOOK         = 0x01ae;
+    const XLS_TYPE_DATAVALIDATIONS      = 0x01b2;
+    const XLS_TYPE_TXO                  = 0x01b6;
+    const XLS_TYPE_HYPERLINK            = 0x01b8;
+    const XLS_TYPE_DATAVALIDATION       = 0x01be;
+    const XLS_TYPE_DIMENSION            = 0x0200;
+    const XLS_TYPE_BLANK                = 0x0201;
+    const XLS_TYPE_NUMBER               = 0x0203;
+    const XLS_TYPE_LABEL                = 0x0204;
+    const XLS_TYPE_BOOLERR              = 0x0205;
+    const XLS_TYPE_STRING               = 0x0207;
+    const XLS_TYPE_ROW                  = 0x0208;
+    const XLS_TYPE_INDEX                = 0x020b;
+    const XLS_TYPE_ARRAY                = 0x0221;
+    const XLS_TYPE_DEFAULTROWHEIGHT     = 0x0225;
+    const XLS_TYPE_WINDOW2              = 0x023e;
+    const XLS_TYPE_RK                   = 0x027e;
+    const XLS_TYPE_STYLE                = 0x0293;
+    const XLS_TYPE_FORMAT               = 0x041e;
+    const XLS_TYPE_SHAREDFMLA           = 0x04bc;
+    const XLS_TYPE_BOF                  = 0x0809;
+    const XLS_TYPE_SHEETPROTECTION      = 0x0867;
+    const XLS_TYPE_RANGEPROTECTION      = 0x0868;
+    const XLS_TYPE_SHEETLAYOUT          = 0x0862;
+    const XLS_TYPE_XFEXT                = 0x087d;
+    const XLS_TYPE_PAGELAYOUTVIEW       = 0x088b;
+    const XLS_TYPE_UNKNOWN              = 0xffff;
+
+    // Encryption type
+    const MS_BIFF_CRYPTO_NONE           = 0;
+    const MS_BIFF_CRYPTO_XOR            = 1;
+    const MS_BIFF_CRYPTO_RC4            = 2;
+    
+    // Size of stream blocks when using RC4 encryption
+    const REKEY_BLOCK                   = 0x400;
+
+    /**
+     * Summary Information stream data.
+     *
+     * @var string
+     */
+    private $summaryInformation;
+
+    /**
+     * Extended Summary Information stream data.
+     *
+     * @var string
+     */
+    private $documentSummaryInformation;
+
+    /**
+     * User-Defined Properties stream data.
+     *
+     * @var string
+     */
+    private $userDefinedProperties;
+
+    /**
+     * Workbook stream data. (Includes workbook globals substream as well as sheet substreams)
+     *
+     * @var string
+     */
+    private $data;
+
+    /**
+     * Size in bytes of $this->data
+     *
+     * @var int
+     */
+    private $dataSize;
+
+    /**
+     * Current position in stream
+     *
+     * @var integer
+     */
+    private $pos;
+
+    /**
+     * Workbook to be returned by the reader.
+     *
+     * @var PHPExcel
+     */
+    private $phpExcel;
+
+    /**
+     * Worksheet that is currently being built by the reader.
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $phpSheet;
+
+    /**
+     * BIFF version
+     *
+     * @var int
+     */
+    private $version;
+
+    /**
+     * Codepage set in the Excel file being read. Only important for BIFF5 (Excel 5.0 - Excel 95)
+     * For BIFF8 (Excel 97 - Excel 2003) this will always have the value 'UTF-16LE'
+     *
+     * @var string
+     */
+    private $codepage;
+
+    /**
+     * Shared formats
+     *
+     * @var array
+     */
+    private $formats;
+
+    /**
+     * Shared fonts
+     *
+     * @var array
+     */
+    private $objFonts;
+
+    /**
+     * Color palette
+     *
+     * @var array
+     */
+    private $palette;
+
+    /**
+     * Worksheets
+     *
+     * @var array
+     */
+    private $sheets;
+
+    /**
+     * External books
+     *
+     * @var array
+     */
+    private $externalBooks;
+
+    /**
+     * REF structures. Only applies to BIFF8.
+     *
+     * @var array
+     */
+    private $ref;
+
+    /**
+     * External names
+     *
+     * @var array
+     */
+    private $externalNames;
+
+    /**
+     * Defined names
+     *
+     * @var array
+     */
+    private $definedname;
+
+    /**
+     * Shared strings. Only applies to BIFF8.
+     *
+     * @var array
+     */
+    private $sst;
+
+    /**
+     * Panes are frozen? (in sheet currently being read). See WINDOW2 record.
+     *
+     * @var boolean
+     */
+    private $frozen;
+
+    /**
+     * Fit printout to number of pages? (in sheet currently being read). See SHEETPR record.
+     *
+     * @var boolean
+     */
+    private $isFitToPages;
+
+    /**
+     * Objects. One OBJ record contributes with one entry.
+     *
+     * @var array
+     */
+    private $objs;
+
+    /**
+     * Text Objects. One TXO record corresponds with one entry.
+     *
+     * @var array
+     */
+    private $textObjects;
+
+    /**
+     * Cell Annotations (BIFF8)
+     *
+     * @var array
+     */
+    private $cellNotes;
+
+    /**
+     * The combined MSODRAWINGGROUP data
+     *
+     * @var string
+     */
+    private $drawingGroupData;
+
+    /**
+     * The combined MSODRAWING data (per sheet)
+     *
+     * @var string
+     */
+    private $drawingData;
+
+    /**
+     * Keep track of XF index
+     *
+     * @var int
+     */
+    private $xfIndex;
+
+    /**
+     * Mapping of XF index (that is a cell XF) to final index in cellXf collection
+     *
+     * @var array
+     */
+    private $mapCellXfIndex;
+
+    /**
+     * Mapping of XF index (that is a style XF) to final index in cellStyleXf collection
+     *
+     * @var array
+     */
+    private $mapCellStyleXfIndex;
+
+    /**
+     * The shared formulas in a sheet. One SHAREDFMLA record contributes with one value.
+     *
+     * @var array
+     */
+    private $sharedFormulas;
+
+    /**
+     * The shared formula parts in a sheet. One FORMULA record contributes with one value if it
+     * refers to a shared formula.
+     *
+     * @var array
+     */
+    private $sharedFormulaParts;
+
+    /**
+     * The type of encryption in use
+     *
+     * @var int
+     */
+    private $encryption = 0;
+    
+    /**
+     * The position in the stream after which contents are encrypted
+     *
+     * @var int
+     */
+    private $encryptionStartPos = false;
+
+    /**
+     * The current RC4 decryption object
+     *
+     * @var PHPExcel_Reader_Excel5_RC4
+     */
+    private $rc4Key = null;
+
+    /**
+     * The position in the stream that the RC4 decryption object was left at
+     *
+     * @var int
+     */
+    private $rc4Pos = 0;
+
+    /**
+     * The current MD5 context state
+     *
+     * @var string
+     */
+    private $md5Ctxt = null;
+
+    /**
+     * Create a new PHPExcel_Reader_Excel5 instance
+     */
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return     boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        try {
+            // Use ParseXL for the hard work.
+            $ole = new PHPExcel_Shared_OLERead();
+
+            // get excel data
+            $res = $ole->read($pFilename);
+            return true;
+        } catch (PHPExcel_Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+     *
+     * @param     string         $pFilename
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function listWorksheetNames($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $worksheetNames = array();
+
+        // Read the OLE file
+        $this->loadOLE($pFilename);
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        $this->pos        = 0;
+        $this->sheets    = array();
+
+        // Parse Workbook Global Substream
+        while ($this->pos < $this->dataSize) {
+            $code = self::getInt2d($this->data, $this->pos);
+
+            switch ($code) {
+                case self::XLS_TYPE_BOF:
+                    $this->readBof();
+                    break;
+                case self::XLS_TYPE_SHEET:
+                    $this->readSheet();
+                    break;
+                case self::XLS_TYPE_EOF:
+                    $this->readDefault();
+                    break 2;
+                default:
+                    $this->readDefault();
+                    break;
+            }
+        }
+
+        foreach ($this->sheets as $sheet) {
+            if ($sheet['sheetType'] != 0x00) {
+                // 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
+                continue;
+            }
+
+            $worksheetNames[] = $sheet['name'];
+        }
+
+        return $worksheetNames;
+    }
+
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param   string     $pFilename
+     * @throws   PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $worksheetInfo = array();
+
+        // Read the OLE file
+        $this->loadOLE($pFilename);
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        // initialize
+        $this->pos    = 0;
+        $this->sheets = array();
+
+        // Parse Workbook Global Substream
+        while ($this->pos < $this->dataSize) {
+            $code = self::getInt2d($this->data, $this->pos);
+
+            switch ($code) {
+                case self::XLS_TYPE_BOF:
+                    $this->readBof();
+                    break;
+                case self::XLS_TYPE_SHEET:
+                    $this->readSheet();
+                    break;
+                case self::XLS_TYPE_EOF:
+                    $this->readDefault();
+                    break 2;
+                default:
+                    $this->readDefault();
+                    break;
+            }
+        }
+
+        // Parse the individual sheets
+        foreach ($this->sheets as $sheet) {
+            if ($sheet['sheetType'] != 0x00) {
+                // 0x00: Worksheet
+                // 0x02: Chart
+                // 0x06: Visual Basic module
+                continue;
+            }
+
+            $tmpInfo = array();
+            $tmpInfo['worksheetName'] = $sheet['name'];
+            $tmpInfo['lastColumnLetter'] = 'A';
+            $tmpInfo['lastColumnIndex'] = 0;
+            $tmpInfo['totalRows'] = 0;
+            $tmpInfo['totalColumns'] = 0;
+
+            $this->pos = $sheet['offset'];
+
+            while ($this->pos <= $this->dataSize - 4) {
+                $code = self::getInt2d($this->data, $this->pos);
+
+                switch ($code) {
+                    case self::XLS_TYPE_RK:
+                    case self::XLS_TYPE_LABELSST:
+                    case self::XLS_TYPE_NUMBER:
+                    case self::XLS_TYPE_FORMULA:
+                    case self::XLS_TYPE_BOOLERR:
+                    case self::XLS_TYPE_LABEL:
+                        $length = self::getInt2d($this->data, $this->pos + 2);
+                        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+                        // move stream pointer to next record
+                        $this->pos += 4 + $length;
+
+                        $rowIndex = self::getInt2d($recordData, 0) + 1;
+                        $columnIndex = self::getInt2d($recordData, 2);
+
+                        $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+                        $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+                        break;
+                    case self::XLS_TYPE_BOF:
+                        $this->readBof();
+                        break;
+                    case self::XLS_TYPE_EOF:
+                        $this->readDefault();
+                        break 2;
+                    default:
+                        $this->readDefault();
+                        break;
+                }
+            }
+
+            $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+            $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+            $worksheetInfo[] = $tmpInfo;
+        }
+
+        return $worksheetInfo;
+    }
+
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Read the OLE file
+        $this->loadOLE($pFilename);
+
+        // Initialisations
+        $this->phpExcel = new PHPExcel;
+        $this->phpExcel->removeSheetByIndex(0); // remove 1st sheet
+        if (!$this->readDataOnly) {
+            $this->phpExcel->removeCellStyleXfByIndex(0); // remove the default style
+            $this->phpExcel->removeCellXfByIndex(0); // remove the default style
+        }
+
+        // Read the summary information stream (containing meta data)
+        $this->readSummaryInformation();
+
+        // Read the Additional document summary information stream (containing application-specific meta data)
+        $this->readDocumentSummaryInformation();
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        // initialize
+        $this->pos                 = 0;
+        $this->codepage            = 'CP1252';
+        $this->formats             = array();
+        $this->objFonts            = array();
+        $this->palette             = array();
+        $this->sheets              = array();
+        $this->externalBooks       = array();
+        $this->ref                 = array();
+        $this->definedname         = array();
+        $this->sst                 = array();
+        $this->drawingGroupData    = '';
+        $this->xfIndex             = '';
+        $this->mapCellXfIndex      = array();
+        $this->mapCellStyleXfIndex = array();
+
+        // Parse Workbook Global Substream
+        while ($this->pos < $this->dataSize) {
+            $code = self::getInt2d($this->data, $this->pos);
+
+            switch ($code) {
+                case self::XLS_TYPE_BOF:
+                    $this->readBof();
+                    break;
+                case self::XLS_TYPE_FILEPASS:
+                    $this->readFilepass();
+                    break;
+                case self::XLS_TYPE_CODEPAGE:
+                    $this->readCodepage();
+                    break;
+                case self::XLS_TYPE_DATEMODE:
+                    $this->readDateMode();
+                    break;
+                case self::XLS_TYPE_FONT:
+                    $this->readFont();
+                    break;
+                case self::XLS_TYPE_FORMAT:
+                    $this->readFormat();
+                    break;
+                case self::XLS_TYPE_XF:
+                    $this->readXf();
+                    break;
+                case self::XLS_TYPE_XFEXT:
+                    $this->readXfExt();
+                    break;
+                case self::XLS_TYPE_STYLE:
+                    $this->readStyle();
+                    break;
+                case self::XLS_TYPE_PALETTE:
+                    $this->readPalette();
+                    break;
+                case self::XLS_TYPE_SHEET:
+                    $this->readSheet();
+                    break;
+                case self::XLS_TYPE_EXTERNALBOOK:
+                    $this->readExternalBook();
+                    break;
+                case self::XLS_TYPE_EXTERNNAME:
+                    $this->readExternName();
+                    break;
+                case self::XLS_TYPE_EXTERNSHEET:
+                    $this->readExternSheet();
+                    break;
+                case self::XLS_TYPE_DEFINEDNAME:
+                    $this->readDefinedName();
+                    break;
+                case self::XLS_TYPE_MSODRAWINGGROUP:
+                    $this->readMsoDrawingGroup();
+                    break;
+                case self::XLS_TYPE_SST:
+                    $this->readSst();
+                    break;
+                case self::XLS_TYPE_EOF:
+                    $this->readDefault();
+                    break 2;
+                default:
+                    $this->readDefault();
+                    break;
+            }
+        }
+
+        // Resolve indexed colors for font, fill, and border colors
+        // Cannot be resolved already in XF record, because PALETTE record comes afterwards
+        if (!$this->readDataOnly) {
+            foreach ($this->objFonts as $objFont) {
+                if (isset($objFont->colorIndex)) {
+                    $color = PHPExcel_Reader_Excel5_Color::map($objFont->colorIndex, $this->palette, $this->version);
+                    $objFont->getColor()->setRGB($color['rgb']);
+                }
+            }
+
+            foreach ($this->phpExcel->getCellXfCollection() as $objStyle) {
+                // fill start and end color
+                $fill = $objStyle->getFill();
+
+                if (isset($fill->startcolorIndex)) {
+                    $startColor = PHPExcel_Reader_Excel5_Color::map($fill->startcolorIndex, $this->palette, $this->version);
+                    $fill->getStartColor()->setRGB($startColor['rgb']);
+                }
+                if (isset($fill->endcolorIndex)) {
+                    $endColor = PHPExcel_Reader_Excel5_Color::map($fill->endcolorIndex, $this->palette, $this->version);
+                    $fill->getEndColor()->setRGB($endColor['rgb']);
+                }
+
+                // border colors
+                $top      = $objStyle->getBorders()->getTop();
+                $right    = $objStyle->getBorders()->getRight();
+                $bottom   = $objStyle->getBorders()->getBottom();
+                $left     = $objStyle->getBorders()->getLeft();
+                $diagonal = $objStyle->getBorders()->getDiagonal();
+
+                if (isset($top->colorIndex)) {
+                    $borderTopColor = PHPExcel_Reader_Excel5_Color::map($top->colorIndex, $this->palette, $this->version);
+                    $top->getColor()->setRGB($borderTopColor['rgb']);
+                }
+                if (isset($right->colorIndex)) {
+                    $borderRightColor = PHPExcel_Reader_Excel5_Color::map($right->colorIndex, $this->palette, $this->version);
+                    $right->getColor()->setRGB($borderRightColor['rgb']);
+                }
+                if (isset($bottom->colorIndex)) {
+                    $borderBottomColor = PHPExcel_Reader_Excel5_Color::map($bottom->colorIndex, $this->palette, $this->version);
+                    $bottom->getColor()->setRGB($borderBottomColor['rgb']);
+                }
+                if (isset($left->colorIndex)) {
+                    $borderLeftColor = PHPExcel_Reader_Excel5_Color::map($left->colorIndex, $this->palette, $this->version);
+                    $left->getColor()->setRGB($borderLeftColor['rgb']);
+                }
+                if (isset($diagonal->colorIndex)) {
+                    $borderDiagonalColor = PHPExcel_Reader_Excel5_Color::map($diagonal->colorIndex, $this->palette, $this->version);
+                    $diagonal->getColor()->setRGB($borderDiagonalColor['rgb']);
+                }
+            }
+        }
+
+        // treat MSODRAWINGGROUP records, workbook-level Escher
+        if (!$this->readDataOnly && $this->drawingGroupData) {
+            $escherWorkbook = new PHPExcel_Shared_Escher();
+            $reader = new PHPExcel_Reader_Excel5_Escher($escherWorkbook);
+            $escherWorkbook = $reader->load($this->drawingGroupData);
+
+            // debug Escher stream
+            //$debug = new Debug_Escher(new PHPExcel_Shared_Escher());
+            //$debug->load($this->drawingGroupData);
+        }
+
+        // Parse the individual sheets
+        foreach ($this->sheets as $sheet) {
+            if ($sheet['sheetType'] != 0x00) {
+                // 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
+                continue;
+            }
+
+            // check if sheet should be skipped
+            if (isset($this->loadSheetsOnly) && !in_array($sheet['name'], $this->loadSheetsOnly)) {
+                continue;
+            }
+
+            // add sheet to PHPExcel object
+            $this->phpSheet = $this->phpExcel->createSheet();
+            //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+            //        cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+            //        name in line with the formula, not the reverse
+            $this->phpSheet->setTitle($sheet['name'], false);
+            $this->phpSheet->setSheetState($sheet['sheetState']);
+
+            $this->pos = $sheet['offset'];
+
+            // Initialize isFitToPages. May change after reading SHEETPR record.
+            $this->isFitToPages = false;
+
+            // Initialize drawingData
+            $this->drawingData = '';
+
+            // Initialize objs
+            $this->objs = array();
+
+            // Initialize shared formula parts
+            $this->sharedFormulaParts = array();
+
+            // Initialize shared formulas
+            $this->sharedFormulas = array();
+
+            // Initialize text objs
+            $this->textObjects = array();
+
+            // Initialize cell annotations
+            $this->cellNotes = array();
+            $this->textObjRef = -1;
+
+            while ($this->pos <= $this->dataSize - 4) {
+                $code = self::getInt2d($this->data, $this->pos);
+
+                switch ($code) {
+                    case self::XLS_TYPE_BOF:
+                        $this->readBof();
+                        break;
+                    case self::XLS_TYPE_PRINTGRIDLINES:
+                        $this->readPrintGridlines();
+                        break;
+                    case self::XLS_TYPE_DEFAULTROWHEIGHT:
+                        $this->readDefaultRowHeight();
+                        break;
+                    case self::XLS_TYPE_SHEETPR:
+                        $this->readSheetPr();
+                        break;
+                    case self::XLS_TYPE_HORIZONTALPAGEBREAKS:
+                        $this->readHorizontalPageBreaks();
+                        break;
+                    case self::XLS_TYPE_VERTICALPAGEBREAKS:
+                        $this->readVerticalPageBreaks();
+                        break;
+                    case self::XLS_TYPE_HEADER:
+                        $this->readHeader();
+                        break;
+                    case self::XLS_TYPE_FOOTER:
+                        $this->readFooter();
+                        break;
+                    case self::XLS_TYPE_HCENTER:
+                        $this->readHcenter();
+                        break;
+                    case self::XLS_TYPE_VCENTER:
+                        $this->readVcenter();
+                        break;
+                    case self::XLS_TYPE_LEFTMARGIN:
+                        $this->readLeftMargin();
+                        break;
+                    case self::XLS_TYPE_RIGHTMARGIN:
+                        $this->readRightMargin();
+                        break;
+                    case self::XLS_TYPE_TOPMARGIN:
+                        $this->readTopMargin();
+                        break;
+                    case self::XLS_TYPE_BOTTOMMARGIN:
+                        $this->readBottomMargin();
+                        break;
+                    case self::XLS_TYPE_PAGESETUP:
+                        $this->readPageSetup();
+                        break;
+                    case self::XLS_TYPE_PROTECT:
+                        $this->readProtect();
+                        break;
+                    case self::XLS_TYPE_SCENPROTECT:
+                        $this->readScenProtect();
+                        break;
+                    case self::XLS_TYPE_OBJECTPROTECT:
+                        $this->readObjectProtect();
+                        break;
+                    case self::XLS_TYPE_PASSWORD:
+                        $this->readPassword();
+                        break;
+                    case self::XLS_TYPE_DEFCOLWIDTH:
+                        $this->readDefColWidth();
+                        break;
+                    case self::XLS_TYPE_COLINFO:
+                        $this->readColInfo();
+                        break;
+                    case self::XLS_TYPE_DIMENSION:
+                        $this->readDefault();
+                        break;
+                    case self::XLS_TYPE_ROW:
+                        $this->readRow();
+                        break;
+                    case self::XLS_TYPE_DBCELL:
+                        $this->readDefault();
+                        break;
+                    case self::XLS_TYPE_RK:
+                        $this->readRk();
+                        break;
+                    case self::XLS_TYPE_LABELSST:
+                        $this->readLabelSst();
+                        break;
+                    case self::XLS_TYPE_MULRK:
+                        $this->readMulRk();
+                        break;
+                    case self::XLS_TYPE_NUMBER:
+                        $this->readNumber();
+                        break;
+                    case self::XLS_TYPE_FORMULA:
+                        $this->readFormula();
+                        break;
+                    case self::XLS_TYPE_SHAREDFMLA:
+                        $this->readSharedFmla();
+                        break;
+                    case self::XLS_TYPE_BOOLERR:
+                        $this->readBoolErr();
+                        break;
+                    case self::XLS_TYPE_MULBLANK:
+                        $this->readMulBlank();
+                        break;
+                    case self::XLS_TYPE_LABEL:
+                        $this->readLabel();
+                        break;
+                    case self::XLS_TYPE_BLANK:
+                        $this->readBlank();
+                        break;
+                    case self::XLS_TYPE_MSODRAWING:
+                        $this->readMsoDrawing();
+                        break;
+                    case self::XLS_TYPE_OBJ:
+                        $this->readObj();
+                        break;
+                    case self::XLS_TYPE_WINDOW2:
+                        $this->readWindow2();
+                        break;
+                    case self::XLS_TYPE_PAGELAYOUTVIEW:
+                        $this->readPageLayoutView();
+                        break;
+                    case self::XLS_TYPE_SCL:
+                        $this->readScl();
+                        break;
+                    case self::XLS_TYPE_PANE:
+                        $this->readPane();
+                        break;
+                    case self::XLS_TYPE_SELECTION:
+                        $this->readSelection();
+                        break;
+                    case self::XLS_TYPE_MERGEDCELLS:
+                        $this->readMergedCells();
+                        break;
+                    case self::XLS_TYPE_HYPERLINK:
+                        $this->readHyperLink();
+                        break;
+                    case self::XLS_TYPE_DATAVALIDATIONS:
+                        $this->readDataValidations();
+                        break;
+                    case self::XLS_TYPE_DATAVALIDATION:
+                        $this->readDataValidation();
+                        break;
+                    case self::XLS_TYPE_SHEETLAYOUT:
+                        $this->readSheetLayout();
+                        break;
+                    case self::XLS_TYPE_SHEETPROTECTION:
+                        $this->readSheetProtection();
+                        break;
+                    case self::XLS_TYPE_RANGEPROTECTION:
+                        $this->readRangeProtection();
+                        break;
+                    case self::XLS_TYPE_NOTE:
+                        $this->readNote();
+                        break;
+                    //case self::XLS_TYPE_IMDATA:                $this->readImData();                    break;
+                    case self::XLS_TYPE_TXO:
+                        $this->readTextObject();
+                        break;
+                    case self::XLS_TYPE_CONTINUE:
+                        $this->readContinue();
+                        break;
+                    case self::XLS_TYPE_EOF:
+                        $this->readDefault();
+                        break 2;
+                    default:
+                        $this->readDefault();
+                        break;
+                }
+
+            }
+
+            // treat MSODRAWING records, sheet-level Escher
+            if (!$this->readDataOnly && $this->drawingData) {
+                $escherWorksheet = new PHPExcel_Shared_Escher();
+                $reader = new PHPExcel_Reader_Excel5_Escher($escherWorksheet);
+                $escherWorksheet = $reader->load($this->drawingData);
+
+                // debug Escher stream
+                //$debug = new Debug_Escher(new PHPExcel_Shared_Escher());
+                //$debug->load($this->drawingData);
+
+                // get all spContainers in one long array, so they can be mapped to OBJ records
+                $allSpContainers = $escherWorksheet->getDgContainer()->getSpgrContainer()->getAllSpContainers();
+            }
+
+            // treat OBJ records
+            foreach ($this->objs as $n => $obj) {
+//                echo '<hr /><b>Object</b> reference is ', $n,'<br />';
+//                var_dump($obj);
+//                echo '<br />';
+
+                // the first shape container never has a corresponding OBJ record, hence $n + 1
+                if (isset($allSpContainers[$n + 1]) && is_object($allSpContainers[$n + 1])) {
+                    $spContainer = $allSpContainers[$n + 1];
+
+                    // we skip all spContainers that are a part of a group shape since we cannot yet handle those
+                    if ($spContainer->getNestingLevel() > 1) {
+                        continue;
+                    }
+
+                    // calculate the width and height of the shape
+                    list($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($spContainer->getStartCoordinates());
+                    list($endColumn, $endRow) = PHPExcel_Cell::coordinateFromString($spContainer->getEndCoordinates());
+
+                    $startOffsetX = $spContainer->getStartOffsetX();
+                    $startOffsetY = $spContainer->getStartOffsetY();
+                    $endOffsetX = $spContainer->getEndOffsetX();
+                    $endOffsetY = $spContainer->getEndOffsetY();
+
+                    $width = PHPExcel_Shared_Excel5::getDistanceX($this->phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
+                    $height = PHPExcel_Shared_Excel5::getDistanceY($this->phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
+
+                    // calculate offsetX and offsetY of the shape
+                    $offsetX = $startOffsetX * PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, $startColumn) / 1024;
+                    $offsetY = $startOffsetY * PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $startRow) / 256;
+
+                    switch ($obj['otObjType']) {
+                        case 0x19:
+                            // Note
+//                            echo 'Cell Annotation Object<br />';
+//                            echo 'Object ID is ', $obj['idObjID'],'<br />';
+                            if (isset($this->cellNotes[$obj['idObjID']])) {
+                                $cellNote = $this->cellNotes[$obj['idObjID']];
+
+                                if (isset($this->textObjects[$obj['idObjID']])) {
+                                    $textObject = $this->textObjects[$obj['idObjID']];
+                                    $this->cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
+                                }
+                            }
+                            break;
+                        case 0x08:
+//                            echo 'Picture Object<br />';
+                            // picture
+                            // get index to BSE entry (1-based)
+                            $BSEindex = $spContainer->getOPT(0x0104);
+                            $BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
+                            $BSE = $BSECollection[$BSEindex - 1];
+                            $blipType = $BSE->getBlipType();
+
+                            // need check because some blip types are not supported by Escher reader such as EMF
+                            if ($blip = $BSE->getBlip()) {
+                                $ih = imagecreatefromstring($blip->getData());
+                                $drawing = new PHPExcel_Worksheet_MemoryDrawing();
+                                $drawing->setImageResource($ih);
+
+                                // width, height, offsetX, offsetY
+                                $drawing->setResizeProportional(false);
+                                $drawing->setWidth($width);
+                                $drawing->setHeight($height);
+                                $drawing->setOffsetX($offsetX);
+                                $drawing->setOffsetY($offsetY);
+
+                                switch ($blipType) {
+                                    case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+                                        $drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
+                                        $drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
+                                        break;
+                                    case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+                                        $drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
+                                        $drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
+                                        break;
+                                }
+
+                                $drawing->setWorksheet($this->phpSheet);
+                                $drawing->setCoordinates($spContainer->getStartCoordinates());
+                            }
+                            break;
+                        default:
+                            // other object type
+                            break;
+                    }
+                }
+            }
+
+            // treat SHAREDFMLA records
+            if ($this->version == self::XLS_BIFF8) {
+                foreach ($this->sharedFormulaParts as $cell => $baseCell) {
+                    list($column, $row) = PHPExcel_Cell::coordinateFromString($cell);
+                    if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
+                        $formula = $this->getFormulaFromStructure($this->sharedFormulas[$baseCell], $cell);
+                        $this->phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
+                    }
+                }
+            }
+
+            if (!empty($this->cellNotes)) {
+                foreach ($this->cellNotes as $note => $noteDetails) {
+                    if (!isset($noteDetails['objTextData'])) {
+                        if (isset($this->textObjects[$note])) {
+                            $textObject = $this->textObjects[$note];
+                            $noteDetails['objTextData'] = $textObject;
+                        } else {
+                            $noteDetails['objTextData']['text'] = '';
+                        }
+                    }
+//                    echo '<b>Cell annotation ', $note,'</b><br />';
+//                    var_dump($noteDetails);
+//                    echo '<br />';
+                    $cellAddress = str_replace('$', '', $noteDetails['cellRef']);
+                    $this->phpSheet->getComment($cellAddress)->setAuthor($noteDetails['author'])->setText($this->parseRichText($noteDetails['objTextData']['text']));
+                }
+            }
+        }
+
+        // add the named ranges (defined names)
+        foreach ($this->definedname as $definedName) {
+            if ($definedName['isBuiltInName']) {
+                switch ($definedName['name']) {
+                    case pack('C', 0x06):
+                        // print area
+                        //    in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
+                        $ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+
+                        $extractedRanges = array();
+                        foreach ($ranges as $range) {
+                            // $range should look like one of these
+                            //        Foo!$C$7:$J$66
+                            //        Bar!$A$1:$IV$2
+                            $explodes = explode('!', $range);    // FIXME: what if sheetname contains exclamation mark?
+                            $sheetName = trim($explodes[0], "'");
+                            if (count($explodes) == 2) {
+                                if (strpos($explodes[1], ':') === false) {
+                                    $explodes[1] = $explodes[1] . ':' . $explodes[1];
+                                }
+                                $extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+                            }
+                        }
+                        if ($docSheet = $this->phpExcel->getSheetByName($sheetName)) {
+                            $docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
+                        }
+                        break;
+                    case pack('C', 0x07):
+                        // print titles (repeating rows)
+                        // Assuming BIFF8, there are 3 cases
+                        // 1. repeating rows
+                        //        formula looks like this: Sheet!$A$1:$IV$2
+                        //        rows 1-2 repeat
+                        // 2. repeating columns
+                        //        formula looks like this: Sheet!$A$1:$B$65536
+                        //        columns A-B repeat
+                        // 3. both repeating rows and repeating columns
+                        //        formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
+                        $ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+                        foreach ($ranges as $range) {
+                            // $range should look like this one of these
+                            //        Sheet!$A$1:$B$65536
+                            //        Sheet!$A$1:$IV$2
+                            $explodes = explode('!', $range);
+                            if (count($explodes) == 2) {
+                                if ($docSheet = $this->phpExcel->getSheetByName($explodes[0])) {
+                                    $extractedRange = $explodes[1];
+                                    $extractedRange = str_replace('$', '', $extractedRange);
+
+                                    $coordinateStrings = explode(':', $extractedRange);
+                                    if (count($coordinateStrings) == 2) {
+                                        list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
+                                        list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
+
+                                        if ($firstColumn == 'A' and $lastColumn == 'IV') {
+                                            // then we have repeating rows
+                                            $docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
+                                        } elseif ($firstRow == 1 and $lastRow == 65536) {
+                                            // then we have repeating columns
+                                            $docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                }
+            } else {
+                // Extract range
+                $explodes = explode('!', $definedName['formula']);
+
+                if (count($explodes) == 2) {
+                    if (($docSheet = $this->phpExcel->getSheetByName($explodes[0])) ||
+                        ($docSheet = $this->phpExcel->getSheetByName(trim($explodes[0], "'")))) {
+                        $extractedRange = $explodes[1];
+                        $extractedRange = str_replace('$', '', $extractedRange);
+
+                        $localOnly = ($definedName['scope'] == 0) ? false : true;
+
+                        $scope = ($definedName['scope'] == 0) ? null : $this->phpExcel->getSheetByName($this->sheets[$definedName['scope'] - 1]['name']);
+
+                        $this->phpExcel->addNamedRange(new PHPExcel_NamedRange((string)$definedName['name'], $docSheet, $extractedRange, $localOnly, $scope));
+                    }
+                } else {
+                    //    Named Value
+                    //    TODO Provide support for named values
+                }
+            }
+        }
+        $this->data = null;
+
+        return $this->phpExcel;
+    }
+    
+    /**
+     * Read record data from stream, decrypting as required
+     *
+     * @param string $data   Data stream to read from
+     * @param int    $pos    Position to start reading from
+     * @param int    $length Record data length
+     *
+     * @return string Record data
+     */
+    private function readRecordData($data, $pos, $len)
+    {
+        $data = substr($data, $pos, $len);
+        
+        // File not encrypted, or record before encryption start point
+        if ($this->encryption == self::MS_BIFF_CRYPTO_NONE || $pos < $this->encryptionStartPos) {
+            return $data;
+        }
+    
+        $recordData = '';
+        if ($this->encryption == self::MS_BIFF_CRYPTO_RC4) {
+            $oldBlock = floor($this->rc4Pos / self::REKEY_BLOCK);
+            $block = floor($pos / self::REKEY_BLOCK);
+            $endBlock = floor(($pos + $len) / self::REKEY_BLOCK);
+
+            // Spin an RC4 decryptor to the right spot. If we have a decryptor sitting
+            // at a point earlier in the current block, re-use it as we can save some time.
+            if ($block != $oldBlock || $pos < $this->rc4Pos || !$this->rc4Key) {
+                $this->rc4Key = $this->makeKey($block, $this->md5Ctxt);
+                $step = $pos % self::REKEY_BLOCK;
+            } else {
+                $step = $pos - $this->rc4Pos;
+            }
+            $this->rc4Key->RC4(str_repeat("\0", $step));
+
+            // Decrypt record data (re-keying at the end of every block)
+            while ($block != $endBlock) {
+                $step = self::REKEY_BLOCK - ($pos % self::REKEY_BLOCK);
+                $recordData .= $this->rc4Key->RC4(substr($data, 0, $step));
+                $data = substr($data, $step);
+                $pos += $step;
+                $len -= $step;
+                $block++;
+                $this->rc4Key = $this->makeKey($block, $this->md5Ctxt);
+            }
+            $recordData .= $this->rc4Key->RC4(substr($data, 0, $len));
+
+            // Keep track of the position of this decryptor.
+            // We'll try and re-use it later if we can to speed things up
+            $this->rc4Pos = $pos + $len;
+        } elseif ($this->encryption == self::MS_BIFF_CRYPTO_XOR) {
+            throw new PHPExcel_Reader_Exception('XOr encryption not supported');
+        }
+        return $recordData;
+    }
+
+    /**
+     * Use OLE reader to extract the relevant data streams from the OLE file
+     *
+     * @param string $pFilename
+     */
+    private function loadOLE($pFilename)
+    {
+        // OLE reader
+        $ole = new PHPExcel_Shared_OLERead();
+        // get excel data,
+        $res = $ole->read($pFilename);
+        // Get workbook data: workbook stream + sheet streams
+        $this->data = $ole->getStream($ole->wrkbook);
+        // Get summary information data
+        $this->summaryInformation = $ole->getStream($ole->summaryInformation);
+        // Get additional document summary information data
+        $this->documentSummaryInformation = $ole->getStream($ole->documentSummaryInformation);
+        // Get user-defined property data
+//        $this->userDefinedProperties = $ole->getUserDefinedProperties();
+    }
+
+
+    /**
+     * Read summary information
+     */
+    private function readSummaryInformation()
+    {
+        if (!isset($this->summaryInformation)) {
+            return;
+        }
+
+        // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        // offset: 2; size: 2;
+        // offset: 4; size: 2; OS version
+        // offset: 6; size: 2; OS indicator
+        // offset: 8; size: 16
+        // offset: 24; size: 4; section count
+        $secCount = self::getInt4d($this->summaryInformation, 24);
+
+        // offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
+        // offset: 44; size: 4
+        $secOffset = self::getInt4d($this->summaryInformation, 44);
+
+        // section header
+        // offset: $secOffset; size: 4; section length
+        $secLength = self::getInt4d($this->summaryInformation, $secOffset);
+
+        // offset: $secOffset+4; size: 4; property count
+        $countProperties = self::getInt4d($this->summaryInformation, $secOffset+4);
+
+        // initialize code page (used to resolve string values)
+        $codePage = 'CP1252';
+
+        // offset: ($secOffset+8); size: var
+        // loop through property decarations and properties
+        for ($i = 0; $i < $countProperties; ++$i) {
+            // offset: ($secOffset+8) + (8 * $i); size: 4; property ID
+            $id = self::getInt4d($this->summaryInformation, ($secOffset+8) + (8 * $i));
+
+            // Use value of property id as appropriate
+            // offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
+            $offset = self::getInt4d($this->summaryInformation, ($secOffset+12) + (8 * $i));
+
+            $type = self::getInt4d($this->summaryInformation, $secOffset + $offset);
+
+            // initialize property value
+            $value = null;
+
+            // extract property value based on property type
+            switch ($type) {
+                case 0x02: // 2 byte signed integer
+                    $value = self::getInt2d($this->summaryInformation, $secOffset + 4 + $offset);
+                    break;
+                case 0x03: // 4 byte signed integer
+                    $value = self::getInt4d($this->summaryInformation, $secOffset + 4 + $offset);
+                    break;
+                case 0x13: // 4 byte unsigned integer
+                    // not needed yet, fix later if necessary
+                    break;
+                case 0x1E: // null-terminated string prepended by dword string length
+                    $byteLength = self::getInt4d($this->summaryInformation, $secOffset + 4 + $offset);
+                    $value = substr($this->summaryInformation, $secOffset + 8 + $offset, $byteLength);
+                    $value = PHPExcel_Shared_String::ConvertEncoding($value, 'UTF-8', $codePage);
+                    $value = rtrim($value);
+                    break;
+                case 0x40: // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                    // PHP-time
+                    $value = PHPExcel_Shared_OLE::OLE2LocalDate(substr($this->summaryInformation, $secOffset + 4 + $offset, 8));
+                    break;
+                case 0x47: // Clipboard format
+                    // not needed yet, fix later if necessary
+                    break;
+            }
+
+            switch ($id) {
+                case 0x01:    //    Code Page
+                    $codePage = PHPExcel_Shared_CodePage::NumberToName($value);
+                    break;
+                case 0x02:    //    Title
+                    $this->phpExcel->getProperties()->setTitle($value);
+                    break;
+                case 0x03:    //    Subject
+                    $this->phpExcel->getProperties()->setSubject($value);
+                    break;
+                case 0x04:    //    Author (Creator)
+                    $this->phpExcel->getProperties()->setCreator($value);
+                    break;
+                case 0x05:    //    Keywords
+                    $this->phpExcel->getProperties()->setKeywords($value);
+                    break;
+                case 0x06:    //    Comments (Description)
+                    $this->phpExcel->getProperties()->setDescription($value);
+                    break;
+                case 0x07:    //    Template
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x08:    //    Last Saved By (LastModifiedBy)
+                    $this->phpExcel->getProperties()->setLastModifiedBy($value);
+                    break;
+                case 0x09:    //    Revision
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0A:    //    Total Editing Time
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0B:    //    Last Printed
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0C:    //    Created Date/Time
+                    $this->phpExcel->getProperties()->setCreated($value);
+                    break;
+                case 0x0D:    //    Modified Date/Time
+                    $this->phpExcel->getProperties()->setModified($value);
+                    break;
+                case 0x0E:    //    Number of Pages
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0F:    //    Number of Words
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x10:    //    Number of Characters
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x11:    //    Thumbnail
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x12:    //    Name of creating application
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x13:    //    Security
+                    //    Not supported by PHPExcel
+                    break;
+            }
+        }
+    }
+
+
+    /**
+     * Read additional document summary information
+     */
+    private function readDocumentSummaryInformation()
+    {
+        if (!isset($this->documentSummaryInformation)) {
+            return;
+        }
+
+        //    offset: 0;    size: 2;    must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        //    offset: 2;    size: 2;
+        //    offset: 4;    size: 2;    OS version
+        //    offset: 6;    size: 2;    OS indicator
+        //    offset: 8;    size: 16
+        //    offset: 24;    size: 4;    section count
+        $secCount = self::getInt4d($this->documentSummaryInformation, 24);
+//        echo '$secCount = ', $secCount,'<br />';
+
+        // offset: 28;    size: 16;    first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
+        // offset: 44;    size: 4;    first section offset
+        $secOffset = self::getInt4d($this->documentSummaryInformation, 44);
+//        echo '$secOffset = ', $secOffset,'<br />';
+
+        //    section header
+        //    offset: $secOffset;    size: 4;    section length
+        $secLength = self::getInt4d($this->documentSummaryInformation, $secOffset);
+//        echo '$secLength = ', $secLength,'<br />';
+
+        //    offset: $secOffset+4;    size: 4;    property count
+        $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset+4);
+//        echo '$countProperties = ', $countProperties,'<br />';
+
+        // initialize code page (used to resolve string values)
+        $codePage = 'CP1252';
+
+        //    offset: ($secOffset+8);    size: var
+        //    loop through property decarations and properties
+        for ($i = 0; $i < $countProperties; ++$i) {
+//            echo 'Property ', $i,'<br />';
+            //    offset: ($secOffset+8) + (8 * $i);    size: 4;    property ID
+            $id = self::getInt4d($this->documentSummaryInformation, ($secOffset+8) + (8 * $i));
+//            echo 'ID is ', $id,'<br />';
+
+            // Use value of property id as appropriate
+            // offset: 60 + 8 * $i;    size: 4;    offset from beginning of section (48)
+            $offset = self::getInt4d($this->documentSummaryInformation, ($secOffset+12) + (8 * $i));
+
+            $type = self::getInt4d($this->documentSummaryInformation, $secOffset + $offset);
+//            echo 'Type is ', $type,', ';
+
+            // initialize property value
+            $value = null;
+
+            // extract property value based on property type
+            switch ($type) {
+                case 0x02:    //    2 byte signed integer
+                    $value = self::getInt2d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+                    break;
+                case 0x03:    //    4 byte signed integer
+                    $value = self::getInt4d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+                    break;
+                case 0x0B:  // Boolean
+                    $value = self::getInt2d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+                    $value = ($value == 0 ? false : true);
+                    break;
+                case 0x13:    //    4 byte unsigned integer
+                    // not needed yet, fix later if necessary
+                    break;
+                case 0x1E:    //    null-terminated string prepended by dword string length
+                    $byteLength = self::getInt4d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+                    $value = substr($this->documentSummaryInformation, $secOffset + 8 + $offset, $byteLength);
+                    $value = PHPExcel_Shared_String::ConvertEncoding($value, 'UTF-8', $codePage);
+                    $value = rtrim($value);
+                    break;
+                case 0x40:    //    Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                    // PHP-Time
+                    $value = PHPExcel_Shared_OLE::OLE2LocalDate(substr($this->documentSummaryInformation, $secOffset + 4 + $offset, 8));
+                    break;
+                case 0x47:    //    Clipboard format
+                    // not needed yet, fix later if necessary
+                    break;
+            }
+
+            switch ($id) {
+                case 0x01:    //    Code Page
+                    $codePage = PHPExcel_Shared_CodePage::NumberToName($value);
+                    break;
+                case 0x02:    //    Category
+                    $this->phpExcel->getProperties()->setCategory($value);
+                    break;
+                case 0x03:    //    Presentation Target
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x04:    //    Bytes
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x05:    //    Lines
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x06:    //    Paragraphs
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x07:    //    Slides
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x08:    //    Notes
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x09:    //    Hidden Slides
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0A:    //    MM Clips
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0B:    //    Scale Crop
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0C:    //    Heading Pairs
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0D:    //    Titles of Parts
+                    //    Not supported by PHPExcel
+                    break;
+                case 0x0E:    //    Manager
+                    $this->phpExcel->getProperties()->setManager($value);
+                    break;
+                case 0x0F:    //    Company
+                    $this->phpExcel->getProperties()->setCompany($value);
+                    break;
+                case 0x10:    //    Links up-to-date
+                    //    Not supported by PHPExcel
+                    break;
+            }
+        }
+    }
+
+
+    /**
+     * Reads a general type of BIFF record. Does nothing except for moving stream pointer forward to next record.
+     */
+    private function readDefault()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+//        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+    }
+
+
+    /**
+     *    The NOTE record specifies a comment associated with a particular cell. In Excel 95 (BIFF7) and earlier versions,
+     *        this record stores a note (cell note). This feature was significantly enhanced in Excel 97.
+     */
+    private function readNote()
+    {
+//        echo '<b>Read Cell Annotation</b><br />';
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        $cellAddress = $this->readBIFF8CellAddress(substr($recordData, 0, 4));
+        if ($this->version == self::XLS_BIFF8) {
+            $noteObjID = self::getInt2d($recordData, 6);
+            $noteAuthor = self::readUnicodeStringLong(substr($recordData, 8));
+            $noteAuthor = $noteAuthor['value'];
+//            echo 'Note Address=', $cellAddress,'<br />';
+//            echo 'Note Object ID=', $noteObjID,'<br />';
+//            echo 'Note Author=', $noteAuthor,'<hr />';
+//
+            $this->cellNotes[$noteObjID] = array(
+                'cellRef'   => $cellAddress,
+                'objectID'  => $noteObjID,
+                'author'    => $noteAuthor
+            );
+        } else {
+            $extension = false;
+            if ($cellAddress == '$B$65536') {
+                //    If the address row is -1 and the column is 0, (which translates as $B$65536) then this is a continuation
+                //        note from the previous cell annotation. We're not yet handling this, so annotations longer than the
+                //        max 2048 bytes will probably throw a wobbly.
+                $row = self::getInt2d($recordData, 0);
+                $extension = true;
+                $cellAddress = array_pop(array_keys($this->phpSheet->getComments()));
+            }
+//            echo 'Note Address=', $cellAddress,'<br />';
+
+            $cellAddress = str_replace('$', '', $cellAddress);
+            $noteLength = self::getInt2d($recordData, 4);
+            $noteText = trim(substr($recordData, 6));
+//            echo 'Note Length=', $noteLength,'<br />';
+//            echo 'Note Text=', $noteText,'<br />';
+
+            if ($extension) {
+                //    Concatenate this extension with the currently set comment for the cell
+                $comment = $this->phpSheet->getComment($cellAddress);
+                $commentText = $comment->getText()->getPlainText();
+                $comment->setText($this->parseRichText($commentText.$noteText));
+            } else {
+                //    Set comment for the cell
+                $this->phpSheet->getComment($cellAddress)->setText($this->parseRichText($noteText));
+//                                                    ->setAuthor($author)
+            }
+        }
+
+    }
+
+
+    /**
+     *    The TEXT Object record contains the text associated with a cell annotation.
+     */
+    private function readTextObject()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // recordData consists of an array of subrecords looking like this:
+        //    grbit: 2 bytes; Option Flags
+        //    rot: 2 bytes; rotation
+        //    cchText: 2 bytes; length of the text (in the first continue record)
+        //    cbRuns: 2 bytes; length of the formatting (in the second continue record)
+        // followed by the continuation records containing the actual text and formatting
+        $grbitOpts  = self::getInt2d($recordData, 0);
+        $rot        = self::getInt2d($recordData, 2);
+        $cchText    = self::getInt2d($recordData, 10);
+        $cbRuns     = self::getInt2d($recordData, 12);
+        $text       = $this->getSplicedRecordData();
+
+        $this->textObjects[$this->textObjRef] = array(
+            'text'      => substr($text["recordData"], $text["spliceOffsets"][0]+1, $cchText),
+            'format'    => substr($text["recordData"], $text["spliceOffsets"][1], $cbRuns),
+            'alignment' => $grbitOpts,
+            'rotation'  => $rot
+        );
+
+//        echo '<b>_readTextObject()</b><br />';
+//        var_dump($this->textObjects[$this->textObjRef]);
+//        echo '<br />';
+    }
+
+
+    /**
+     * Read BOF
+     */
+    private function readBof()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = substr($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 2; size: 2; type of the following data
+        $substreamType = self::getInt2d($recordData, 2);
+
+        switch ($substreamType) {
+            case self::XLS_WorkbookGlobals:
+                $version = self::getInt2d($recordData, 0);
+                if (($version != self::XLS_BIFF8) && ($version != self::XLS_BIFF7)) {
+                    throw new PHPExcel_Reader_Exception('Cannot read this Excel file. Version is too old.');
+                }
+                $this->version = $version;
+                break;
+            case self::XLS_Worksheet:
+                // do not use this version information for anything
+                // it is unreliable (OpenOffice doc, 5.8), use only version information from the global stream
+                break;
+            default:
+                // substream, e.g. chart
+                // just skip the entire substream
+                do {
+                    $code = self::getInt2d($this->data, $this->pos);
+                    $this->readDefault();
+                } while ($code != self::XLS_TYPE_EOF && $this->pos < $this->dataSize);
+                break;
+        }
+    }
+
+
+    /**
+     * FILEPASS
+     *
+     * This record is part of the File Protection Block. It
+     * contains information about the read/write password of the
+     * file. All record contents following this record will be
+     * encrypted.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     *
+     * The decryption functions and objects used from here on in
+     * are based on the source of Spreadsheet-ParseExcel:
+     * http://search.cpan.org/~jmcnamara/Spreadsheet-ParseExcel/
+     */
+    private function readFilepass()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+
+        if ($length != 54) {
+            throw new PHPExcel_Reader_Exception('Unexpected file pass record length');
+        }
+        
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+        
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->verifyPassword('VelvetSweatshop', substr($recordData, 6, 16), substr($recordData, 22, 16), substr($recordData, 38, 16), $this->md5Ctxt)) {
+            throw new PHPExcel_Reader_Exception('Decryption password incorrect');
+        }
+        
+        $this->encryption = self::MS_BIFF_CRYPTO_RC4;
+
+        // Decryption required from the record after next onwards
+        $this->encryptionStartPos = $this->pos + self::getInt2d($this->data, $this->pos + 2);
+    }
+
+    /**
+     * Make an RC4 decryptor for the given block
+     *
+     * @var int    $block      Block for which to create decrypto
+     * @var string $valContext MD5 context state
+     *
+     * @return PHPExcel_Reader_Excel5_RC4
+     */
+    private function makeKey($block, $valContext)
+    {
+        $pwarray = str_repeat("\0", 64);
+
+        for ($i = 0; $i < 5; $i++) {
+            $pwarray[$i] = $valContext[$i];
+        }
+        
+        $pwarray[5] = chr($block & 0xff);
+        $pwarray[6] = chr(($block >> 8) & 0xff);
+        $pwarray[7] = chr(($block >> 16) & 0xff);
+        $pwarray[8] = chr(($block >> 24) & 0xff);
+
+        $pwarray[9] = "\x80";
+        $pwarray[56] = "\x48";
+
+        $md5 = new PHPExcel_Reader_Excel5_MD5();
+        $md5->add($pwarray);
+
+        $s = $md5->getContext();
+        return new PHPExcel_Reader_Excel5_RC4($s);
+    }
+
+    /**
+     * Verify RC4 file password
+     *
+     * @var string $password        Password to check
+     * @var string $docid           Document id
+     * @var string $salt_data       Salt data
+     * @var string $hashedsalt_data Hashed salt data
+     * @var string &$valContext     Set to the MD5 context of the value
+     *
+     * @return bool Success
+     */
+    private function verifyPassword($password, $docid, $salt_data, $hashedsalt_data, &$valContext)
+    {
+        $pwarray = str_repeat("\0", 64);
+
+        for ($i = 0; $i < strlen($password); $i++) {
+            $o = ord(substr($password, $i, 1));
+            $pwarray[2 * $i] = chr($o & 0xff);
+            $pwarray[2 * $i + 1] = chr(($o >> 8) & 0xff);
+        }
+        $pwarray[2 * $i] = chr(0x80);
+        $pwarray[56] = chr(($i << 4) & 0xff);
+
+        $md5 = new PHPExcel_Reader_Excel5_MD5();
+        $md5->add($pwarray);
+
+        $mdContext1 = $md5->getContext();
+
+        $offset = 0;
+        $keyoffset = 0;
+        $tocopy = 5;
+
+        $md5->reset();
+
+        while ($offset != 16) {
+            if ((64 - $offset) < 5) {
+                $tocopy = 64 - $offset;
+            }
+            for ($i = 0; $i <= $tocopy; $i++) {
+                $pwarray[$offset + $i] = $mdContext1[$keyoffset + $i];
+            }
+            $offset += $tocopy;
+
+            if ($offset == 64) {
+                $md5->add($pwarray);
+                $keyoffset = $tocopy;
+                $tocopy = 5 - $tocopy;
+                $offset = 0;
+                continue;
+            }
+
+            $keyoffset = 0;
+            $tocopy = 5;
+            for ($i = 0; $i < 16; $i++) {
+                $pwarray[$offset + $i] = $docid[$i];
+            }
+            $offset += 16;
+        }
+
+        $pwarray[16] = "\x80";
+        for ($i = 0; $i < 47; $i++) {
+            $pwarray[17 + $i] = "\0";
+        }
+        $pwarray[56] = "\x80";
+        $pwarray[57] = "\x0a";
+
+        $md5->add($pwarray);
+        $valContext = $md5->getContext();
+
+        $key = $this->makeKey(0, $valContext);
+
+        $salt = $key->RC4($salt_data);
+        $hashedsalt = $key->RC4($hashedsalt_data);
+        
+        $salt .= "\x80" . str_repeat("\0", 47);
+        $salt[56] = "\x80";
+
+        $md5->reset();
+        $md5->add($salt);
+        $mdContext2 = $md5->getContext();
+
+        return $mdContext2 == $hashedsalt;
+    }
+
+    /**
+     * CODEPAGE
+     *
+     * This record stores the text encoding used to write byte
+     * strings, stored as MS Windows code page identifier.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readCodepage()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; code page identifier
+        $codepage = self::getInt2d($recordData, 0);
+
+        $this->codepage = PHPExcel_Shared_CodePage::NumberToName($codepage);
+    }
+
+
+    /**
+     * DATEMODE
+     *
+     * This record specifies the base date for displaying date
+     * values. All dates are stored as count of days past this
+     * base date. In BIFF2-BIFF4 this record is part of the
+     * Calculation Settings Block. In BIFF5-BIFF8 it is
+     * stored in the Workbook Globals Substream.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readDateMode()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; 0 = base 1900, 1 = base 1904
+        PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
+        if (ord($recordData[0]) == 1) {
+            PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
+        }
+    }
+
+
+    /**
+     * Read a FONT record
+     */
+    private function readFont()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            $objFont = new PHPExcel_Style_Font();
+
+            // offset: 0; size: 2; height of the font (in twips = 1/20 of a point)
+            $size = self::getInt2d($recordData, 0);
+            $objFont->setSize($size / 20);
+
+            // offset: 2; size: 2; option flags
+            // bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8)
+            // bit: 1; mask 0x0002; italic
+            $isItalic = (0x0002 & self::getInt2d($recordData, 2)) >> 1;
+            if ($isItalic) {
+                $objFont->setItalic(true);
+            }
+
+            // bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8)
+            // bit: 3; mask 0x0008; strike
+            $isStrike = (0x0008 & self::getInt2d($recordData, 2)) >> 3;
+            if ($isStrike) {
+                $objFont->setStrikethrough(true);
+            }
+
+            // offset: 4; size: 2; colour index
+            $colorIndex = self::getInt2d($recordData, 4);
+            $objFont->colorIndex = $colorIndex;
+
+            // offset: 6; size: 2; font weight
+            $weight = self::getInt2d($recordData, 6);
+            switch ($weight) {
+                case 0x02BC:
+                    $objFont->setBold(true);
+                    break;
+            }
+
+            // offset: 8; size: 2; escapement type
+            $escapement = self::getInt2d($recordData, 8);
+            switch ($escapement) {
+                case 0x0001:
+                    $objFont->setSuperScript(true);
+                    break;
+                case 0x0002:
+                    $objFont->setSubScript(true);
+                    break;
+            }
+
+            // offset: 10; size: 1; underline type
+            $underlineType = ord($recordData[10]);
+            switch ($underlineType) {
+                case 0x00:
+                    break; // no underline
+                case 0x01:
+                    $objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+                    break;
+                case 0x02:
+                    $objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
+                    break;
+                case 0x21:
+                    $objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING);
+                    break;
+                case 0x22:
+                    $objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING);
+                    break;
+            }
+
+            // offset: 11; size: 1; font family
+            // offset: 12; size: 1; character set
+            // offset: 13; size: 1; not used
+            // offset: 14; size: var; font name
+            if ($this->version == self::XLS_BIFF8) {
+                $string = self::readUnicodeStringShort(substr($recordData, 14));
+            } else {
+                $string = $this->readByteStringShort(substr($recordData, 14));
+            }
+            $objFont->setName($string['value']);
+
+            $this->objFonts[] = $objFont;
+        }
+    }
+
+
+    /**
+     * FORMAT
+     *
+     * This record contains information about a number format.
+     * All FORMAT records occur together in a sequential list.
+     *
+     * In BIFF2-BIFF4 other records referencing a FORMAT record
+     * contain a zero-based index into this list. From BIFF5 on
+     * the FORMAT record contains the index itself that will be
+     * used by other records.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readFormat()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            $indexCode = self::getInt2d($recordData, 0);
+
+            if ($this->version == self::XLS_BIFF8) {
+                $string = self::readUnicodeStringLong(substr($recordData, 2));
+            } else {
+                // BIFF7
+                $string = $this->readByteStringShort(substr($recordData, 2));
+            }
+
+            $formatString = $string['value'];
+            $this->formats[$indexCode] = $formatString;
+        }
+    }
+
+
+    /**
+     * XF - Extended Format
+     *
+     * This record contains formatting information for cells, rows, columns or styles.
+     * According to http://support.microsoft.com/kb/147732 there are always at least 15 cell style XF
+     * and 1 cell XF.
+     * Inspection of Excel files generated by MS Office Excel shows that XF records 0-14 are cell style XF
+     * and XF record 15 is a cell XF
+     * We only read the first cell style XF and skip the remaining cell style XF records
+     * We read all cell XF records.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readXf()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        $objStyle = new PHPExcel_Style();
+
+        if (!$this->readDataOnly) {
+            // offset:  0; size: 2; Index to FONT record
+            if (self::getInt2d($recordData, 0) < 4) {
+                $fontIndex = self::getInt2d($recordData, 0);
+            } else {
+                // this has to do with that index 4 is omitted in all BIFF versions for some strange reason
+                // check the OpenOffice documentation of the FONT record
+                $fontIndex = self::getInt2d($recordData, 0) - 1;
+            }
+            $objStyle->setFont($this->objFonts[$fontIndex]);
+
+            // offset:  2; size: 2; Index to FORMAT record
+            $numberFormatIndex = self::getInt2d($recordData, 2);
+            if (isset($this->formats[$numberFormatIndex])) {
+                // then we have user-defined format code
+                $numberformat = array('code' => $this->formats[$numberFormatIndex]);
+            } elseif (($code = PHPExcel_Style_NumberFormat::builtInFormatCode($numberFormatIndex)) !== '') {
+                // then we have built-in format code
+                $numberformat = array('code' => $code);
+            } else {
+                // we set the general format code
+                $numberformat = array('code' => 'General');
+            }
+            $objStyle->getNumberFormat()->setFormatCode($numberformat['code']);
+
+            // offset:  4; size: 2; XF type, cell protection, and parent style XF
+            // bit 2-0; mask 0x0007; XF_TYPE_PROT
+            $xfTypeProt = self::getInt2d($recordData, 4);
+            // bit 0; mask 0x01; 1 = cell is locked
+            $isLocked = (0x01 & $xfTypeProt) >> 0;
+            $objStyle->getProtection()->setLocked($isLocked ? PHPExcel_Style_Protection::PROTECTION_INHERIT : PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
+
+            // bit 1; mask 0x02; 1 = Formula is hidden
+            $isHidden = (0x02 & $xfTypeProt) >> 1;
+            $objStyle->getProtection()->setHidden($isHidden ? PHPExcel_Style_Protection::PROTECTION_PROTECTED : PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
+
+            // bit 2; mask 0x04; 0 = Cell XF, 1 = Cell Style XF
+            $isCellStyleXf = (0x04 & $xfTypeProt) >> 2;
+
+            // offset:  6; size: 1; Alignment and text break
+            // bit 2-0, mask 0x07; horizontal alignment
+            $horAlign = (0x07 & ord($recordData[6])) >> 0;
+            switch ($horAlign) {
+                case 0:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_GENERAL);
+                    break;
+                case 1:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+                    break;
+                case 2:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+                    break;
+                case 3:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
+                    break;
+                case 4:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_FILL);
+                    break;
+                case 5:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY);
+                    break;
+                case 6:
+                    $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS);
+                    break;
+            }
+            // bit 3, mask 0x08; wrap text
+            $wrapText = (0x08 & ord($recordData[6])) >> 3;
+            switch ($wrapText) {
+                case 0:
+                    $objStyle->getAlignment()->setWrapText(false);
+                    break;
+                case 1:
+                    $objStyle->getAlignment()->setWrapText(true);
+                    break;
+            }
+            // bit 6-4, mask 0x70; vertical alignment
+            $vertAlign = (0x70 & ord($recordData[6])) >> 4;
+            switch ($vertAlign) {
+                case 0:
+                    $objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP);
+                    break;
+                case 1:
+                    $objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
+                    break;
+                case 2:
+                    $objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_BOTTOM);
+                    break;
+                case 3:
+                    $objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_JUSTIFY);
+                    break;
+            }
+
+            if ($this->version == self::XLS_BIFF8) {
+                // offset:  7; size: 1; XF_ROTATION: Text rotation angle
+                $angle = ord($recordData[7]);
+                $rotation = 0;
+                if ($angle <= 90) {
+                    $rotation = $angle;
+                } elseif ($angle <= 180) {
+                    $rotation = 90 - $angle;
+                } elseif ($angle == 255) {
+                    $rotation = -165;
+                }
+                $objStyle->getAlignment()->setTextRotation($rotation);
+
+                // offset:  8; size: 1; Indentation, shrink to cell size, and text direction
+                // bit: 3-0; mask: 0x0F; indent level
+                $indent = (0x0F & ord($recordData[8])) >> 0;
+                $objStyle->getAlignment()->setIndent($indent);
+
+                // bit: 4; mask: 0x10; 1 = shrink content to fit into cell
+                $shrinkToFit = (0x10 & ord($recordData[8])) >> 4;
+                switch ($shrinkToFit) {
+                    case 0:
+                        $objStyle->getAlignment()->setShrinkToFit(false);
+                        break;
+                    case 1:
+                        $objStyle->getAlignment()->setShrinkToFit(true);
+                        break;
+                }
+
+                // offset:  9; size: 1; Flags used for attribute groups
+
+                // offset: 10; size: 4; Cell border lines and background area
+                // bit: 3-0; mask: 0x0000000F; left style
+                if ($bordersLeftStyle = PHPExcel_Reader_Excel5_Style_Border::lookup((0x0000000F & self::getInt4d($recordData, 10)) >> 0)) {
+                    $objStyle->getBorders()->getLeft()->setBorderStyle($bordersLeftStyle);
+                }
+                // bit: 7-4; mask: 0x000000F0; right style
+                if ($bordersRightStyle = PHPExcel_Reader_Excel5_Style_Border::lookup((0x000000F0 & self::getInt4d($recordData, 10)) >> 4)) {
+                    $objStyle->getBorders()->getRight()->setBorderStyle($bordersRightStyle);
+                }
+                // bit: 11-8; mask: 0x00000F00; top style
+                if ($bordersTopStyle = PHPExcel_Reader_Excel5_Style_Border::lookup((0x00000F00 & self::getInt4d($recordData, 10)) >> 8)) {
+                    $objStyle->getBorders()->getTop()->setBorderStyle($bordersTopStyle);
+                }
+                // bit: 15-12; mask: 0x0000F000; bottom style
+                if ($bordersBottomStyle = PHPExcel_Reader_Excel5_Style_Border::lookup((0x0000F000 & self::getInt4d($recordData, 10)) >> 12)) {
+                    $objStyle->getBorders()->getBottom()->setBorderStyle($bordersBottomStyle);
+                }
+                // bit: 22-16; mask: 0x007F0000; left color
+                $objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & self::getInt4d($recordData, 10)) >> 16;
+
+                // bit: 29-23; mask: 0x3F800000; right color
+                $objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & self::getInt4d($recordData, 10)) >> 23;
+
+                // bit: 30; mask: 0x40000000; 1 = diagonal line from top left to right bottom
+                $diagonalDown = (0x40000000 & self::getInt4d($recordData, 10)) >> 30 ? true : false;
+
+                // bit: 31; mask: 0x80000000; 1 = diagonal line from bottom left to top right
+                $diagonalUp = (0x80000000 & self::getInt4d($recordData, 10)) >> 31 ? true : false;
+
+                if ($diagonalUp == false && $diagonalDown == false) {
+                    $objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
+                } elseif ($diagonalUp == true && $diagonalDown == false) {
+                    $objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
+                } elseif ($diagonalUp == false && $diagonalDown == true) {
+                    $objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
+                } elseif ($diagonalUp == true && $diagonalDown == true) {
+                    $objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
+                }
+
+                // offset: 14; size: 4;
+                // bit: 6-0; mask: 0x0000007F; top color
+                $objStyle->getBorders()->getTop()->colorIndex = (0x0000007F & self::getInt4d($recordData, 14)) >> 0;
+
+                // bit: 13-7; mask: 0x00003F80; bottom color
+                $objStyle->getBorders()->getBottom()->colorIndex = (0x00003F80 & self::getInt4d($recordData, 14)) >> 7;
+
+                // bit: 20-14; mask: 0x001FC000; diagonal color
+                $objStyle->getBorders()->getDiagonal()->colorIndex = (0x001FC000 & self::getInt4d($recordData, 14)) >> 14;
+
+                // bit: 24-21; mask: 0x01E00000; diagonal style
+                if ($bordersDiagonalStyle = PHPExcel_Reader_Excel5_Style_Border::lookup((0x01E00000 & self::getInt4d($recordData, 14)) >> 21)) {
+                    $objStyle->getBorders()->getDiagonal()->setBorderStyle($bordersDiagonalStyle);
+                }
+
+                // bit: 31-26; mask: 0xFC000000 fill pattern
+                if ($fillType = PHPExcel_Reader_Excel5_Style_FillPattern::lookup((0xFC000000 & self::getInt4d($recordData, 14)) >> 26)) {
+                    $objStyle->getFill()->setFillType($fillType);
+                }
+                // offset: 18; size: 2; pattern and background colour
+                // bit: 6-0; mask: 0x007F; color index for pattern color
+                $objStyle->getFill()->startcolorIndex = (0x007F & self::getInt2d($recordData, 18)) >> 0;
+
+                // bit: 13-7; mask: 0x3F80; color index for pattern background
+                $objStyle->getFill()->endcolorIndex = (0x3F80 & self::getInt2d($recordData, 18)) >> 7;
+            } else {
+                // BIFF5
+
+                // offset: 7; size: 1; Text orientation and flags
+                $orientationAndFlags = ord($recordData[7]);
+
+                // bit: 1-0; mask: 0x03; XF_ORIENTATION: Text orientation
+                $xfOrientation = (0x03 & $orientationAndFlags) >> 0;
+                switch ($xfOrientation) {
+                    case 0:
+                        $objStyle->getAlignment()->setTextRotation(0);
+                        break;
+                    case 1:
+                        $objStyle->getAlignment()->setTextRotation(-165);
+                        break;
+                    case 2:
+                        $objStyle->getAlignment()->setTextRotation(90);
+                        break;
+                    case 3:
+                        $objStyle->getAlignment()->setTextRotation(-90);
+                        break;
+                }
+
+                // offset: 8; size: 4; cell border lines and background area
+                $borderAndBackground = self::getInt4d($recordData, 8);
+
+                // bit: 6-0; mask: 0x0000007F; color index for pattern color
+                $objStyle->getFill()->startcolorIndex = (0x0000007F & $borderAndBackground) >> 0;
+
+                // bit: 13-7; mask: 0x00003F80; color index for pattern background
+                $objStyle->getFill()->endcolorIndex = (0x00003F80 & $borderAndBackground) >> 7;
+
+                // bit: 21-16; mask: 0x003F0000; fill pattern
+                $objStyle->getFill()->setFillType(PHPExcel_Reader_Excel5_Style_FillPattern::lookup((0x003F0000 & $borderAndBackground) >> 16));
+
+                // bit: 24-22; mask: 0x01C00000; bottom line style
+                $objStyle->getBorders()->getBottom()->setBorderStyle(PHPExcel_Reader_Excel5_Style_Border::lookup((0x01C00000 & $borderAndBackground) >> 22));
+
+                // bit: 31-25; mask: 0xFE000000; bottom line color
+                $objStyle->getBorders()->getBottom()->colorIndex = (0xFE000000 & $borderAndBackground) >> 25;
+
+                // offset: 12; size: 4; cell border lines
+                $borderLines = self::getInt4d($recordData, 12);
+
+                // bit: 2-0; mask: 0x00000007; top line style
+                $objStyle->getBorders()->getTop()->setBorderStyle(PHPExcel_Reader_Excel5_Style_Border::lookup((0x00000007 & $borderLines) >> 0));
+
+                // bit: 5-3; mask: 0x00000038; left line style
+                $objStyle->getBorders()->getLeft()->setBorderStyle(PHPExcel_Reader_Excel5_Style_Border::lookup((0x00000038 & $borderLines) >> 3));
+
+                // bit: 8-6; mask: 0x000001C0; right line style
+                $objStyle->getBorders()->getRight()->setBorderStyle(PHPExcel_Reader_Excel5_Style_Border::lookup((0x000001C0 & $borderLines) >> 6));
+
+                // bit: 15-9; mask: 0x0000FE00; top line color index
+                $objStyle->getBorders()->getTop()->colorIndex = (0x0000FE00 & $borderLines) >> 9;
+
+                // bit: 22-16; mask: 0x007F0000; left line color index
+                $objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & $borderLines) >> 16;
+
+                // bit: 29-23; mask: 0x3F800000; right line color index
+                $objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & $borderLines) >> 23;
+            }
+
+            // add cellStyleXf or cellXf and update mapping
+            if ($isCellStyleXf) {
+                // we only read one style XF record which is always the first
+                if ($this->xfIndex == 0) {
+                    $this->phpExcel->addCellStyleXf($objStyle);
+                    $this->mapCellStyleXfIndex[$this->xfIndex] = 0;
+                }
+            } else {
+                // we read all cell XF records
+                $this->phpExcel->addCellXf($objStyle);
+                $this->mapCellXfIndex[$this->xfIndex] = count($this->phpExcel->getCellXfCollection()) - 1;
+            }
+
+            // update XF index for when we read next record
+            ++$this->xfIndex;
+        }
+    }
+
+
+    /**
+     *
+     */
+    private function readXfExt()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 0x087D = repeated header
+
+            // offset: 2; size: 2
+
+            // offset: 4; size: 8; not used
+
+            // offset: 12; size: 2; record version
+
+            // offset: 14; size: 2; index to XF record which this record modifies
+            $ixfe = self::getInt2d($recordData, 14);
+
+            // offset: 16; size: 2; not used
+
+            // offset: 18; size: 2; number of extension properties that follow
+            $cexts = self::getInt2d($recordData, 18);
+
+            // start reading the actual extension data
+            $offset = 20;
+            while ($offset < $length) {
+                // extension type
+                $extType = self::getInt2d($recordData, $offset);
+
+                // extension length
+                $cb = self::getInt2d($recordData, $offset + 2);
+
+                // extension data
+                $extData = substr($recordData, $offset + 4, $cb);
+
+                switch ($extType) {
+                    case 4:        // fill start color
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $fill = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFill();
+                                $fill->getStartColor()->setRGB($rgb);
+                                unset($fill->startcolorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 5:        // fill end color
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $fill = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFill();
+                                $fill->getEndColor()->setRGB($rgb);
+                                unset($fill->endcolorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 7:        // border color top
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $top = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getTop();
+                                $top->getColor()->setRGB($rgb);
+                                unset($top->colorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 8:        // border color bottom
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $bottom = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getBottom();
+                                $bottom->getColor()->setRGB($rgb);
+                                unset($bottom->colorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 9:        // border color left
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $left = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getLeft();
+                                $left->getColor()->setRGB($rgb);
+                                unset($left->colorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 10:        // border color right
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $right = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getRight();
+                                $right->getColor()->setRGB($rgb);
+                                unset($right->colorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 11:        // border color diagonal
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $diagonal = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getDiagonal();
+                                $diagonal->getColor()->setRGB($rgb);
+                                unset($diagonal->colorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                    case 13:    // font color
+                        $xclfType  = self::getInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $font = $this->phpExcel->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFont();
+                                $font->getColor()->setRGB($rgb);
+                                unset($font->colorIndex); // normal color index does not apply, discard
+                            }
+                        }
+                        break;
+                }
+
+                $offset += $cb;
+            }
+        }
+
+    }
+
+
+    /**
+     * Read STYLE record
+     */
+    private function readStyle()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; index to XF record and flag for built-in style
+            $ixfe = self::getInt2d($recordData, 0);
+
+            // bit: 11-0; mask 0x0FFF; index to XF record
+            $xfIndex = (0x0FFF & $ixfe) >> 0;
+
+            // bit: 15; mask 0x8000; 0 = user-defined style, 1 = built-in style
+            $isBuiltIn = (bool) ((0x8000 & $ixfe) >> 15);
+
+            if ($isBuiltIn) {
+                // offset: 2; size: 1; identifier for built-in style
+                $builtInId = ord($recordData[2]);
+
+                switch ($builtInId) {
+                    case 0x00:
+                        // currently, we are not using this for anything
+                        break;
+                    default:
+                        break;
+                }
+            } else {
+                // user-defined; not supported by PHPExcel
+            }
+        }
+    }
+
+
+    /**
+     * Read PALETTE record
+     */
+    private function readPalette()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; number of following colors
+            $nm = self::getInt2d($recordData, 0);
+
+            // list of RGB colors
+            for ($i = 0; $i < $nm; ++$i) {
+                $rgb = substr($recordData, 2 + 4 * $i, 4);
+                $this->palette[] = self::readRGB($rgb);
+            }
+        }
+    }
+
+
+    /**
+     * SHEET
+     *
+     * This record is  located in the  Workbook Globals
+     * Substream  and represents a sheet inside the workbook.
+     * One SHEET record is written for each sheet. It stores the
+     * sheet name and a stream offset to the BOF record of the
+     * respective Sheet Substream within the Workbook Stream.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readSheet()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // offset: 0; size: 4; absolute stream position of the BOF record of the sheet
+        // NOTE: not encrypted
+        $rec_offset = self::getInt4d($this->data, $this->pos + 4);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 4; size: 1; sheet state
+        switch (ord($recordData[4])) {
+            case 0x00:
+                $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;
+                break;
+            case 0x01:
+                $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN;
+                break;
+            case 0x02:
+                $sheetState = PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN;
+                break;
+            default:
+                $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;
+                break;
+        }
+
+        // offset: 5; size: 1; sheet type
+        $sheetType = ord($recordData[5]);
+
+        // offset: 6; size: var; sheet name
+        if ($this->version == self::XLS_BIFF8) {
+            $string = self::readUnicodeStringShort(substr($recordData, 6));
+            $rec_name = $string['value'];
+        } elseif ($this->version == self::XLS_BIFF7) {
+            $string = $this->readByteStringShort(substr($recordData, 6));
+            $rec_name = $string['value'];
+        }
+
+        $this->sheets[] = array(
+            'name' => $rec_name,
+            'offset' => $rec_offset,
+            'sheetState' => $sheetState,
+            'sheetType' => $sheetType,
+        );
+    }
+
+
+    /**
+     * Read EXTERNALBOOK record
+     */
+    private function readExternalBook()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset within record data
+        $offset = 0;
+
+        // there are 4 types of records
+        if (strlen($recordData) > 4) {
+            // external reference
+            // offset: 0; size: 2; number of sheet names ($nm)
+            $nm = self::getInt2d($recordData, 0);
+            $offset += 2;
+
+            // offset: 2; size: var; encoded URL without sheet name (Unicode string, 16-bit length)
+            $encodedUrlString = self::readUnicodeStringLong(substr($recordData, 2));
+            $offset += $encodedUrlString['size'];
+
+            // offset: var; size: var; list of $nm sheet names (Unicode strings, 16-bit length)
+            $externalSheetNames = array();
+            for ($i = 0; $i < $nm; ++$i) {
+                $externalSheetNameString = self::readUnicodeStringLong(substr($recordData, $offset));
+                $externalSheetNames[] = $externalSheetNameString['value'];
+                $offset += $externalSheetNameString['size'];
+            }
+
+            // store the record data
+            $this->externalBooks[] = array(
+                'type' => 'external',
+                'encodedUrl' => $encodedUrlString['value'],
+                'externalSheetNames' => $externalSheetNames,
+            );
+        } elseif (substr($recordData, 2, 2) == pack('CC', 0x01, 0x04)) {
+            // internal reference
+            // offset: 0; size: 2; number of sheet in this document
+            // offset: 2; size: 2; 0x01 0x04
+            $this->externalBooks[] = array(
+                'type' => 'internal',
+            );
+        } elseif (substr($recordData, 0, 4) == pack('vCC', 0x0001, 0x01, 0x3A)) {
+            // add-in function
+            // offset: 0; size: 2; 0x0001
+            $this->externalBooks[] = array(
+                'type' => 'addInFunction',
+            );
+        } elseif (substr($recordData, 0, 2) == pack('v', 0x0000)) {
+            // DDE links, OLE links
+            // offset: 0; size: 2; 0x0000
+            // offset: 2; size: var; encoded source document name
+            $this->externalBooks[] = array(
+                'type' => 'DDEorOLE',
+            );
+        }
+    }
+
+
+    /**
+     * Read EXTERNNAME record.
+     */
+    private function readExternName()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // external sheet references provided for named cells
+        if ($this->version == self::XLS_BIFF8) {
+            // offset: 0; size: 2; options
+            $options = self::getInt2d($recordData, 0);
+
+            // offset: 2; size: 2;
+
+            // offset: 4; size: 2; not used
+
+            // offset: 6; size: var
+            $nameString = self::readUnicodeStringShort(substr($recordData, 6));
+
+            // offset: var; size: var; formula data
+            $offset = 6 + $nameString['size'];
+            $formula = $this->getFormulaFromStructure(substr($recordData, $offset));
+
+            $this->externalNames[] = array(
+                'name' => $nameString['value'],
+                'formula' => $formula,
+            );
+        }
+    }
+
+
+    /**
+     * Read EXTERNSHEET record
+     */
+    private function readExternSheet()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // external sheet references provided for named cells
+        if ($this->version == self::XLS_BIFF8) {
+            // offset: 0; size: 2; number of following ref structures
+            $nm = self::getInt2d($recordData, 0);
+            for ($i = 0; $i < $nm; ++$i) {
+                $this->ref[] = array(
+                    // offset: 2 + 6 * $i; index to EXTERNALBOOK record
+                    'externalBookIndex' => self::getInt2d($recordData, 2 + 6 * $i),
+                    // offset: 4 + 6 * $i; index to first sheet in EXTERNALBOOK record
+                    'firstSheetIndex' => self::getInt2d($recordData, 4 + 6 * $i),
+                    // offset: 6 + 6 * $i; index to last sheet in EXTERNALBOOK record
+                    'lastSheetIndex' => self::getInt2d($recordData, 6 + 6 * $i),
+                );
+            }
+        }
+    }
+
+
+    /**
+     * DEFINEDNAME
+     *
+     * This record is part of a Link Table. It contains the name
+     * and the token array of an internal defined name. Token
+     * arrays of defined names contain tokens with aberrant
+     * token classes.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readDefinedName()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8) {
+            // retrieves named cells
+
+            // offset: 0; size: 2; option flags
+            $opts = self::getInt2d($recordData, 0);
+
+            // bit: 5; mask: 0x0020; 0 = user-defined name, 1 = built-in-name
+            $isBuiltInName = (0x0020 & $opts) >> 5;
+
+            // offset: 2; size: 1; keyboard shortcut
+
+            // offset: 3; size: 1; length of the name (character count)
+            $nlen = ord($recordData[3]);
+
+            // offset: 4; size: 2; size of the formula data (it can happen that this is zero)
+            // note: there can also be additional data, this is not included in $flen
+            $flen = self::getInt2d($recordData, 4);
+
+            // offset: 8; size: 2; 0=Global name, otherwise index to sheet (1-based)
+            $scope = self::getInt2d($recordData, 8);
+
+            // offset: 14; size: var; Name (Unicode string without length field)
+            $string = self::readUnicodeString(substr($recordData, 14), $nlen);
+
+            // offset: var; size: $flen; formula data
+            $offset = 14 + $string['size'];
+            $formulaStructure = pack('v', $flen) . substr($recordData, $offset);
+
+            try {
+                $formula = $this->getFormulaFromStructure($formulaStructure);
+            } catch (PHPExcel_Exception $e) {
+                $formula = '';
+            }
+
+            $this->definedname[] = array(
+                'isBuiltInName' => $isBuiltInName,
+                'name' => $string['value'],
+                'formula' => $formula,
+                'scope' => $scope,
+            );
+        }
+    }
+
+
+    /**
+     * Read MSODRAWINGGROUP record
+     */
+    private function readMsoDrawingGroup()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+        $recordData = $splicedRecordData['recordData'];
+
+        $this->drawingGroupData .= $recordData;
+    }
+
+
+    /**
+     * SST - Shared String Table
+     *
+     * This record contains a list of all strings used anywhere
+     * in the workbook. Each string occurs only once. The
+     * workbook uses indexes into the list to reference the
+     * strings.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     **/
+    private function readSst()
+    {
+        // offset within (spliced) record data
+        $pos = 0;
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+
+        $recordData = $splicedRecordData['recordData'];
+        $spliceOffsets = $splicedRecordData['spliceOffsets'];
+
+        // offset: 0; size: 4; total number of strings in the workbook
+        $pos += 4;
+
+        // offset: 4; size: 4; number of following strings ($nm)
+        $nm = self::getInt4d($recordData, 4);
+        $pos += 4;
+
+        // loop through the Unicode strings (16-bit length)
+        for ($i = 0; $i < $nm; ++$i) {
+            // number of characters in the Unicode string
+            $numChars = self::getInt2d($recordData, $pos);
+            $pos += 2;
+
+            // option flags
+            $optionFlags = ord($recordData[$pos]);
+            ++$pos;
+
+            // bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
+            $isCompressed = (($optionFlags & 0x01) == 0) ;
+
+            // bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
+            $hasAsian = (($optionFlags & 0x04) != 0);
+
+            // bit: 3; mask: 0x03; 0 = ordinary; 1 = Rich-Text
+            $hasRichText = (($optionFlags & 0x08) != 0);
+
+            if ($hasRichText) {
+                // number of Rich-Text formatting runs
+                $formattingRuns = self::getInt2d($recordData, $pos);
+                $pos += 2;
+            }
+
+            if ($hasAsian) {
+                // size of Asian phonetic setting
+                $extendedRunLength = self::getInt4d($recordData, $pos);
+                $pos += 4;
+            }
+
+            // expected byte length of character array if not split
+            $len = ($isCompressed) ? $numChars : $numChars * 2;
+
+            // look up limit position
+            foreach ($spliceOffsets as $spliceOffset) {
+                // it can happen that the string is empty, therefore we need
+                // <= and not just <
+                if ($pos <= $spliceOffset) {
+                    $limitpos = $spliceOffset;
+                    break;
+                }
+            }
+
+            if ($pos + $len <= $limitpos) {
+                // character array is not split between records
+
+                $retstr = substr($recordData, $pos, $len);
+                $pos += $len;
+            } else {
+                // character array is split between records
+
+                // first part of character array
+                $retstr = substr($recordData, $pos, $limitpos - $pos);
+
+                $bytesRead = $limitpos - $pos;
+
+                // remaining characters in Unicode string
+                $charsLeft = $numChars - (($isCompressed) ? $bytesRead : ($bytesRead / 2));
+
+                $pos = $limitpos;
+
+                // keep reading the characters
+                while ($charsLeft > 0) {
+                    // look up next limit position, in case the string span more than one continue record
+                    foreach ($spliceOffsets as $spliceOffset) {
+                        if ($pos < $spliceOffset) {
+                            $limitpos = $spliceOffset;
+                            break;
+                        }
+                    }
+
+                    // repeated option flags
+                    // OpenOffice.org documentation 5.21
+                    $option = ord($recordData[$pos]);
+                    ++$pos;
+
+                    if ($isCompressed && ($option == 0)) {
+                        // 1st fragment compressed
+                        // this fragment compressed
+                        $len = min($charsLeft, $limitpos - $pos);
+                        $retstr .= substr($recordData, $pos, $len);
+                        $charsLeft -= $len;
+                        $isCompressed = true;
+                    } elseif (!$isCompressed && ($option != 0)) {
+                        // 1st fragment uncompressed
+                        // this fragment uncompressed
+                        $len = min($charsLeft * 2, $limitpos - $pos);
+                        $retstr .= substr($recordData, $pos, $len);
+                        $charsLeft -= $len / 2;
+                        $isCompressed = false;
+                    } elseif (!$isCompressed && ($option == 0)) {
+                        // 1st fragment uncompressed
+                        // this fragment compressed
+                        $len = min($charsLeft, $limitpos - $pos);
+                        for ($j = 0; $j < $len; ++$j) {
+                            $retstr .= $recordData[$pos + $j] . chr(0);
+                        }
+                        $charsLeft -= $len;
+                        $isCompressed = false;
+                    } else {
+                        // 1st fragment compressed
+                        // this fragment uncompressed
+                        $newstr = '';
+                        for ($j = 0; $j < strlen($retstr); ++$j) {
+                            $newstr .= $retstr[$j] . chr(0);
+                        }
+                        $retstr = $newstr;
+                        $len = min($charsLeft * 2, $limitpos - $pos);
+                        $retstr .= substr($recordData, $pos, $len);
+                        $charsLeft -= $len / 2;
+                        $isCompressed = false;
+                    }
+
+                    $pos += $len;
+                }
+            }
+
+            // convert to UTF-8
+            $retstr = self::encodeUTF16($retstr, $isCompressed);
+
+            // read additional Rich-Text information, if any
+            $fmtRuns = array();
+            if ($hasRichText) {
+                // list of formatting runs
+                for ($j = 0; $j < $formattingRuns; ++$j) {
+                    // first formatted character; zero-based
+                    $charPos = self::getInt2d($recordData, $pos + $j * 4);
+
+                    // index to font record
+                    $fontIndex = self::getInt2d($recordData, $pos + 2 + $j * 4);
+
+                    $fmtRuns[] = array(
+                        'charPos' => $charPos,
+                        'fontIndex' => $fontIndex,
+                    );
+                }
+                $pos += 4 * $formattingRuns;
+            }
+
+            // read additional Asian phonetics information, if any
+            if ($hasAsian) {
+                // For Asian phonetic settings, we skip the extended string data
+                $pos += $extendedRunLength;
+            }
+
+            // store the shared sting
+            $this->sst[] = array(
+                'value' => $retstr,
+                'fmtRuns' => $fmtRuns,
+            );
+        }
+
+        // getSplicedRecordData() takes care of moving current position in data stream
+    }
+
+
+    /**
+     * Read PRINTGRIDLINES record
+     */
+    private function readPrintGridlines()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            // offset: 0; size: 2; 0 = do not print sheet grid lines; 1 = print sheet gridlines
+            $printGridlines = (bool) self::getInt2d($recordData, 0);
+            $this->phpSheet->setPrintGridlines($printGridlines);
+        }
+    }
+
+
+    /**
+     * Read DEFAULTROWHEIGHT record
+     */
+    private function readDefaultRowHeight()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; option flags
+        // offset: 2; size: 2; default height for unused rows, (twips 1/20 point)
+        $height = self::getInt2d($recordData, 2);
+        $this->phpSheet->getDefaultRowDimension()->setRowHeight($height / 20);
+    }
+
+
+    /**
+     * Read SHEETPR record
+     */
+    private function readSheetPr()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2
+
+        // bit: 6; mask: 0x0040; 0 = outline buttons above outline group
+        $isSummaryBelow = (0x0040 & self::getInt2d($recordData, 0)) >> 6;
+        $this->phpSheet->setShowSummaryBelow($isSummaryBelow);
+
+        // bit: 7; mask: 0x0080; 0 = outline buttons left of outline group
+        $isSummaryRight = (0x0080 & self::getInt2d($recordData, 0)) >> 7;
+        $this->phpSheet->setShowSummaryRight($isSummaryRight);
+
+        // bit: 8; mask: 0x100; 0 = scale printout in percent, 1 = fit printout to number of pages
+        // this corresponds to radio button setting in page setup dialog in Excel
+        $this->isFitToPages = (bool) ((0x0100 & self::getInt2d($recordData, 0)) >> 8);
+    }
+
+
+    /**
+     * Read HORIZONTALPAGEBREAKS record
+     */
+    private function readHorizontalPageBreaks()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            // offset: 0; size: 2; number of the following row index structures
+            $nm = self::getInt2d($recordData, 0);
+
+            // offset: 2; size: 6 * $nm; list of $nm row index structures
+            for ($i = 0; $i < $nm; ++$i) {
+                $r = self::getInt2d($recordData, 2 + 6 * $i);
+                $cf = self::getInt2d($recordData, 2 + 6 * $i + 2);
+                $cl = self::getInt2d($recordData, 2 + 6 * $i + 4);
+
+                // not sure why two column indexes are necessary?
+                $this->phpSheet->setBreakByColumnAndRow($cf, $r, PHPExcel_Worksheet::BREAK_ROW);
+            }
+        }
+    }
+
+
+    /**
+     * Read VERTICALPAGEBREAKS record
+     */
+    private function readVerticalPageBreaks()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            // offset: 0; size: 2; number of the following column index structures
+            $nm = self::getInt2d($recordData, 0);
+
+            // offset: 2; size: 6 * $nm; list of $nm row index structures
+            for ($i = 0; $i < $nm; ++$i) {
+                $c = self::getInt2d($recordData, 2 + 6 * $i);
+                $rf = self::getInt2d($recordData, 2 + 6 * $i + 2);
+                $rl = self::getInt2d($recordData, 2 + 6 * $i + 4);
+
+                // not sure why two row indexes are necessary?
+                $this->phpSheet->setBreakByColumnAndRow($c, $rf, PHPExcel_Worksheet::BREAK_COLUMN);
+            }
+        }
+    }
+
+
+    /**
+     * Read HEADER record
+     */
+    private function readHeader()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: var
+            // realized that $recordData can be empty even when record exists
+            if ($recordData) {
+                if ($this->version == self::XLS_BIFF8) {
+                    $string = self::readUnicodeStringLong($recordData);
+                } else {
+                    $string = $this->readByteStringShort($recordData);
+                }
+
+                $this->phpSheet->getHeaderFooter()->setOddHeader($string['value']);
+                $this->phpSheet->getHeaderFooter()->setEvenHeader($string['value']);
+            }
+        }
+    }
+
+
+    /**
+     * Read FOOTER record
+     */
+    private function readFooter()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: var
+            // realized that $recordData can be empty even when record exists
+            if ($recordData) {
+                if ($this->version == self::XLS_BIFF8) {
+                    $string = self::readUnicodeStringLong($recordData);
+                } else {
+                    $string = $this->readByteStringShort($recordData);
+                }
+                $this->phpSheet->getHeaderFooter()->setOddFooter($string['value']);
+                $this->phpSheet->getHeaderFooter()->setEvenFooter($string['value']);
+            }
+        }
+    }
+
+
+    /**
+     * Read HCENTER record
+     */
+    private function readHcenter()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 0 = print sheet left aligned, 1 = print sheet centered horizontally
+            $isHorizontalCentered = (bool) self::getInt2d($recordData, 0);
+
+            $this->phpSheet->getPageSetup()->setHorizontalCentered($isHorizontalCentered);
+        }
+    }
+
+
+    /**
+     * Read VCENTER record
+     */
+    private function readVcenter()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 0 = print sheet aligned at top page border, 1 = print sheet vertically centered
+            $isVerticalCentered = (bool) self::getInt2d($recordData, 0);
+
+            $this->phpSheet->getPageSetup()->setVerticalCentered($isVerticalCentered);
+        }
+    }
+
+
+    /**
+     * Read LEFTMARGIN record
+     */
+    private function readLeftMargin()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setLeft(self::extractNumber($recordData));
+        }
+    }
+
+
+    /**
+     * Read RIGHTMARGIN record
+     */
+    private function readRightMargin()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setRight(self::extractNumber($recordData));
+        }
+    }
+
+
+    /**
+     * Read TOPMARGIN record
+     */
+    private function readTopMargin()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setTop(self::extractNumber($recordData));
+        }
+    }
+
+
+    /**
+     * Read BOTTOMMARGIN record
+     */
+    private function readBottomMargin()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setBottom(self::extractNumber($recordData));
+        }
+    }
+
+
+    /**
+     * Read PAGESETUP record
+     */
+    private function readPageSetup()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; paper size
+            $paperSize = self::getInt2d($recordData, 0);
+
+            // offset: 2; size: 2; scaling factor
+            $scale = self::getInt2d($recordData, 2);
+
+            // offset: 6; size: 2; fit worksheet width to this number of pages, 0 = use as many as needed
+            $fitToWidth = self::getInt2d($recordData, 6);
+
+            // offset: 8; size: 2; fit worksheet height to this number of pages, 0 = use as many as needed
+            $fitToHeight = self::getInt2d($recordData, 8);
+
+            // offset: 10; size: 2; option flags
+
+            // bit: 1; mask: 0x0002; 0=landscape, 1=portrait
+            $isPortrait = (0x0002 & self::getInt2d($recordData, 10)) >> 1;
+
+            // bit: 2; mask: 0x0004; 1= paper size, scaling factor, paper orient. not init
+            // when this bit is set, do not use flags for those properties
+            $isNotInit = (0x0004 & self::getInt2d($recordData, 10)) >> 2;
+
+            if (!$isNotInit) {
+                $this->phpSheet->getPageSetup()->setPaperSize($paperSize);
+                switch ($isPortrait) {
+                    case 0:
+                        $this->phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE);
+                        break;
+                    case 1:
+                        $this->phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT);
+                        break;
+                }
+
+                $this->phpSheet->getPageSetup()->setScale($scale, false);
+                $this->phpSheet->getPageSetup()->setFitToPage((bool) $this->isFitToPages);
+                $this->phpSheet->getPageSetup()->setFitToWidth($fitToWidth, false);
+                $this->phpSheet->getPageSetup()->setFitToHeight($fitToHeight, false);
+            }
+
+            // offset: 16; size: 8; header margin (IEEE 754 floating-point value)
+            $marginHeader = self::extractNumber(substr($recordData, 16, 8));
+            $this->phpSheet->getPageMargins()->setHeader($marginHeader);
+
+            // offset: 24; size: 8; footer margin (IEEE 754 floating-point value)
+            $marginFooter = self::extractNumber(substr($recordData, 24, 8));
+            $this->phpSheet->getPageMargins()->setFooter($marginFooter);
+        }
+    }
+
+
+    /**
+     * PROTECT - Sheet protection (BIFF2 through BIFF8)
+     *   if this record is omitted, then it also means no sheet protection
+     */
+    private function readProtect()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2;
+
+        // bit 0, mask 0x01; 1 = sheet is protected
+        $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
+        $this->phpSheet->getProtection()->setSheet((bool)$bool);
+    }
+
+
+    /**
+     * SCENPROTECT
+     */
+    private function readScenProtect()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2;
+
+        // bit: 0, mask 0x01; 1 = scenarios are protected
+        $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
+
+        $this->phpSheet->getProtection()->setScenarios((bool)$bool);
+    }
+
+
+    /**
+     * OBJECTPROTECT
+     */
+    private function readObjectProtect()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2;
+
+        // bit: 0, mask 0x01; 1 = objects are protected
+        $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
+
+        $this->phpSheet->getProtection()->setObjects((bool)$bool);
+    }
+
+
+    /**
+     * PASSWORD - Sheet protection (hashed) password (BIFF2 through BIFF8)
+     */
+    private function readPassword()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 16-bit hash value of password
+            $password = strtoupper(dechex(self::getInt2d($recordData, 0))); // the hashed password
+            $this->phpSheet->getProtection()->setPassword($password, true);
+        }
+    }
+
+
+    /**
+     * Read DEFCOLWIDTH record
+     */
+    private function readDefColWidth()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; default column width
+        $width = self::getInt2d($recordData, 0);
+        if ($width != 8) {
+            $this->phpSheet->getDefaultColumnDimension()->setWidth($width);
+        }
+    }
+
+
+    /**
+     * Read COLINFO record
+     */
+    private function readColInfo()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; index to first column in range
+            $fc = self::getInt2d($recordData, 0); // first column index
+
+            // offset: 2; size: 2; index to last column in range
+            $lc = self::getInt2d($recordData, 2); // first column index
+
+            // offset: 4; size: 2; width of the column in 1/256 of the width of the zero character
+            $width = self::getInt2d($recordData, 4);
+
+            // offset: 6; size: 2; index to XF record for default column formatting
+            $xfIndex = self::getInt2d($recordData, 6);
+
+            // offset: 8; size: 2; option flags
+            // bit: 0; mask: 0x0001; 1= columns are hidden
+            $isHidden = (0x0001 & self::getInt2d($recordData, 8)) >> 0;
+
+            // bit: 10-8; mask: 0x0700; outline level of the columns (0 = no outline)
+            $level = (0x0700 & self::getInt2d($recordData, 8)) >> 8;
+
+            // bit: 12; mask: 0x1000; 1 = collapsed
+            $isCollapsed = (0x1000 & self::getInt2d($recordData, 8)) >> 12;
+
+            // offset: 10; size: 2; not used
+
+            for ($i = $fc; $i <= $lc; ++$i) {
+                if ($lc == 255 || $lc == 256) {
+                    $this->phpSheet->getDefaultColumnDimension()->setWidth($width / 256);
+                    break;
+                }
+                $this->phpSheet->getColumnDimensionByColumn($i)->setWidth($width / 256);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+
+    /**
+     * ROW
+     *
+     * This record contains the properties of a single row in a
+     * sheet. Rows and cells in a sheet are divided into blocks
+     * of 32 rows.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readRow()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; index of this row
+            $r = self::getInt2d($recordData, 0);
+
+            // offset: 2; size: 2; index to column of the first cell which is described by a cell record
+
+            // offset: 4; size: 2; index to column of the last cell which is described by a cell record, increased by 1
+
+            // offset: 6; size: 2;
+
+            // bit: 14-0; mask: 0x7FFF; height of the row, in twips = 1/20 of a point
+            $height = (0x7FFF & self::getInt2d($recordData, 6)) >> 0;
+
+            // bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
+            $useDefaultHeight = (0x8000 & self::getInt2d($recordData, 6)) >> 15;
+
+            if (!$useDefaultHeight) {
+                $this->phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
+            }
+
+            // offset: 8; size: 2; not used
+
+            // offset: 10; size: 2; not used in BIFF5-BIFF8
+
+            // offset: 12; size: 4; option flags and default row formatting
+
+            // bit: 2-0: mask: 0x00000007; outline level of the row
+            $level = (0x00000007 & self::getInt4d($recordData, 12)) >> 0;
+            $this->phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
+
+            // bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
+            $isCollapsed = (0x00000010 & self::getInt4d($recordData, 12)) >> 4;
+            $this->phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
+
+            // bit: 5; mask: 0x00000020; 1 = row is hidden
+            $isHidden = (0x00000020 & self::getInt4d($recordData, 12)) >> 5;
+            $this->phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
+
+            // bit: 7; mask: 0x00000080; 1 = row has explicit format
+            $hasExplicitFormat = (0x00000080 & self::getInt4d($recordData, 12)) >> 7;
+
+            // bit: 27-16; mask: 0x0FFF0000; only applies when hasExplicitFormat = 1; index to XF record
+            $xfIndex = (0x0FFF0000 & self::getInt4d($recordData, 12)) >> 16;
+
+            if ($hasExplicitFormat) {
+                $this->phpSheet->getRowDimension($r + 1)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+
+    /**
+     * Read RK record
+     * This record represents a cell that contains an RK value
+     * (encoded integer or floating-point value). If a
+     * floating-point value cannot be encoded to an RK value,
+     * a NUMBER record will be written. This record replaces the
+     * record INTEGER written in BIFF2.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readRk()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to column
+        $column = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($column);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; index to XF record
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            // offset: 6; size: 4; RK value
+            $rknum = self::getInt4d($recordData, 6);
+            $numValue = self::getIEEE754($rknum);
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            if (!$this->readDataOnly) {
+                // add style information
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+
+            // add cell
+            $cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+        }
+    }
+
+
+    /**
+     * Read LABELSST record
+     * This record represents a cell that contains a string. It
+     * replaces the LABEL record and RSTRING record used in
+     * BIFF2-BIFF5.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readLabelSst()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to column
+        $column = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($column);
+
+        $emptyCell = true;
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; index to XF record
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            // offset: 6; size: 4; index to SST record
+            $index = self::getInt4d($recordData, 6);
+
+            // add cell
+            if (($fmtRuns = $this->sst[$index]['fmtRuns']) && !$this->readDataOnly) {
+                // then we should treat as rich text
+                $richText = new PHPExcel_RichText();
+                $charPos = 0;
+                $sstCount = count($this->sst[$index]['fmtRuns']);
+                for ($i = 0; $i <= $sstCount; ++$i) {
+                    if (isset($fmtRuns[$i])) {
+                        $text = PHPExcel_Shared_String::Substring($this->sst[$index]['value'], $charPos, $fmtRuns[$i]['charPos'] - $charPos);
+                        $charPos = $fmtRuns[$i]['charPos'];
+                    } else {
+                        $text = PHPExcel_Shared_String::Substring($this->sst[$index]['value'], $charPos, PHPExcel_Shared_String::CountCharacters($this->sst[$index]['value']));
+                    }
+
+                    if (PHPExcel_Shared_String::CountCharacters($text) > 0) {
+                        if ($i == 0) { // first text run, no style
+                            $richText->createText($text);
+                        } else {
+                            $textRun = $richText->createTextRun($text);
+                            if (isset($fmtRuns[$i - 1])) {
+                                if ($fmtRuns[$i - 1]['fontIndex'] < 4) {
+                                    $fontIndex = $fmtRuns[$i - 1]['fontIndex'];
+                                } else {
+                                    // this has to do with that index 4 is omitted in all BIFF versions for some strange reason
+                                    // check the OpenOffice documentation of the FONT record
+                                    $fontIndex = $fmtRuns[$i - 1]['fontIndex'] - 1;
+                                }
+                                $textRun->setFont(clone $this->objFonts[$fontIndex]);
+                            }
+                        }
+                    }
+                }
+                if ($this->readEmptyCells || trim($richText->getPlainText()) !== '') {
+                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                    $cell->setValueExplicit($richText, PHPExcel_Cell_DataType::TYPE_STRING);
+                    $emptyCell = false;
+                }
+            } else {
+                if ($this->readEmptyCells || trim($this->sst[$index]['value']) !== '') {
+                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                    $cell->setValueExplicit($this->sst[$index]['value'], PHPExcel_Cell_DataType::TYPE_STRING);
+                    $emptyCell = false;
+                }
+            }
+
+            if (!$this->readDataOnly && !$emptyCell) {
+                // add style information
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+
+    /**
+     * Read MULRK record
+     * This record represents a cell range containing RK value
+     * cells. All cells are located in the same row.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readMulRk()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to first column
+        $colFirst = self::getInt2d($recordData, 2);
+
+        // offset: var; size: 2; index to last column
+        $colLast = self::getInt2d($recordData, $length - 2);
+        $columns = $colLast - $colFirst + 1;
+
+        // offset within record data
+        $offset = 4;
+
+        for ($i = 0; $i < $columns; ++$i) {
+            $columnString = PHPExcel_Cell::stringFromColumnIndex($colFirst + $i);
+
+            // Read cell?
+            if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+                // offset: var; size: 2; index to XF record
+                $xfIndex = self::getInt2d($recordData, $offset);
+
+                // offset: var; size: 4; RK value
+                $numValue = self::getIEEE754(self::getInt4d($recordData, $offset + 2));
+                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                if (!$this->readDataOnly) {
+                    // add style
+                    $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
+
+                // add cell value
+                $cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+            }
+
+            $offset += 6;
+        }
+    }
+
+
+    /**
+     * Read NUMBER record
+     * This record represents a cell that contains a
+     * floating-point value.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readNumber()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size 2; index to column
+        $column = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($column);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset 4; size: 2; index to XF record
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            $numValue = self::extractNumber(substr($recordData, 6, 8));
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            if (!$this->readDataOnly) {
+                // add cell style
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+
+            // add cell value
+            $cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+        }
+    }
+
+
+    /**
+     * Read FORMULA record + perhaps a following STRING record if formula result is a string
+     * This record contains the token array and the result of a
+     * formula cell.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readFormula()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; row index
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; col index
+        $column = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($column);
+
+        // offset: 20: size: variable; formula structure
+        $formulaStructure = substr($recordData, 20);
+
+        // offset: 14: size: 2; option flags, recalculate always, recalculate on open etc.
+        $options = self::getInt2d($recordData, 14);
+
+        // bit: 0; mask: 0x0001; 1 = recalculate always
+        // bit: 1; mask: 0x0002; 1 = calculate on open
+        // bit: 2; mask: 0x0008; 1 = part of a shared formula
+        $isPartOfSharedFormula = (bool) (0x0008 & $options);
+
+        // WARNING:
+        // We can apparently not rely on $isPartOfSharedFormula. Even when $isPartOfSharedFormula = true
+        // the formula data may be ordinary formula data, therefore we need to check
+        // explicitly for the tExp token (0x01)
+        $isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure[2]) == 0x01;
+
+        if ($isPartOfSharedFormula) {
+            // part of shared formula which means there will be a formula with a tExp token and nothing else
+            // get the base cell, grab tExp token
+            $baseRow = self::getInt2d($formulaStructure, 3);
+            $baseCol = self::getInt2d($formulaStructure, 5);
+            $this->_baseCell = PHPExcel_Cell::stringFromColumnIndex($baseCol). ($baseRow + 1);
+        }
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            if ($isPartOfSharedFormula) {
+                // formula is added to this cell after the sheet has been read
+                $this->sharedFormulaParts[$columnString . ($row + 1)] = $this->_baseCell;
+            }
+
+            // offset: 16: size: 4; not used
+
+            // offset: 4; size: 2; XF index
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            // offset: 6; size: 8; result of the formula
+            if ((ord($recordData[6]) == 0) && (ord($recordData[12]) == 255) && (ord($recordData[13]) == 255)) {
+                // String formula. Result follows in appended STRING record
+                $dataType = PHPExcel_Cell_DataType::TYPE_STRING;
+
+                // read possible SHAREDFMLA record
+                $code = self::getInt2d($this->data, $this->pos);
+                if ($code == self::XLS_TYPE_SHAREDFMLA) {
+                    $this->readSharedFmla();
+                }
+
+                // read STRING record
+                $value = $this->readString();
+            } elseif ((ord($recordData[6]) == 1)
+                && (ord($recordData[12]) == 255)
+                && (ord($recordData[13]) == 255)) {
+                // Boolean formula. Result is in +2; 0=false, 1=true
+                $dataType = PHPExcel_Cell_DataType::TYPE_BOOL;
+                $value = (bool) ord($recordData[8]);
+            } elseif ((ord($recordData[6]) == 2)
+                && (ord($recordData[12]) == 255)
+                && (ord($recordData[13]) == 255)) {
+                // Error formula. Error code is in +2
+                $dataType = PHPExcel_Cell_DataType::TYPE_ERROR;
+                $value = PHPExcel_Reader_Excel5_ErrorCode::lookup(ord($recordData[8]));
+            } elseif ((ord($recordData[6]) == 3)
+                && (ord($recordData[12]) == 255)
+                && (ord($recordData[13]) == 255)) {
+                // Formula result is a null string
+                $dataType = PHPExcel_Cell_DataType::TYPE_NULL;
+                $value = '';
+            } else {
+                // forumla result is a number, first 14 bytes like _NUMBER record
+                $dataType = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                $value = self::extractNumber(substr($recordData, 6, 8));
+            }
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            if (!$this->readDataOnly) {
+                // add cell style
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+
+            // store the formula
+            if (!$isPartOfSharedFormula) {
+                // not part of shared formula
+                // add cell value. If we can read formula, populate with formula, otherwise just used cached value
+                try {
+                    if ($this->version != self::XLS_BIFF8) {
+                        throw new PHPExcel_Reader_Exception('Not BIFF8. Can only read BIFF8 formulas');
+                    }
+                    $formula = $this->getFormulaFromStructure($formulaStructure); // get formula in human language
+                    $cell->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
+
+                } catch (PHPExcel_Exception $e) {
+                    $cell->setValueExplicit($value, $dataType);
+                }
+            } else {
+                if ($this->version == self::XLS_BIFF8) {
+                    // do nothing at this point, formula id added later in the code
+                } else {
+                    $cell->setValueExplicit($value, $dataType);
+                }
+            }
+
+            // store the cached calculated value
+            $cell->setCalculatedValue($value);
+        }
+    }
+
+
+    /**
+     * Read a SHAREDFMLA record. This function just stores the binary shared formula in the reader,
+     * which usually contains relative references.
+     * These will be used to construct the formula in each shared formula part after the sheet is read.
+     */
+    private function readSharedFmla()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0, size: 6; cell range address of the area used by the shared formula, not used for anything
+        $cellRange = substr($recordData, 0, 6);
+        $cellRange = $this->readBIFF5CellRangeAddressFixed($cellRange); // note: even BIFF8 uses BIFF5 syntax
+
+        // offset: 6, size: 1; not used
+
+        // offset: 7, size: 1; number of existing FORMULA records for this shared formula
+        $no = ord($recordData[7]);
+
+        // offset: 8, size: var; Binary token array of the shared formula
+        $formula = substr($recordData, 8);
+
+        // at this point we only store the shared formula for later use
+        $this->sharedFormulas[$this->_baseCell] = $formula;
+    }
+
+
+    /**
+     * Read a STRING record from current stream position and advance the stream pointer to next record
+     * This record is used for storing result from FORMULA record when it is a string, and
+     * it occurs directly after the FORMULA record
+     *
+     * @return string The string contents as UTF-8
+     */
+    private function readString()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8) {
+            $string = self::readUnicodeStringLong($recordData);
+            $value = $string['value'];
+        } else {
+            $string = $this->readByteStringLong($recordData);
+            $value = $string['value'];
+        }
+
+        return $value;
+    }
+
+
+    /**
+     * Read BOOLERR record
+     * This record represents a Boolean value or error value
+     * cell.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readBoolErr()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; row index
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; column index
+        $column = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($column);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; index to XF record
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            // offset: 6; size: 1; the boolean value or error value
+            $boolErr = ord($recordData[6]);
+
+            // offset: 7; size: 1; 0=boolean; 1=error
+            $isError = ord($recordData[7]);
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            switch ($isError) {
+                case 0: // boolean
+                    $value = (bool) $boolErr;
+
+                    // add cell value
+                    $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_BOOL);
+                    break;
+                case 1: // error type
+                    $value = PHPExcel_Reader_Excel5_ErrorCode::lookup($boolErr);
+
+                    // add cell value
+                    $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_ERROR);
+                    break;
+            }
+
+            if (!$this->readDataOnly) {
+                // add cell style
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+
+    /**
+     * Read MULBLANK record
+     * This record represents a cell range of empty cells. All
+     * cells are located in the same row
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readMulBlank()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to first column
+        $fc = self::getInt2d($recordData, 2);
+
+        // offset: 4; size: 2 x nc; list of indexes to XF records
+        // add style information
+        if (!$this->readDataOnly && $this->readEmptyCells) {
+            for ($i = 0; $i < $length / 2 - 3; ++$i) {
+                $columnString = PHPExcel_Cell::stringFromColumnIndex($fc + $i);
+
+                // Read cell?
+                if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+                    $xfIndex = self::getInt2d($recordData, 4 + 2 * $i);
+                    $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
+            }
+        }
+
+        // offset: 6; size 2; index to last column (not needed)
+    }
+
+
+    /**
+     * Read LABEL record
+     * This record represents a cell that contains a string. In
+     * BIFF8 it is usually replaced by the LABELSST record.
+     * Excel still uses this record, if it copies unformatted
+     * text cells to the clipboard.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readLabel()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to column
+        $column = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($column);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; XF index
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            // add cell value
+            // todo: what if string is very long? continue record
+            if ($this->version == self::XLS_BIFF8) {
+                $string = self::readUnicodeStringLong(substr($recordData, 6));
+                $value = $string['value'];
+            } else {
+                $string = $this->readByteStringLong(substr($recordData, 6));
+                $value = $string['value'];
+            }
+            if ($this->readEmptyCells || trim($value) !== '') {
+                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
+
+                if (!$this->readDataOnly) {
+                    // add cell style
+                    $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Read BLANK record
+     */
+    private function readBlank()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; row index
+        $row = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; col index
+        $col = self::getInt2d($recordData, 2);
+        $columnString = PHPExcel_Cell::stringFromColumnIndex($col);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; XF index
+            $xfIndex = self::getInt2d($recordData, 4);
+
+            // add style information
+            if (!$this->readDataOnly && $this->readEmptyCells) {
+                $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+
+    /**
+     * Read MSODRAWING record
+     */
+    private function readMsoDrawing()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+        $recordData = $splicedRecordData['recordData'];
+
+        $this->drawingData .= $recordData;
+    }
+
+
+    /**
+     * Read OBJ record
+     */
+    private function readObj()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly || $this->version != self::XLS_BIFF8) {
+            return;
+        }
+
+        // recordData consists of an array of subrecords looking like this:
+        //    ft: 2 bytes; ftCmo type (0x15)
+        //    cb: 2 bytes; size in bytes of ftCmo data
+        //    ot: 2 bytes; Object Type
+        //    id: 2 bytes; Object id number
+        //    grbit: 2 bytes; Option Flags
+        //    data: var; subrecord data
+
+        // for now, we are just interested in the second subrecord containing the object type
+        $ftCmoType  = self::getInt2d($recordData, 0);
+        $cbCmoSize  = self::getInt2d($recordData, 2);
+        $otObjType  = self::getInt2d($recordData, 4);
+        $idObjID    = self::getInt2d($recordData, 6);
+        $grbitOpts  = self::getInt2d($recordData, 6);
+
+        $this->objs[] = array(
+            'ftCmoType' => $ftCmoType,
+            'cbCmoSize' => $cbCmoSize,
+            'otObjType' => $otObjType,
+            'idObjID'   => $idObjID,
+            'grbitOpts' => $grbitOpts
+        );
+        $this->textObjRef = $idObjID;
+
+//        echo '<b>_readObj()</b><br />';
+//        var_dump(end($this->objs));
+//        echo '<br />';
+    }
+
+
+    /**
+     * Read WINDOW2 record
+     */
+    private function readWindow2()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; option flags
+        $options = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to first visible row
+        $firstVisibleRow = self::getInt2d($recordData, 2);
+
+        // offset: 4; size: 2; index to first visible colum
+        $firstVisibleColumn = self::getInt2d($recordData, 4);
+        if ($this->version === self::XLS_BIFF8) {
+            // offset:  8; size: 2; not used
+            // offset: 10; size: 2; cached magnification factor in page break preview (in percent); 0 = Default (60%)
+            // offset: 12; size: 2; cached magnification factor in normal view (in percent); 0 = Default (100%)
+            // offset: 14; size: 4; not used
+            $zoomscaleInPageBreakPreview = self::getInt2d($recordData, 10);
+            if ($zoomscaleInPageBreakPreview === 0) {
+                $zoomscaleInPageBreakPreview = 60;
+            }
+            $zoomscaleInNormalView = self::getInt2d($recordData, 12);
+            if ($zoomscaleInNormalView === 0) {
+                $zoomscaleInNormalView = 100;
+            }
+        }
+
+        // bit: 1; mask: 0x0002; 0 = do not show gridlines, 1 = show gridlines
+        $showGridlines = (bool) ((0x0002 & $options) >> 1);
+        $this->phpSheet->setShowGridlines($showGridlines);
+
+        // bit: 2; mask: 0x0004; 0 = do not show headers, 1 = show headers
+        $showRowColHeaders = (bool) ((0x0004 & $options) >> 2);
+        $this->phpSheet->setShowRowColHeaders($showRowColHeaders);
+
+        // bit: 3; mask: 0x0008; 0 = panes are not frozen, 1 = panes are frozen
+        $this->frozen = (bool) ((0x0008 & $options) >> 3);
+
+        // bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
+        $this->phpSheet->setRightToLeft((bool)((0x0040 & $options) >> 6));
+
+        // bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
+        $isActive = (bool) ((0x0400 & $options) >> 10);
+        if ($isActive) {
+            $this->phpExcel->setActiveSheetIndex($this->phpExcel->getIndex($this->phpSheet));
+        }
+
+        // bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view
+        $isPageBreakPreview = (bool) ((0x0800 & $options) >> 11);
+
+        //FIXME: set $firstVisibleRow and $firstVisibleColumn
+
+        if ($this->phpSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT) {
+            //NOTE: this setting is inferior to page layout view(Excel2007-)
+            $view = $isPageBreakPreview ? PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW : PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL;
+            $this->phpSheet->getSheetView()->setView($view);
+            if ($this->version === self::XLS_BIFF8) {
+                $zoomScale = $isPageBreakPreview ? $zoomscaleInPageBreakPreview : $zoomscaleInNormalView;
+                $this->phpSheet->getSheetView()->setZoomScale($zoomScale);
+                $this->phpSheet->getSheetView()->setZoomScaleNormal($zoomscaleInNormalView);
+            }
+        }
+    }
+
+    /**
+     * Read PLV Record(Created by Excel2007 or upper)
+     */
+    private function readPageLayoutView()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        //var_dump(unpack("vrt/vgrbitFrt/V2reserved/vwScalePLV/vgrbit", $recordData));
+
+        // offset: 0; size: 2; rt
+        //->ignore
+        $rt = self::getInt2d($recordData, 0);
+        // offset: 2; size: 2; grbitfr
+        //->ignore
+        $grbitFrt = self::getInt2d($recordData, 2);
+        // offset: 4; size: 8; reserved
+        //->ignore
+
+        // offset: 12; size 2; zoom scale
+        $wScalePLV = self::getInt2d($recordData, 12);
+        // offset: 14; size 2; grbit
+        $grbit = self::getInt2d($recordData, 14);
+
+        // decomprise grbit
+        $fPageLayoutView   = $grbit & 0x01;
+        $fRulerVisible     = ($grbit >> 1) & 0x01; //no support
+        $fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support
+
+        if ($fPageLayoutView === 1) {
+            $this->phpSheet->getSheetView()->setView(PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT);
+            $this->phpSheet->getSheetView()->setZoomScale($wScalePLV); //set by Excel2007 only if SHEETVIEW_PAGE_LAYOUT
+        }
+        //otherwise, we cannot know whether SHEETVIEW_PAGE_LAYOUT or SHEETVIEW_PAGE_BREAK_PREVIEW.
+    }
+
+    /**
+     * Read SCL record
+     */
+    private function readScl()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; numerator of the view magnification
+        $numerator = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; numerator of the view magnification
+        $denumerator = self::getInt2d($recordData, 2);
+
+        // set the zoom scale (in percent)
+        $this->phpSheet->getSheetView()->setZoomScale($numerator * 100 / $denumerator);
+    }
+
+
+    /**
+     * Read PANE record
+     */
+    private function readPane()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; position of vertical split
+            $px = self::getInt2d($recordData, 0);
+
+            // offset: 2; size: 2; position of horizontal split
+            $py = self::getInt2d($recordData, 2);
+
+            if ($this->frozen) {
+                // frozen panes
+                $this->phpSheet->freezePane(PHPExcel_Cell::stringFromColumnIndex($px) . ($py + 1));
+            } else {
+                // unfrozen panes; split windows; not supported by PHPExcel core
+            }
+        }
+    }
+
+
+    /**
+     * Read SELECTION record. There is one such record for each pane in the sheet.
+     */
+    private function readSelection()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 1; pane identifier
+            $paneId = ord($recordData[0]);
+
+            // offset: 1; size: 2; index to row of the active cell
+            $r = self::getInt2d($recordData, 1);
+
+            // offset: 3; size: 2; index to column of the active cell
+            $c = self::getInt2d($recordData, 3);
+
+            // offset: 5; size: 2; index into the following cell range list to the
+            //  entry that contains the active cell
+            $index = self::getInt2d($recordData, 5);
+
+            // offset: 7; size: var; cell range address list containing all selected cell ranges
+            $data = substr($recordData, 7);
+            $cellRangeAddressList = $this->readBIFF5CellRangeAddressList($data); // note: also BIFF8 uses BIFF5 syntax
+
+            $selectedCells = $cellRangeAddressList['cellRangeAddresses'][0];
+
+            // first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!)
+            if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) {
+                $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells);
+            }
+
+            // first row '1' + last row '65536' indicates that full column is selected
+            if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) {
+                $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells);
+            }
+
+            // first column 'A' + last column 'IV' indicates that full row is selected
+            if (preg_match('/^(A[0-9]+\:)IV([0-9]+)$/', $selectedCells)) {
+                $selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '${1}XFD${2}', $selectedCells);
+            }
+
+            $this->phpSheet->setSelectedCells($selectedCells);
+        }
+    }
+
+
+    private function includeCellRangeFiltered($cellRangeAddress)
+    {
+        $includeCellRange = true;
+        if ($this->getReadFilter() !== null) {
+            $includeCellRange = false;
+            $rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress);
+            $rangeBoundaries[1][0]++;
+            for ($row = $rangeBoundaries[0][1]; $row <= $rangeBoundaries[1][1]; $row++) {
+                for ($column = $rangeBoundaries[0][0]; $column != $rangeBoundaries[1][0]; $column++) {
+                    if ($this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
+                        $includeCellRange = true;
+                        break 2;
+                    }
+                }
+            }
+        }
+        return $includeCellRange;
+    }
+
+
+    /**
+     * MERGEDCELLS
+     *
+     * This record contains the addresses of merged cell ranges
+     * in the current sheet.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readMergedCells()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($recordData);
+            foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
+                if ((strpos($cellRangeAddress, ':') !== false) &&
+                    ($this->includeCellRangeFiltered($cellRangeAddress))) {
+                    $this->phpSheet->mergeCells($cellRangeAddress);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Read HYPERLINK record
+     */
+    private function readHyperLink()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8; cell range address of all cells containing this hyperlink
+            try {
+                $cellRange = $this->readBIFF8CellRangeAddressFixed($recordData, 0, 8);
+            } catch (PHPExcel_Exception $e) {
+                return;
+            }
+
+            // offset: 8, size: 16; GUID of StdLink
+
+            // offset: 24, size: 4; unknown value
+
+            // offset: 28, size: 4; option flags
+            // bit: 0; mask: 0x00000001; 0 = no link or extant, 1 = file link or URL
+            $isFileLinkOrUrl = (0x00000001 & self::getInt2d($recordData, 28)) >> 0;
+
+            // bit: 1; mask: 0x00000002; 0 = relative path, 1 = absolute path or URL
+            $isAbsPathOrUrl = (0x00000001 & self::getInt2d($recordData, 28)) >> 1;
+
+            // bit: 2 (and 4); mask: 0x00000014; 0 = no description
+            $hasDesc = (0x00000014 & self::getInt2d($recordData, 28)) >> 2;
+
+            // bit: 3; mask: 0x00000008; 0 = no text, 1 = has text
+            $hasText = (0x00000008 & self::getInt2d($recordData, 28)) >> 3;
+
+            // bit: 7; mask: 0x00000080; 0 = no target frame, 1 = has target frame
+            $hasFrame = (0x00000080 & self::getInt2d($recordData, 28)) >> 7;
+
+            // bit: 8; mask: 0x00000100; 0 = file link or URL, 1 = UNC path (inc. server name)
+            $isUNC = (0x00000100 & self::getInt2d($recordData, 28)) >> 8;
+
+            // offset within record data
+            $offset = 32;
+
+            if ($hasDesc) {
+                // offset: 32; size: var; character count of description text
+                $dl = self::getInt4d($recordData, 32);
+                // offset: 36; size: var; character array of description text, no Unicode string header, always 16-bit characters, zero terminated
+                $desc = self::encodeUTF16(substr($recordData, 36, 2 * ($dl - 1)), false);
+                $offset += 4 + 2 * $dl;
+            }
+            if ($hasFrame) {
+                $fl = self::getInt4d($recordData, $offset);
+                $offset += 4 + 2 * $fl;
+            }
+
+            // detect type of hyperlink (there are 4 types)
+            $hyperlinkType = null;
+
+            if ($isUNC) {
+                $hyperlinkType = 'UNC';
+            } elseif (!$isFileLinkOrUrl) {
+                $hyperlinkType = 'workbook';
+            } elseif (ord($recordData[$offset]) == 0x03) {
+                $hyperlinkType = 'local';
+            } elseif (ord($recordData[$offset]) == 0xE0) {
+                $hyperlinkType = 'URL';
+            }
+
+            switch ($hyperlinkType) {
+                case 'URL':
+                    // section 5.58.2: Hyperlink containing a URL
+                    // e.g. http://example.org/index.php
+
+                    // offset: var; size: 16; GUID of URL Moniker
+                    $offset += 16;
+                    // offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
+                    $us = self::getInt4d($recordData, $offset);
+                    $offset += 4;
+                    // offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
+                    $url = self::encodeUTF16(substr($recordData, $offset, $us - 2), false);
+                    $nullOffset = strpos($url, 0x00);
+                    if ($nullOffset) {
+                        $url = substr($url, 0, $nullOffset);
+                    }
+                    $url .= $hasText ? '#' : '';
+                    $offset += $us;
+                    break;
+                case 'local':
+                    // section 5.58.3: Hyperlink to local file
+                    // examples:
+                    //   mydoc.txt
+                    //   ../../somedoc.xls#Sheet!A1
+
+                    // offset: var; size: 16; GUI of File Moniker
+                    $offset += 16;
+
+                    // offset: var; size: 2; directory up-level count.
+                    $upLevelCount = self::getInt2d($recordData, $offset);
+                    $offset += 2;
+
+                    // offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
+                    $sl = self::getInt4d($recordData, $offset);
+                    $offset += 4;
+
+                    // offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
+                    $shortenedFilePath = substr($recordData, $offset, $sl);
+                    $shortenedFilePath = self::encodeUTF16($shortenedFilePath, true);
+                    $shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
+
+                    $offset += $sl;
+
+                    // offset: var; size: 24; unknown sequence
+                    $offset += 24;
+
+                    // extended file path
+                    // offset: var; size: 4; size of the following file link field including string lenth mark
+                    $sz = self::getInt4d($recordData, $offset);
+                    $offset += 4;
+
+                    // only present if $sz > 0
+                    if ($sz > 0) {
+                        // offset: var; size: 4; size of the character array of the extended file path and name
+                        $xl = self::getInt4d($recordData, $offset);
+                        $offset += 4;
+
+                        // offset: var; size 2; unknown
+                        $offset += 2;
+
+                        // offset: var; size $xl; character array of the extended file path and name.
+                        $extendedFilePath = substr($recordData, $offset, $xl);
+                        $extendedFilePath = self::encodeUTF16($extendedFilePath, false);
+                        $offset += $xl;
+                    }
+
+                    // construct the path
+                    $url = str_repeat('..\\', $upLevelCount);
+                    $url .= ($sz > 0) ? $extendedFilePath : $shortenedFilePath; // use extended path if available
+                    $url .= $hasText ? '#' : '';
+
+                    break;
+                case 'UNC':
+                    // section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
+                    // todo: implement
+                    return;
+                case 'workbook':
+                    // section 5.58.5: Hyperlink to the Current Workbook
+                    // e.g. Sheet2!B1:C2, stored in text mark field
+                    $url = 'sheet://';
+                    break;
+                default:
+                    return;
+            }
+
+            if ($hasText) {
+                // offset: var; size: 4; character count of text mark including trailing zero word
+                $tl = self::getInt4d($recordData, $offset);
+                $offset += 4;
+                // offset: var; size: var; character array of the text mark without the # sign, no Unicode header, always 16-bit characters, zero-terminated
+                $text = self::encodeUTF16(substr($recordData, $offset, 2 * ($tl - 1)), false);
+                $url .= $text;
+            }
+
+            // apply the hyperlink to all the relevant cells
+            foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cellRange) as $coordinate) {
+                $this->phpSheet->getCell($coordinate)->getHyperLink()->setUrl($url);
+            }
+        }
+    }
+
+
+    /**
+     * Read DATAVALIDATIONS record
+     */
+    private function readDataValidations()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+    }
+
+
+    /**
+     * Read DATAVALIDATION record
+     */
+    private function readDataValidation()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 4; Options
+        $options = self::getInt4d($recordData, 0);
+
+        // bit: 0-3; mask: 0x0000000F; type
+        $type = (0x0000000F & $options) >> 0;
+        switch ($type) {
+            case 0x00:
+                $type = PHPExcel_Cell_DataValidation::TYPE_NONE;
+                break;
+            case 0x01:
+                $type = PHPExcel_Cell_DataValidation::TYPE_WHOLE;
+                break;
+            case 0x02:
+                $type = PHPExcel_Cell_DataValidation::TYPE_DECIMAL;
+                break;
+            case 0x03:
+                $type = PHPExcel_Cell_DataValidation::TYPE_LIST;
+                break;
+            case 0x04:
+                $type = PHPExcel_Cell_DataValidation::TYPE_DATE;
+                break;
+            case 0x05:
+                $type = PHPExcel_Cell_DataValidation::TYPE_TIME;
+                break;
+            case 0x06:
+                $type = PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH;
+                break;
+            case 0x07:
+                $type = PHPExcel_Cell_DataValidation::TYPE_CUSTOM;
+                break;
+        }
+
+        // bit: 4-6; mask: 0x00000070; error type
+        $errorStyle = (0x00000070 & $options) >> 4;
+        switch ($errorStyle) {
+            case 0x00:
+                $errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
+                break;
+            case 0x01:
+                $errorStyle = PHPExcel_Cell_DataValidation::STYLE_WARNING;
+                break;
+            case 0x02:
+                $errorStyle = PHPExcel_Cell_DataValidation::STYLE_INFORMATION;
+                break;
+        }
+
+        // bit: 7; mask: 0x00000080; 1= formula is explicit (only applies to list)
+        // I have only seen cases where this is 1
+        $explicitFormula = (0x00000080 & $options) >> 7;
+
+        // bit: 8; mask: 0x00000100; 1= empty cells allowed
+        $allowBlank = (0x00000100 & $options) >> 8;
+
+        // bit: 9; mask: 0x00000200; 1= suppress drop down arrow in list type validity
+        $suppressDropDown = (0x00000200 & $options) >> 9;
+
+        // bit: 18; mask: 0x00040000; 1= show prompt box if cell selected
+        $showInputMessage = (0x00040000 & $options) >> 18;
+
+        // bit: 19; mask: 0x00080000; 1= show error box if invalid values entered
+        $showErrorMessage = (0x00080000 & $options) >> 19;
+
+        // bit: 20-23; mask: 0x00F00000; condition operator
+        $operator = (0x00F00000 & $options) >> 20;
+        switch ($operator) {
+            case 0x00:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN;
+                break;
+            case 0x01:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN;
+                break;
+            case 0x02:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_EQUAL;
+                break;
+            case 0x03:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL;
+                break;
+            case 0x04:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN;
+                break;
+            case 0x05:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN;
+                break;
+            case 0x06:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL;
+                break;
+            case 0x07:
+                $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL;
+                break;
+        }
+
+        // offset: 4; size: var; title of the prompt box
+        $offset = 4;
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $promptTitle = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: var; title of the error box
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $errorTitle = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: var; text of the prompt box
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $prompt = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: var; text of the error box
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $error = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: 2; size of the formula data for the first condition
+        $sz1 = self::getInt2d($recordData, $offset);
+        $offset += 2;
+
+        // offset: var; size: 2; not used
+        $offset += 2;
+
+        // offset: var; size: $sz1; formula data for first condition (without size field)
+        $formula1 = substr($recordData, $offset, $sz1);
+        $formula1 = pack('v', $sz1) . $formula1; // prepend the length
+        try {
+            $formula1 = $this->getFormulaFromStructure($formula1);
+
+            // in list type validity, null characters are used as item separators
+            if ($type == PHPExcel_Cell_DataValidation::TYPE_LIST) {
+                $formula1 = str_replace(chr(0), ',', $formula1);
+            }
+        } catch (PHPExcel_Exception $e) {
+            return;
+        }
+        $offset += $sz1;
+
+        // offset: var; size: 2; size of the formula data for the first condition
+        $sz2 = self::getInt2d($recordData, $offset);
+        $offset += 2;
+
+        // offset: var; size: 2; not used
+        $offset += 2;
+
+        // offset: var; size: $sz2; formula data for second condition (without size field)
+        $formula2 = substr($recordData, $offset, $sz2);
+        $formula2 = pack('v', $sz2) . $formula2; // prepend the length
+        try {
+            $formula2 = $this->getFormulaFromStructure($formula2);
+        } catch (PHPExcel_Exception $e) {
+            return;
+        }
+        $offset += $sz2;
+
+        // offset: var; size: var; cell range address list with
+        $cellRangeAddressList = $this->readBIFF8CellRangeAddressList(substr($recordData, $offset));
+        $cellRangeAddresses = $cellRangeAddressList['cellRangeAddresses'];
+
+        foreach ($cellRangeAddresses as $cellRange) {
+            $stRange = $this->phpSheet->shrinkRangeToFit($cellRange);
+            foreach (PHPExcel_Cell::extractAllCellReferencesInRange($stRange) as $coordinate) {
+                $objValidation = $this->phpSheet->getCell($coordinate)->getDataValidation();
+                $objValidation->setType($type);
+                $objValidation->setErrorStyle($errorStyle);
+                $objValidation->setAllowBlank((bool)$allowBlank);
+                $objValidation->setShowInputMessage((bool)$showInputMessage);
+                $objValidation->setShowErrorMessage((bool)$showErrorMessage);
+                $objValidation->setShowDropDown(!$suppressDropDown);
+                $objValidation->setOperator($operator);
+                $objValidation->setErrorTitle($errorTitle);
+                $objValidation->setError($error);
+                $objValidation->setPromptTitle($promptTitle);
+                $objValidation->setPrompt($prompt);
+                $objValidation->setFormula1($formula1);
+                $objValidation->setFormula2($formula2);
+            }
+        }
+    }
+
+    /**
+     * Read SHEETLAYOUT record. Stores sheet tab color information.
+     */
+    private function readSheetLayout()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // local pointer in record data
+        $offset = 0;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; repeated record identifier 0x0862
+
+            // offset: 2; size: 10; not used
+
+            // offset: 12; size: 4; size of record data
+            // Excel 2003 uses size of 0x14 (documented), Excel 2007 uses size of 0x28 (not documented?)
+            $sz = self::getInt4d($recordData, 12);
+
+            switch ($sz) {
+                case 0x14:
+                    // offset: 16; size: 2; color index for sheet tab
+                    $colorIndex = self::getInt2d($recordData, 16);
+                    $color = PHPExcel_Reader_Excel5_Color::map($colorIndex, $this->palette, $this->version);
+                    $this->phpSheet->getTabColor()->setRGB($color['rgb']);
+                    break;
+                case 0x28:
+                    // TODO: Investigate structure for .xls SHEETLAYOUT record as saved by MS Office Excel 2007
+                    return;
+                    break;
+            }
+        }
+    }
+
+
+    /**
+     * Read SHEETPROTECTION record (FEATHEADR)
+     */
+    private function readSheetProtection()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2; repeated record header
+
+        // offset: 2; size: 2; FRT cell reference flag (=0 currently)
+
+        // offset: 4; size: 8; Currently not used and set to 0
+
+        // offset: 12; size: 2; Shared feature type index (2=Enhanced Protetion, 4=SmartTag)
+        $isf = self::getInt2d($recordData, 12);
+        if ($isf != 2) {
+            return;
+        }
+
+        // offset: 14; size: 1; =1 since this is a feat header
+
+        // offset: 15; size: 4; size of rgbHdrSData
+
+        // rgbHdrSData, assume "Enhanced Protection"
+        // offset: 19; size: 2; option flags
+        $options = self::getInt2d($recordData, 19);
+
+        // bit: 0; mask 0x0001; 1 = user may edit objects, 0 = users must not edit objects
+        $bool = (0x0001 & $options) >> 0;
+        $this->phpSheet->getProtection()->setObjects(!$bool);
+
+        // bit: 1; mask 0x0002; edit scenarios
+        $bool = (0x0002 & $options) >> 1;
+        $this->phpSheet->getProtection()->setScenarios(!$bool);
+
+        // bit: 2; mask 0x0004; format cells
+        $bool = (0x0004 & $options) >> 2;
+        $this->phpSheet->getProtection()->setFormatCells(!$bool);
+
+        // bit: 3; mask 0x0008; format columns
+        $bool = (0x0008 & $options) >> 3;
+        $this->phpSheet->getProtection()->setFormatColumns(!$bool);
+
+        // bit: 4; mask 0x0010; format rows
+        $bool = (0x0010 & $options) >> 4;
+        $this->phpSheet->getProtection()->setFormatRows(!$bool);
+
+        // bit: 5; mask 0x0020; insert columns
+        $bool = (0x0020 & $options) >> 5;
+        $this->phpSheet->getProtection()->setInsertColumns(!$bool);
+
+        // bit: 6; mask 0x0040; insert rows
+        $bool = (0x0040 & $options) >> 6;
+        $this->phpSheet->getProtection()->setInsertRows(!$bool);
+
+        // bit: 7; mask 0x0080; insert hyperlinks
+        $bool = (0x0080 & $options) >> 7;
+        $this->phpSheet->getProtection()->setInsertHyperlinks(!$bool);
+
+        // bit: 8; mask 0x0100; delete columns
+        $bool = (0x0100 & $options) >> 8;
+        $this->phpSheet->getProtection()->setDeleteColumns(!$bool);
+
+        // bit: 9; mask 0x0200; delete rows
+        $bool = (0x0200 & $options) >> 9;
+        $this->phpSheet->getProtection()->setDeleteRows(!$bool);
+
+        // bit: 10; mask 0x0400; select locked cells
+        $bool = (0x0400 & $options) >> 10;
+        $this->phpSheet->getProtection()->setSelectLockedCells(!$bool);
+
+        // bit: 11; mask 0x0800; sort cell range
+        $bool = (0x0800 & $options) >> 11;
+        $this->phpSheet->getProtection()->setSort(!$bool);
+
+        // bit: 12; mask 0x1000; auto filter
+        $bool = (0x1000 & $options) >> 12;
+        $this->phpSheet->getProtection()->setAutoFilter(!$bool);
+
+        // bit: 13; mask 0x2000; pivot tables
+        $bool = (0x2000 & $options) >> 13;
+        $this->phpSheet->getProtection()->setPivotTables(!$bool);
+
+        // bit: 14; mask 0x4000; select unlocked cells
+        $bool = (0x4000 & $options) >> 14;
+        $this->phpSheet->getProtection()->setSelectUnlockedCells(!$bool);
+
+        // offset: 21; size: 2; not used
+    }
+
+
+    /**
+     * Read RANGEPROTECTION record
+     * Reading of this record is based on Microsoft Office Excel 97-2000 Binary File Format Specification,
+     * where it is referred to as FEAT record
+     */
+    private function readRangeProtection()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // local pointer in record data
+        $offset = 0;
+
+        if (!$this->readDataOnly) {
+            $offset += 12;
+
+            // offset: 12; size: 2; shared feature type, 2 = enhanced protection, 4 = smart tag
+            $isf = self::getInt2d($recordData, 12);
+            if ($isf != 2) {
+                // we only read FEAT records of type 2
+                return;
+            }
+            $offset += 2;
+
+            $offset += 5;
+
+            // offset: 19; size: 2; count of ref ranges this feature is on
+            $cref = self::getInt2d($recordData, 19);
+            $offset += 2;
+
+            $offset += 6;
+
+            // offset: 27; size: 8 * $cref; list of cell ranges (like in hyperlink record)
+            $cellRanges = array();
+            for ($i = 0; $i < $cref; ++$i) {
+                try {
+                    $cellRange = $this->readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8));
+                } catch (PHPExcel_Exception $e) {
+                    return;
+                }
+                $cellRanges[] = $cellRange;
+                $offset += 8;
+            }
+
+            // offset: var; size: var; variable length of feature specific data
+            $rgbFeat = substr($recordData, $offset);
+            $offset += 4;
+
+            // offset: var; size: 4; the encrypted password (only 16-bit although field is 32-bit)
+            $wPassword = self::getInt4d($recordData, $offset);
+            $offset += 4;
+
+            // Apply range protection to sheet
+            if ($cellRanges) {
+                $this->phpSheet->protectCells(implode(' ', $cellRanges), strtoupper(dechex($wPassword)), true);
+            }
+        }
+    }
+
+
+    /**
+     * Read IMDATA record
+     */
+    private function readImData()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+        $recordData = $splicedRecordData['recordData'];
+
+        // UNDER CONSTRUCTION
+
+        // offset: 0; size: 2; image format
+        $cf = self::getInt2d($recordData, 0);
+
+        // offset: 2; size: 2; environment from which the file was written
+        $env = self::getInt2d($recordData, 2);
+
+        // offset: 4; size: 4; length of the image data
+        $lcb = self::getInt4d($recordData, 4);
+
+        // offset: 8; size: var; image data
+        $iData = substr($recordData, 8);
+
+        switch ($cf) {
+            case 0x09: // Windows bitmap format
+                // BITMAPCOREINFO
+                // 1. BITMAPCOREHEADER
+                // offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
+                $bcSize = self::getInt4d($iData, 0);
+    //            var_dump($bcSize);
+
+                // offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
+                $bcWidth = self::getInt2d($iData, 4);
+    //            var_dump($bcWidth);
+
+                // offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
+                $bcHeight = self::getInt2d($iData, 6);
+    //            var_dump($bcHeight);
+                $ih = imagecreatetruecolor($bcWidth, $bcHeight);
+
+                // offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
+
+                // offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
+                $bcBitCount = self::getInt2d($iData, 10);
+    //            var_dump($bcBitCount);
+
+                $rgbString = substr($iData, 12);
+                $rgbTriples = array();
+                while (strlen($rgbString) > 0) {
+                    $rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
+                    $rgbString = substr($rgbString, 3);
+                }
+                $x = 0;
+                $y = 0;
+                foreach ($rgbTriples as $i => $rgbTriple) {
+                    $color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
+                    imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
+                    $x = ($x + 1) % $bcWidth;
+                    $y = $y + floor(($x + 1) / $bcWidth);
+                }
+                //imagepng($ih, 'image.png');
+
+                $drawing = new PHPExcel_Worksheet_Drawing();
+                $drawing->setPath($filename);
+                $drawing->setWorksheet($this->phpSheet);
+                break;
+            case 0x02: // Windows metafile or Macintosh PICT format
+            case 0x0e: // native format
+            default:
+                break;
+        }
+
+        // getSplicedRecordData() takes care of moving current position in data stream
+    }
+
+
+    /**
+     * Read a free CONTINUE record. Free CONTINUE record may be a camouflaged MSODRAWING record
+     * When MSODRAWING data on a sheet exceeds 8224 bytes, CONTINUE records are used instead. Undocumented.
+     * In this case, we must treat the CONTINUE record as a MSODRAWING record
+     */
+    private function readContinue()
+    {
+        $length = self::getInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // check if we are reading drawing data
+        // this is in case a free CONTINUE record occurs in other circumstances we are unaware of
+        if ($this->drawingData == '') {
+            // move stream pointer to next record
+            $this->pos += 4 + $length;
+
+            return;
+        }
+
+        // check if record data is at least 4 bytes long, otherwise there is no chance this is MSODRAWING data
+        if ($length < 4) {
+            // move stream pointer to next record
+            $this->pos += 4 + $length;
+
+            return;
+        }
+
+        // dirty check to see if CONTINUE record could be a camouflaged MSODRAWING record
+        // look inside CONTINUE record to see if it looks like a part of an Escher stream
+        // we know that Escher stream may be split at least at
+        //        0xF003 MsofbtSpgrContainer
+        //        0xF004 MsofbtSpContainer
+        //        0xF00D MsofbtClientTextbox
+        $validSplitPoints = array(0xF003, 0xF004, 0xF00D); // add identifiers if we find more
+
+        $splitPoint = self::getInt2d($recordData, 2);
+        if (in_array($splitPoint, $validSplitPoints)) {
+            // get spliced record data (and move pointer to next record)
+            $splicedRecordData = $this->getSplicedRecordData();
+            $this->drawingData .= $splicedRecordData['recordData'];
+
+            return;
+        }
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+    }
+
+
+    /**
+     * Reads a record from current position in data stream and continues reading data as long as CONTINUE
+     * records are found. Splices the record data pieces and returns the combined string as if record data
+     * is in one piece.
+     * Moves to next current position in data stream to start of next record different from a CONtINUE record
+     *
+     * @return array
+     */
+    private function getSplicedRecordData()
+    {
+        $data = '';
+        $spliceOffsets = array();
+
+        $i = 0;
+        $spliceOffsets[0] = 0;
+
+        do {
+            ++$i;
+
+            // offset: 0; size: 2; identifier
+            $identifier = self::getInt2d($this->data, $this->pos);
+            // offset: 2; size: 2; length
+            $length = self::getInt2d($this->data, $this->pos + 2);
+            $data .= $this->readRecordData($this->data, $this->pos + 4, $length);
+
+            $spliceOffsets[$i] = $spliceOffsets[$i - 1] + $length;
+
+            $this->pos += 4 + $length;
+            $nextIdentifier = self::getInt2d($this->data, $this->pos);
+        } while ($nextIdentifier == self::XLS_TYPE_CONTINUE);
+
+        $splicedData = array(
+            'recordData' => $data,
+            'spliceOffsets' => $spliceOffsets,
+        );
+
+        return $splicedData;
+
+    }
+
+
+    /**
+     * Convert formula structure into human readable Excel formula like 'A3+A5*5'
+     *
+     * @param string $formulaStructure The complete binary data for the formula
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     * @return string Human readable formula
+     */
+    private function getFormulaFromStructure($formulaStructure, $baseCell = 'A1')
+    {
+        // offset: 0; size: 2; size of the following formula data
+        $sz = self::getInt2d($formulaStructure, 0);
+
+        // offset: 2; size: sz
+        $formulaData = substr($formulaStructure, 2, $sz);
+
+        // for debug: dump the formula data
+        //echo '<xmp>';
+        //echo 'size: ' . $sz . "\n";
+        //echo 'the entire formula data: ';
+        //Debug::dump($formulaData);
+        //echo "\n----\n";
+
+        // offset: 2 + sz; size: variable (optional)
+        if (strlen($formulaStructure) > 2 + $sz) {
+            $additionalData = substr($formulaStructure, 2 + $sz);
+
+            // for debug: dump the additional data
+            //echo 'the entire additional data: ';
+            //Debug::dump($additionalData);
+            //echo "\n----\n";
+        } else {
+            $additionalData = '';
+        }
+
+        return $this->getFormulaFromData($formulaData, $additionalData, $baseCell);
+    }
+
+
+    /**
+     * Take formula data and additional data for formula and return human readable formula
+     *
+     * @param string $formulaData The binary data for the formula itself
+     * @param string $additionalData Additional binary data going with the formula
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     * @return string Human readable formula
+     */
+    private function getFormulaFromData($formulaData, $additionalData = '', $baseCell = 'A1')
+    {
+        // start parsing the formula data
+        $tokens = array();
+
+        while (strlen($formulaData) > 0 and $token = $this->getNextToken($formulaData, $baseCell)) {
+            $tokens[] = $token;
+            $formulaData = substr($formulaData, $token['size']);
+
+            // for debug: dump the token
+            //var_dump($token);
+        }
+
+        $formulaString = $this->createFormulaFromTokens($tokens, $additionalData);
+
+        return $formulaString;
+    }
+
+
+    /**
+     * Take array of tokens together with additional data for formula and return human readable formula
+     *
+     * @param array $tokens
+     * @param array $additionalData Additional binary data going with the formula
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     * @return string Human readable formula
+     */
+    private function createFormulaFromTokens($tokens, $additionalData)
+    {
+        // empty formula?
+        if (empty($tokens)) {
+            return '';
+        }
+
+        $formulaStrings = array();
+        foreach ($tokens as $token) {
+            // initialize spaces
+            $space0 = isset($space0) ? $space0 : ''; // spaces before next token, not tParen
+            $space1 = isset($space1) ? $space1 : ''; // carriage returns before next token, not tParen
+            $space2 = isset($space2) ? $space2 : ''; // spaces before opening parenthesis
+            $space3 = isset($space3) ? $space3 : ''; // carriage returns before opening parenthesis
+            $space4 = isset($space4) ? $space4 : ''; // spaces before closing parenthesis
+            $space5 = isset($space5) ? $space5 : ''; // carriage returns before closing parenthesis
+
+            switch ($token['name']) {
+                case 'tAdd': // addition
+                case 'tConcat': // addition
+                case 'tDiv': // division
+                case 'tEQ': // equality
+                case 'tGE': // greater than or equal
+                case 'tGT': // greater than
+                case 'tIsect': // intersection
+                case 'tLE': // less than or equal
+                case 'tList': // less than or equal
+                case 'tLT': // less than
+                case 'tMul': // multiplication
+                case 'tNE': // multiplication
+                case 'tPower': // power
+                case 'tRange': // range
+                case 'tSub': // subtraction
+                    $op2 = array_pop($formulaStrings);
+                    $op1 = array_pop($formulaStrings);
+                    $formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
+                    unset($space0, $space1);
+                    break;
+                case 'tUplus': // unary plus
+                case 'tUminus': // unary minus
+                    $op = array_pop($formulaStrings);
+                    $formulaStrings[] = "$space1$space0{$token['data']}$op";
+                    unset($space0, $space1);
+                    break;
+                case 'tPercent': // percent sign
+                    $op = array_pop($formulaStrings);
+                    $formulaStrings[] = "$op$space1$space0{$token['data']}";
+                    unset($space0, $space1);
+                    break;
+                case 'tAttrVolatile': // indicates volatile function
+                case 'tAttrIf':
+                case 'tAttrSkip':
+                case 'tAttrChoose':
+                    // token is only important for Excel formula evaluator
+                    // do nothing
+                    break;
+                case 'tAttrSpace': // space / carriage return
+                    // space will be used when next token arrives, do not alter formulaString stack
+                    switch ($token['data']['spacetype']) {
+                        case 'type0':
+                            $space0 = str_repeat(' ', $token['data']['spacecount']);
+                            break;
+                        case 'type1':
+                            $space1 = str_repeat("\n", $token['data']['spacecount']);
+                            break;
+                        case 'type2':
+                            $space2 = str_repeat(' ', $token['data']['spacecount']);
+                            break;
+                        case 'type3':
+                            $space3 = str_repeat("\n", $token['data']['spacecount']);
+                            break;
+                        case 'type4':
+                            $space4 = str_repeat(' ', $token['data']['spacecount']);
+                            break;
+                        case 'type5':
+                            $space5 = str_repeat("\n", $token['data']['spacecount']);
+                            break;
+                    }
+                    break;
+                case 'tAttrSum': // SUM function with one parameter
+                    $op = array_pop($formulaStrings);
+                    $formulaStrings[] = "{$space1}{$space0}SUM($op)";
+                    unset($space0, $space1);
+                    break;
+                case 'tFunc': // function with fixed number of arguments
+                case 'tFuncV': // function with variable number of arguments
+                    if ($token['data']['function'] != '') {
+                        // normal function
+                        $ops = array(); // array of operators
+                        for ($i = 0; $i < $token['data']['args']; ++$i) {
+                            $ops[] = array_pop($formulaStrings);
+                        }
+                        $ops = array_reverse($ops);
+                        $formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
+                        unset($space0, $space1);
+                    } else {
+                        // add-in function
+                        $ops = array(); // array of operators
+                        for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
+                            $ops[] = array_pop($formulaStrings);
+                        }
+                        $ops = array_reverse($ops);
+                        $function = array_pop($formulaStrings);
+                        $formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
+                        unset($space0, $space1);
+                    }
+                    break;
+                case 'tParen': // parenthesis
+                    $expression = array_pop($formulaStrings);
+                    $formulaStrings[] = "$space3$space2($expression$space5$space4)";
+                    unset($space2, $space3, $space4, $space5);
+                    break;
+                case 'tArray': // array constant
+                    $constantArray = self::readBIFF8ConstantArray($additionalData);
+                    $formulaStrings[] = $space1 . $space0 . $constantArray['value'];
+                    $additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
+                    unset($space0, $space1);
+                    break;
+                case 'tMemArea':
+                    // bite off chunk of additional data
+                    $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($additionalData);
+                    $additionalData = substr($additionalData, $cellRangeAddressList['size']);
+                    $formulaStrings[] = "$space1$space0{$token['data']}";
+                    unset($space0, $space1);
+                    break;
+                case 'tArea': // cell range address
+                case 'tBool': // boolean
+                case 'tErr': // error code
+                case 'tInt': // integer
+                case 'tMemErr':
+                case 'tMemFunc':
+                case 'tMissArg':
+                case 'tName':
+                case 'tNameX':
+                case 'tNum': // number
+                case 'tRef': // single cell reference
+                case 'tRef3d': // 3d cell reference
+                case 'tArea3d': // 3d cell range reference
+                case 'tRefN':
+                case 'tAreaN':
+                case 'tStr': // string
+                    $formulaStrings[] = "$space1$space0{$token['data']}";
+                    unset($space0, $space1);
+                    break;
+            }
+        }
+        $formulaString = $formulaStrings[0];
+
+        // for debug: dump the human readable formula
+        //echo '----' . "\n";
+        //echo 'Formula: ' . $formulaString;
+
+        return $formulaString;
+    }
+
+
+    /**
+     * Fetch next token from binary formula data
+     *
+     * @param string Formula data
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     * @return array
+     * @throws PHPExcel_Reader_Exception
+     */
+    private function getNextToken($formulaData, $baseCell = 'A1')
+    {
+        // offset: 0; size: 1; token id
+        $id = ord($formulaData[0]); // token id
+        $name = false; // initialize token name
+
+        switch ($id) {
+            case 0x03:
+                $name = 'tAdd';
+                $size = 1;
+                $data = '+';
+                break;
+            case 0x04:
+                $name = 'tSub';
+                $size = 1;
+                $data = '-';
+                break;
+            case 0x05:
+                $name = 'tMul';
+                $size = 1;
+                $data = '*';
+                break;
+            case 0x06:
+                $name = 'tDiv';
+                $size = 1;
+                $data = '/';
+                break;
+            case 0x07:
+                $name = 'tPower';
+                $size = 1;
+                $data = '^';
+                break;
+            case 0x08:
+                $name = 'tConcat';
+                $size = 1;
+                $data = '&';
+                break;
+            case 0x09:
+                $name = 'tLT';
+                $size = 1;
+                $data = '<';
+                break;
+            case 0x0A:
+                $name = 'tLE';
+                $size = 1;
+                $data = '<=';
+                break;
+            case 0x0B:
+                $name = 'tEQ';
+                $size = 1;
+                $data = '=';
+                break;
+            case 0x0C:
+                $name = 'tGE';
+                $size = 1;
+                $data = '>=';
+                break;
+            case 0x0D:
+                $name = 'tGT';
+                $size = 1;
+                $data = '>';
+                break;
+            case 0x0E:
+                $name = 'tNE';
+                $size = 1;
+                $data = '<>';
+                break;
+            case 0x0F:
+                $name = 'tIsect';
+                $size = 1;
+                $data = ' ';
+                break;
+            case 0x10:
+                $name = 'tList';
+                $size = 1;
+                $data = ',';
+                break;
+            case 0x11:
+                $name = 'tRange';
+                $size = 1;
+                $data = ':';
+                break;
+            case 0x12:
+                $name = 'tUplus';
+                $size = 1;
+                $data = '+';
+                break;
+            case 0x13:
+                $name = 'tUminus';
+                $size = 1;
+                $data = '-';
+                break;
+            case 0x14:
+                $name = 'tPercent';
+                $size = 1;
+                $data = '%';
+                break;
+            case 0x15:    //    parenthesis
+                $name  = 'tParen';
+                $size  = 1;
+                $data = null;
+                break;
+            case 0x16:    //    missing argument
+                $name = 'tMissArg';
+                $size = 1;
+                $data = '';
+                break;
+            case 0x17:    //    string
+                $name = 'tStr';
+                // offset: 1; size: var; Unicode string, 8-bit string length
+                $string = self::readUnicodeStringShort(substr($formulaData, 1));
+                $size = 1 + $string['size'];
+                $data = self::UTF8toExcelDoubleQuoted($string['value']);
+                break;
+            case 0x19:    //    Special attribute
+                // offset: 1; size: 1; attribute type flags:
+                switch (ord($formulaData[1])) {
+                    case 0x01:
+                        $name = 'tAttrVolatile';
+                        $size = 4;
+                        $data = null;
+                        break;
+                    case 0x02:
+                        $name = 'tAttrIf';
+                        $size = 4;
+                        $data = null;
+                        break;
+                    case 0x04:
+                        $name = 'tAttrChoose';
+                        // offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
+                        $nc = self::getInt2d($formulaData, 2);
+                        // offset: 4; size: 2 * $nc
+                        // offset: 4 + 2 * $nc; size: 2
+                        $size = 2 * $nc + 6;
+                        $data = null;
+                        break;
+                    case 0x08:
+                        $name = 'tAttrSkip';
+                        $size = 4;
+                        $data = null;
+                        break;
+                    case 0x10:
+                        $name = 'tAttrSum';
+                        $size = 4;
+                        $data = null;
+                        break;
+                    case 0x40:
+                    case 0x41:
+                        $name = 'tAttrSpace';
+                        $size = 4;
+                        // offset: 2; size: 2; space type and position
+                        switch (ord($formulaData[2])) {
+                            case 0x00:
+                                $spacetype = 'type0';
+                                break;
+                            case 0x01:
+                                $spacetype = 'type1';
+                                break;
+                            case 0x02:
+                                $spacetype = 'type2';
+                                break;
+                            case 0x03:
+                                $spacetype = 'type3';
+                                break;
+                            case 0x04:
+                                $spacetype = 'type4';
+                                break;
+                            case 0x05:
+                                $spacetype = 'type5';
+                                break;
+                            default:
+                                throw new PHPExcel_Reader_Exception('Unrecognized space type in tAttrSpace token');
+                                break;
+                        }
+                        // offset: 3; size: 1; number of inserted spaces/carriage returns
+                        $spacecount = ord($formulaData[3]);
+
+                        $data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
+                        break;
+                    default:
+                        throw new PHPExcel_Reader_Exception('Unrecognized attribute flag in tAttr token');
+                        break;
+                }
+                break;
+            case 0x1C:    //    error code
+                // offset: 1; size: 1; error code
+                $name = 'tErr';
+                $size = 2;
+                $data = PHPExcel_Reader_Excel5_ErrorCode::lookup(ord($formulaData[1]));
+                break;
+            case 0x1D:    //    boolean
+                // offset: 1; size: 1; 0 = false, 1 = true;
+                $name = 'tBool';
+                $size = 2;
+                $data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
+                break;
+            case 0x1E:    //    integer
+                // offset: 1; size: 2; unsigned 16-bit integer
+                $name = 'tInt';
+                $size = 3;
+                $data = self::getInt2d($formulaData, 1);
+                break;
+            case 0x1F:    //    number
+                // offset: 1; size: 8;
+                $name = 'tNum';
+                $size = 9;
+                $data = self::extractNumber(substr($formulaData, 1));
+                $data = str_replace(',', '.', (string)$data); // in case non-English locale
+                break;
+            case 0x20:    //    array constant
+            case 0x40:
+            case 0x60:
+                // offset: 1; size: 7; not used
+                $name = 'tArray';
+                $size = 8;
+                $data = null;
+                break;
+            case 0x21:    //    function with fixed number of arguments
+            case 0x41:
+            case 0x61:
+                $name = 'tFunc';
+                $size = 3;
+                // offset: 1; size: 2; index to built-in sheet function
+                switch (self::getInt2d($formulaData, 1)) {
+                    case 2:
+                        $function = 'ISNA';
+                        $args = 1;
+                        break;
+                    case 3:
+                        $function = 'ISERROR';
+                        $args = 1;
+                        break;
+                    case 10:
+                        $function = 'NA';
+                        $args = 0;
+                        break;
+                    case 15:
+                        $function = 'SIN';
+                        $args = 1;
+                        break;
+                    case 16:
+                        $function = 'COS';
+                        $args = 1;
+                        break;
+                    case 17:
+                        $function = 'TAN';
+                        $args = 1;
+                        break;
+                    case 18:
+                        $function = 'ATAN';
+                        $args = 1;
+                        break;
+                    case 19:
+                        $function = 'PI';
+                        $args = 0;
+                        break;
+                    case 20:
+                        $function = 'SQRT';
+                        $args = 1;
+                        break;
+                    case 21:
+                        $function = 'EXP';
+                        $args = 1;
+                        break;
+                    case 22:
+                        $function = 'LN';
+                        $args = 1;
+                        break;
+                    case 23:
+                        $function = 'LOG10';
+                        $args = 1;
+                        break;
+                    case 24:
+                        $function = 'ABS';
+                        $args = 1;
+                        break;
+                    case 25:
+                        $function = 'INT';
+                        $args = 1;
+                        break;
+                    case 26:
+                        $function = 'SIGN';
+                        $args = 1;
+                        break;
+                    case 27:
+                        $function = 'ROUND';
+                        $args = 2;
+                        break;
+                    case 30:
+                        $function = 'REPT';
+                        $args = 2;
+                        break;
+                    case 31:
+                        $function = 'MID';
+                        $args = 3;
+                        break;
+                    case 32:
+                        $function = 'LEN';
+                        $args = 1;
+                        break;
+                    case 33:
+                        $function = 'VALUE';
+                        $args = 1;
+                        break;
+                    case 34:
+                        $function = 'TRUE';
+                        $args = 0;
+                        break;
+                    case 35:
+                        $function = 'FALSE';
+                        $args = 0;
+                        break;
+                    case 38:
+                        $function = 'NOT';
+                        $args = 1;
+                        break;
+                    case 39:
+                        $function = 'MOD';
+                        $args = 2;
+                        break;
+                    case 40:
+                        $function = 'DCOUNT';
+                        $args = 3;
+                        break;
+                    case 41:
+                        $function = 'DSUM';
+                        $args = 3;
+                        break;
+                    case 42:
+                        $function = 'DAVERAGE';
+                        $args = 3;
+                        break;
+                    case 43:
+                        $function = 'DMIN';
+                        $args = 3;
+                        break;
+                    case 44:
+                        $function = 'DMAX';
+                        $args = 3;
+                        break;
+                    case 45:
+                        $function = 'DSTDEV';
+                        $args = 3;
+                        break;
+                    case 48:
+                        $function = 'TEXT';
+                        $args = 2;
+                        break;
+                    case 61:
+                        $function = 'MIRR';
+                        $args = 3;
+                        break;
+                    case 63:
+                        $function = 'RAND';
+                        $args = 0;
+                        break;
+                    case 65:
+                        $function = 'DATE';
+                        $args = 3;
+                        break;
+                    case 66:
+                        $function = 'TIME';
+                        $args = 3;
+                        break;
+                    case 67:
+                        $function = 'DAY';
+                        $args = 1;
+                        break;
+                    case 68:
+                        $function = 'MONTH';
+                        $args = 1;
+                        break;
+                    case 69:
+                        $function = 'YEAR';
+                        $args = 1;
+                        break;
+                    case 71:
+                        $function = 'HOUR';
+                        $args = 1;
+                        break;
+                    case 72:
+                        $function = 'MINUTE';
+                        $args = 1;
+                        break;
+                    case 73:
+                        $function = 'SECOND';
+                        $args = 1;
+                        break;
+                    case 74:
+                        $function = 'NOW';
+                        $args = 0;
+                        break;
+                    case 75:
+                        $function = 'AREAS';
+                        $args = 1;
+                        break;
+                    case 76:
+                        $function = 'ROWS';
+                        $args = 1;
+                        break;
+                    case 77:
+                        $function = 'COLUMNS';
+                        $args = 1;
+                        break;
+                    case 83:
+                        $function = 'TRANSPOSE';
+                        $args = 1;
+                        break;
+                    case 86:
+                        $function = 'TYPE';
+                        $args = 1;
+                        break;
+                    case 97:
+                        $function = 'ATAN2';
+                        $args = 2;
+                        break;
+                    case 98:
+                        $function = 'ASIN';
+                        $args = 1;
+                        break;
+                    case 99:
+                        $function = 'ACOS';
+                        $args = 1;
+                        break;
+                    case 105:
+                        $function = 'ISREF';
+                        $args = 1;
+                        break;
+                    case 111:
+                        $function = 'CHAR';
+                        $args = 1;
+                        break;
+                    case 112:
+                        $function = 'LOWER';
+                        $args = 1;
+                        break;
+                    case 113:
+                        $function = 'UPPER';
+                        $args = 1;
+                        break;
+                    case 114:
+                        $function = 'PROPER';
+                        $args = 1;
+                        break;
+                    case 117:
+                        $function = 'EXACT';
+                        $args = 2;
+                        break;
+                    case 118:
+                        $function = 'TRIM';
+                        $args = 1;
+                        break;
+                    case 119:
+                        $function = 'REPLACE';
+                        $args = 4;
+                        break;
+                    case 121:
+                        $function = 'CODE';
+                        $args = 1;
+                        break;
+                    case 126:
+                        $function = 'ISERR';
+                        $args = 1;
+                        break;
+                    case 127:
+                        $function = 'ISTEXT';
+                        $args = 1;
+                        break;
+                    case 128:
+                        $function = 'ISNUMBER';
+                        $args = 1;
+                        break;
+                    case 129:
+                        $function = 'ISBLANK';
+                        $args = 1;
+                        break;
+                    case 130:
+                        $function = 'T';
+                        $args = 1;
+                        break;
+                    case 131:
+                        $function = 'N';
+                        $args = 1;
+                        break;
+                    case 140:
+                        $function = 'DATEVALUE';
+                        $args = 1;
+                        break;
+                    case 141:
+                        $function = 'TIMEVALUE';
+                        $args = 1;
+                        break;
+                    case 142:
+                        $function = 'SLN';
+                        $args = 3;
+                        break;
+                    case 143:
+                        $function = 'SYD';
+                        $args = 4;
+                        break;
+                    case 162:
+                        $function = 'CLEAN';
+                        $args = 1;
+                        break;
+                    case 163:
+                        $function = 'MDETERM';
+                        $args = 1;
+                        break;
+                    case 164:
+                        $function = 'MINVERSE';
+                        $args = 1;
+                        break;
+                    case 165:
+                        $function = 'MMULT';
+                        $args = 2;
+                        break;
+                    case 184:
+                        $function = 'FACT';
+                        $args = 1;
+                        break;
+                    case 189:
+                        $function = 'DPRODUCT';
+                        $args = 3;
+                        break;
+                    case 190:
+                        $function = 'ISNONTEXT';
+                        $args = 1;
+                        break;
+                    case 195:
+                        $function = 'DSTDEVP';
+                        $args = 3;
+                        break;
+                    case 196:
+                        $function = 'DVARP';
+                        $args = 3;
+                        break;
+                    case 198:
+                        $function = 'ISLOGICAL';
+                        $args = 1;
+                        break;
+                    case 199:
+                        $function = 'DCOUNTA';
+                        $args = 3;
+                        break;
+                    case 207:
+                        $function = 'REPLACEB';
+                        $args = 4;
+                        break;
+                    case 210:
+                        $function = 'MIDB';
+                        $args = 3;
+                        break;
+                    case 211:
+                        $function = 'LENB';
+                        $args = 1;
+                        break;
+                    case 212:
+                        $function = 'ROUNDUP';
+                        $args = 2;
+                        break;
+                    case 213:
+                        $function = 'ROUNDDOWN';
+                        $args = 2;
+                        break;
+                    case 214:
+                        $function = 'ASC';
+                        $args = 1;
+                        break;
+                    case 215:
+                        $function = 'DBCS';
+                        $args = 1;
+                        break;
+                    case 221:
+                        $function = 'TODAY';
+                        $args = 0;
+                        break;
+                    case 229:
+                        $function = 'SINH';
+                        $args = 1;
+                        break;
+                    case 230:
+                        $function = 'COSH';
+                        $args = 1;
+                        break;
+                    case 231:
+                        $function = 'TANH';
+                        $args = 1;
+                        break;
+                    case 232:
+                        $function = 'ASINH';
+                        $args = 1;
+                        break;
+                    case 233:
+                        $function = 'ACOSH';
+                        $args = 1;
+                        break;
+                    case 234:
+                        $function = 'ATANH';
+                        $args = 1;
+                        break;
+                    case 235:
+                        $function = 'DGET';
+                        $args = 3;
+                        break;
+                    case 244:
+                        $function = 'INFO';
+                        $args = 1;
+                        break;
+                    case 252:
+                        $function = 'FREQUENCY';
+                        $args = 2;
+                        break;
+                    case 261:
+                        $function = 'ERROR.TYPE';
+                        $args = 1;
+                        break;
+                    case 271:
+                        $function = 'GAMMALN';
+                        $args = 1;
+                        break;
+                    case 273:
+                        $function = 'BINOMDIST';
+                        $args = 4;
+                        break;
+                    case 274:
+                        $function = 'CHIDIST';
+                        $args = 2;
+                        break;
+                    case 275:
+                        $function = 'CHIINV';
+                        $args = 2;
+                        break;
+                    case 276:
+                        $function = 'COMBIN';
+                        $args = 2;
+                        break;
+                    case 277:
+                        $function = 'CONFIDENCE';
+                        $args = 3;
+                        break;
+                    case 278:
+                        $function = 'CRITBINOM';
+                        $args = 3;
+                        break;
+                    case 279:
+                        $function = 'EVEN';
+                        $args = 1;
+                        break;
+                    case 280:
+                        $function = 'EXPONDIST';
+                        $args = 3;
+                        break;
+                    case 281:
+                        $function = 'FDIST';
+                        $args = 3;
+                        break;
+                    case 282:
+                        $function = 'FINV';
+                        $args = 3;
+                        break;
+                    case 283:
+                        $function = 'FISHER';
+                        $args = 1;
+                        break;
+                    case 284:
+                        $function = 'FISHERINV';
+                        $args = 1;
+                        break;
+                    case 285:
+                        $function = 'FLOOR';
+                        $args = 2;
+                        break;
+                    case 286:
+                        $function = 'GAMMADIST';
+                        $args = 4;
+                        break;
+                    case 287:
+                        $function = 'GAMMAINV';
+                        $args = 3;
+                        break;
+                    case 288:
+                        $function = 'CEILING';
+                        $args = 2;
+                        break;
+                    case 289:
+                        $function = 'HYPGEOMDIST';
+                        $args = 4;
+                        break;
+                    case 290:
+                        $function = 'LOGNORMDIST';
+                        $args = 3;
+                        break;
+                    case 291:
+                        $function = 'LOGINV';
+                        $args = 3;
+                        break;
+                    case 292:
+                        $function = 'NEGBINOMDIST';
+                        $args = 3;
+                        break;
+                    case 293:
+                        $function = 'NORMDIST';
+                        $args = 4;
+                        break;
+                    case 294:
+                        $function = 'NORMSDIST';
+                        $args = 1;
+                        break;
+                    case 295:
+                        $function = 'NORMINV';
+                        $args = 3;
+                        break;
+                    case 296:
+                        $function = 'NORMSINV';
+                        $args = 1;
+                        break;
+                    case 297:
+                        $function = 'STANDARDIZE';
+                        $args = 3;
+                        break;
+                    case 298:
+                        $function = 'ODD';
+                        $args = 1;
+                        break;
+                    case 299:
+                        $function = 'PERMUT';
+                        $args = 2;
+                        break;
+                    case 300:
+                        $function = 'POISSON';
+                        $args = 3;
+                        break;
+                    case 301:
+                        $function = 'TDIST';
+                        $args = 3;
+                        break;
+                    case 302:
+                        $function = 'WEIBULL';
+                        $args = 4;
+                        break;
+                    case 303:
+                        $function = 'SUMXMY2';
+                        $args = 2;
+                        break;
+                    case 304:
+                        $function = 'SUMX2MY2';
+                        $args = 2;
+                        break;
+                    case 305:
+                        $function = 'SUMX2PY2';
+                        $args = 2;
+                        break;
+                    case 306:
+                        $function = 'CHITEST';
+                        $args = 2;
+                        break;
+                    case 307:
+                        $function = 'CORREL';
+                        $args = 2;
+                        break;
+                    case 308:
+                        $function = 'COVAR';
+                        $args = 2;
+                        break;
+                    case 309:
+                        $function = 'FORECAST';
+                        $args = 3;
+                        break;
+                    case 310:
+                        $function = 'FTEST';
+                        $args = 2;
+                        break;
+                    case 311:
+                        $function = 'INTERCEPT';
+                        $args = 2;
+                        break;
+                    case 312:
+                        $function = 'PEARSON';
+                        $args = 2;
+                        break;
+                    case 313:
+                        $function = 'RSQ';
+                        $args = 2;
+                        break;
+                    case 314:
+                        $function = 'STEYX';
+                        $args = 2;
+                        break;
+                    case 315:
+                        $function = 'SLOPE';
+                        $args = 2;
+                        break;
+                    case 316:
+                        $function = 'TTEST';
+                        $args = 4;
+                        break;
+                    case 325:
+                        $function = 'LARGE';
+                        $args = 2;
+                        break;
+                    case 326:
+                        $function = 'SMALL';
+                        $args = 2;
+                        break;
+                    case 327:
+                        $function = 'QUARTILE';
+                        $args = 2;
+                        break;
+                    case 328:
+                        $function = 'PERCENTILE';
+                        $args = 2;
+                        break;
+                    case 331:
+                        $function = 'TRIMMEAN';
+                        $args = 2;
+                        break;
+                    case 332:
+                        $function = 'TINV';
+                        $args = 2;
+                        break;
+                    case 337:
+                        $function = 'POWER';
+                        $args = 2;
+                        break;
+                    case 342:
+                        $function = 'RADIANS';
+                        $args = 1;
+                        break;
+                    case 343:
+                        $function = 'DEGREES';
+                        $args = 1;
+                        break;
+                    case 346:
+                        $function = 'COUNTIF';
+                        $args = 2;
+                        break;
+                    case 347:
+                        $function = 'COUNTBLANK';
+                        $args = 1;
+                        break;
+                    case 350:
+                        $function = 'ISPMT';
+                        $args = 4;
+                        break;
+                    case 351:
+                        $function = 'DATEDIF';
+                        $args = 3;
+                        break;
+                    case 352:
+                        $function = 'DATESTRING';
+                        $args = 1;
+                        break;
+                    case 353:
+                        $function = 'NUMBERSTRING';
+                        $args = 2;
+                        break;
+                    case 360:
+                        $function = 'PHONETIC';
+                        $args = 1;
+                        break;
+                    case 368:
+                        $function = 'BAHTTEXT';
+                        $args = 1;
+                        break;
+                    default:
+                        throw new PHPExcel_Reader_Exception('Unrecognized function in formula');
+                        break;
+                }
+                $data = array('function' => $function, 'args' => $args);
+                break;
+            case 0x22:    //    function with variable number of arguments
+            case 0x42:
+            case 0x62:
+                $name = 'tFuncV';
+                $size = 4;
+                // offset: 1; size: 1; number of arguments
+                $args = ord($formulaData[1]);
+                // offset: 2: size: 2; index to built-in sheet function
+                $index = self::getInt2d($formulaData, 2);
+                switch ($index) {
+                    case 0:
+                        $function = 'COUNT';
+                        break;
+                    case 1:
+                        $function = 'IF';
+                        break;
+                    case 4:
+                        $function = 'SUM';
+                        break;
+                    case 5:
+                        $function = 'AVERAGE';
+                        break;
+                    case 6:
+                        $function = 'MIN';
+                        break;
+                    case 7:
+                        $function = 'MAX';
+                        break;
+                    case 8:
+                        $function = 'ROW';
+                        break;
+                    case 9:
+                        $function = 'COLUMN';
+                        break;
+                    case 11:
+                        $function = 'NPV';
+                        break;
+                    case 12:
+                        $function = 'STDEV';
+                        break;
+                    case 13:
+                        $function = 'DOLLAR';
+                        break;
+                    case 14:
+                        $function = 'FIXED';
+                        break;
+                    case 28:
+                        $function = 'LOOKUP';
+                        break;
+                    case 29:
+                        $function = 'INDEX';
+                        break;
+                    case 36:
+                        $function = 'AND';
+                        break;
+                    case 37:
+                        $function = 'OR';
+                        break;
+                    case 46:
+                        $function = 'VAR';
+                        break;
+                    case 49:
+                        $function = 'LINEST';
+                        break;
+                    case 50:
+                        $function = 'TREND';
+                        break;
+                    case 51:
+                        $function = 'LOGEST';
+                        break;
+                    case 52:
+                        $function = 'GROWTH';
+                        break;
+                    case 56:
+                        $function = 'PV';
+                        break;
+                    case 57:
+                        $function = 'FV';
+                        break;
+                    case 58:
+                        $function = 'NPER';
+                        break;
+                    case 59:
+                        $function = 'PMT';
+                        break;
+                    case 60:
+                        $function = 'RATE';
+                        break;
+                    case 62:
+                        $function = 'IRR';
+                        break;
+                    case 64:
+                        $function = 'MATCH';
+                        break;
+                    case 70:
+                        $function = 'WEEKDAY';
+                        break;
+                    case 78:
+                        $function = 'OFFSET';
+                        break;
+                    case 82:
+                        $function = 'SEARCH';
+                        break;
+                    case 100:
+                        $function = 'CHOOSE';
+                        break;
+                    case 101:
+                        $function = 'HLOOKUP';
+                        break;
+                    case 102:
+                        $function = 'VLOOKUP';
+                        break;
+                    case 109:
+                        $function = 'LOG';
+                        break;
+                    case 115:
+                        $function = 'LEFT';
+                        break;
+                    case 116:
+                        $function = 'RIGHT';
+                        break;
+                    case 120:
+                        $function = 'SUBSTITUTE';
+                        break;
+                    case 124:
+                        $function = 'FIND';
+                        break;
+                    case 125:
+                        $function = 'CELL';
+                        break;
+                    case 144:
+                        $function = 'DDB';
+                        break;
+                    case 148:
+                        $function = 'INDIRECT';
+                        break;
+                    case 167:
+                        $function = 'IPMT';
+                        break;
+                    case 168:
+                        $function = 'PPMT';
+                        break;
+                    case 169:
+                        $function = 'COUNTA';
+                        break;
+                    case 183:
+                        $function = 'PRODUCT';
+                        break;
+                    case 193:
+                        $function = 'STDEVP';
+                        break;
+                    case 194:
+                        $function = 'VARP';
+                        break;
+                    case 197:
+                        $function = 'TRUNC';
+                        break;
+                    case 204:
+                        $function = 'USDOLLAR';
+                        break;
+                    case 205:
+                        $function = 'FINDB';
+                        break;
+                    case 206:
+                        $function = 'SEARCHB';
+                        break;
+                    case 208:
+                        $function = 'LEFTB';
+                        break;
+                    case 209:
+                        $function = 'RIGHTB';
+                        break;
+                    case 216:
+                        $function = 'RANK';
+                        break;
+                    case 219:
+                        $function = 'ADDRESS';
+                        break;
+                    case 220:
+                        $function = 'DAYS360';
+                        break;
+                    case 222:
+                        $function = 'VDB';
+                        break;
+                    case 227:
+                        $function = 'MEDIAN';
+                        break;
+                    case 228:
+                        $function = 'SUMPRODUCT';
+                        break;
+                    case 247:
+                        $function = 'DB';
+                        break;
+                    case 255:
+                        $function = '';
+                        break;
+                    case 269:
+                        $function = 'AVEDEV';
+                        break;
+                    case 270:
+                        $function = 'BETADIST';
+                        break;
+                    case 272:
+                        $function = 'BETAINV';
+                        break;
+                    case 317:
+                        $function = 'PROB';
+                        break;
+                    case 318:
+                        $function = 'DEVSQ';
+                        break;
+                    case 319:
+                        $function = 'GEOMEAN';
+                        break;
+                    case 320:
+                        $function = 'HARMEAN';
+                        break;
+                    case 321:
+                        $function = 'SUMSQ';
+                        break;
+                    case 322:
+                        $function = 'KURT';
+                        break;
+                    case 323:
+                        $function = 'SKEW';
+                        break;
+                    case 324:
+                        $function = 'ZTEST';
+                        break;
+                    case 329:
+                        $function = 'PERCENTRANK';
+                        break;
+                    case 330:
+                        $function = 'MODE';
+                        break;
+                    case 336:
+                        $function = 'CONCATENATE';
+                        break;
+                    case 344:
+                        $function = 'SUBTOTAL';
+                        break;
+                    case 345:
+                        $function = 'SUMIF';
+                        break;
+                    case 354:
+                        $function = 'ROMAN';
+                        break;
+                    case 358:
+                        $function = 'GETPIVOTDATA';
+                        break;
+                    case 359:
+                        $function = 'HYPERLINK';
+                        break;
+                    case 361:
+                        $function = 'AVERAGEA';
+                        break;
+                    case 362:
+                        $function = 'MAXA';
+                        break;
+                    case 363:
+                        $function = 'MINA';
+                        break;
+                    case 364:
+                        $function = 'STDEVPA';
+                        break;
+                    case 365:
+                        $function = 'VARPA';
+                        break;
+                    case 366:
+                        $function = 'STDEVA';
+                        break;
+                    case 367:
+                        $function = 'VARA';
+                        break;
+                    default:
+                        throw new PHPExcel_Reader_Exception('Unrecognized function in formula');
+                        break;
+                }
+                $data = array('function' => $function, 'args' => $args);
+                break;
+            case 0x23:    //    index to defined name
+            case 0x43:
+            case 0x63:
+                $name = 'tName';
+                $size = 5;
+                // offset: 1; size: 2; one-based index to definedname record
+                $definedNameIndex = self::getInt2d($formulaData, 1) - 1;
+                // offset: 2; size: 2; not used
+                $data = $this->definedname[$definedNameIndex]['name'];
+                break;
+            case 0x24:    //    single cell reference e.g. A5
+            case 0x44:
+            case 0x64:
+                $name = 'tRef';
+                $size = 5;
+                $data = $this->readBIFF8CellAddress(substr($formulaData, 1, 4));
+                break;
+            case 0x25:    //    cell range reference to cells in the same sheet (2d)
+            case 0x45:
+            case 0x65:
+                $name = 'tArea';
+                $size = 9;
+                $data = $this->readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
+                break;
+            case 0x26:    //    Constant reference sub-expression
+            case 0x46:
+            case 0x66:
+                $name = 'tMemArea';
+                // offset: 1; size: 4; not used
+                // offset: 5; size: 2; size of the following subexpression
+                $subSize = self::getInt2d($formulaData, 5);
+                $size = 7 + $subSize;
+                $data = $this->getFormulaFromData(substr($formulaData, 7, $subSize));
+                break;
+            case 0x27:    //    Deleted constant reference sub-expression
+            case 0x47:
+            case 0x67:
+                $name = 'tMemErr';
+                // offset: 1; size: 4; not used
+                // offset: 5; size: 2; size of the following subexpression
+                $subSize = self::getInt2d($formulaData, 5);
+                $size = 7 + $subSize;
+                $data = $this->getFormulaFromData(substr($formulaData, 7, $subSize));
+                break;
+            case 0x29:    //    Variable reference sub-expression
+            case 0x49:
+            case 0x69:
+                $name = 'tMemFunc';
+                // offset: 1; size: 2; size of the following sub-expression
+                $subSize = self::getInt2d($formulaData, 1);
+                $size = 3 + $subSize;
+                $data = $this->getFormulaFromData(substr($formulaData, 3, $subSize));
+                break;
+            case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
+            case 0x4C:
+            case 0x6C:
+                $name = 'tRefN';
+                $size = 5;
+                $data = $this->readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
+                break;
+            case 0x2D:    //    Relative 2d range reference
+            case 0x4D:
+            case 0x6D:
+                $name = 'tAreaN';
+                $size = 9;
+                $data = $this->readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
+                break;
+            case 0x39:    //    External name
+            case 0x59:
+            case 0x79:
+                $name = 'tNameX';
+                $size = 7;
+                // offset: 1; size: 2; index to REF entry in EXTERNSHEET record
+                // offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
+                $index = self::getInt2d($formulaData, 3);
+                // assume index is to EXTERNNAME record
+                $data = $this->externalNames[$index - 1]['name'];
+                // offset: 5; size: 2; not used
+                break;
+            case 0x3A:    //    3d reference to cell
+            case 0x5A:
+            case 0x7A:
+                $name = 'tRef3d';
+                $size = 7;
+
+                try {
+                    // offset: 1; size: 2; index to REF entry
+                    $sheetRange = $this->readSheetRangeByRefIndex(self::getInt2d($formulaData, 1));
+                    // offset: 3; size: 4; cell address
+                    $cellAddress = $this->readBIFF8CellAddress(substr($formulaData, 3, 4));
+
+                    $data = "$sheetRange!$cellAddress";
+                } catch (PHPExcel_Exception $e) {
+                    // deleted sheet reference
+                    $data = '#REF!';
+                }
+                break;
+            case 0x3B:    //    3d reference to cell range
+            case 0x5B:
+            case 0x7B:
+                $name = 'tArea3d';
+                $size = 11;
+
+                try {
+                    // offset: 1; size: 2; index to REF entry
+                    $sheetRange = $this->readSheetRangeByRefIndex(self::getInt2d($formulaData, 1));
+                    // offset: 3; size: 8; cell address
+                    $cellRangeAddress = $this->readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
+
+                    $data = "$sheetRange!$cellRangeAddress";
+                } catch (PHPExcel_Exception $e) {
+                    // deleted sheet reference
+                    $data = '#REF!';
+                }
+                break;
+            // Unknown cases    // don't know how to deal with
+            default:
+                throw new PHPExcel_Reader_Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
+                break;
+        }
+
+        return array(
+            'id' => $id,
+            'name' => $name,
+            'size' => $size,
+            'data' => $data,
+        );
+    }
+
+
+    /**
+     * Reads a cell address in BIFF8 e.g. 'A2' or '$A$2'
+     * section 3.3.4
+     *
+     * @param string $cellAddressStructure
+     * @return string
+     */
+    private function readBIFF8CellAddress($cellAddressStructure)
+    {
+        // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
+        $row = self::getInt2d($cellAddressStructure, 0) + 1;
+
+        // offset: 2; size: 2; index to column or column offset + relative flags
+        // bit: 7-0; mask 0x00FF; column index
+        $column = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::getInt2d($cellAddressStructure, 2));
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getInt2d($cellAddressStructure, 2))) {
+            $column = '$' . $column;
+        }
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getInt2d($cellAddressStructure, 2))) {
+            $row = '$' . $row;
+        }
+
+        return $column . $row;
+    }
+
+
+    /**
+     * Reads a cell address in BIFF8 for shared formulas. Uses positive and negative values for row and column
+     * to indicate offsets from a base cell
+     * section 3.3.4
+     *
+     * @param string $cellAddressStructure
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     * @return string
+     */
+    private function readBIFF8CellAddressB($cellAddressStructure, $baseCell = 'A1')
+    {
+        list($baseCol, $baseRow) = PHPExcel_Cell::coordinateFromString($baseCell);
+        $baseCol = PHPExcel_Cell::columnIndexFromString($baseCol) - 1;
+
+        // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
+        $rowIndex = self::getInt2d($cellAddressStructure, 0);
+        $row = self::getInt2d($cellAddressStructure, 0) + 1;
+
+        // offset: 2; size: 2; index to column or column offset + relative flags
+        // bit: 7-0; mask 0x00FF; column index
+        $colIndex = 0x00FF & self::getInt2d($cellAddressStructure, 2);
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getInt2d($cellAddressStructure, 2))) {
+            $column = PHPExcel_Cell::stringFromColumnIndex($colIndex);
+            $column = '$' . $column;
+        } else {
+            $colIndex = ($colIndex <= 127) ? $colIndex : $colIndex - 256;
+            $column = PHPExcel_Cell::stringFromColumnIndex($baseCol + $colIndex);
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getInt2d($cellAddressStructure, 2))) {
+            $row = '$' . $row;
+        } else {
+            $rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
+            $row = $baseRow + $rowIndex;
+        }
+
+        return $column . $row;
+    }
+
+
+    /**
+     * Reads a cell range address in BIFF5 e.g. 'A2:B6' or 'A1'
+     * always fixed range
+     * section 2.5.14
+     *
+     * @param string $subData
+     * @return string
+     * @throws PHPExcel_Reader_Exception
+     */
+    private function readBIFF5CellRangeAddressFixed($subData)
+    {
+        // offset: 0; size: 2; index to first row
+        $fr = self::getInt2d($subData, 0) + 1;
+
+        // offset: 2; size: 2; index to last row
+        $lr = self::getInt2d($subData, 2) + 1;
+
+        // offset: 4; size: 1; index to first column
+        $fc = ord($subData[4]);
+
+        // offset: 5; size: 1; index to last column
+        $lc = ord($subData[5]);
+
+        // check values
+        if ($fr > $lr || $fc > $lc) {
+            throw new PHPExcel_Reader_Exception('Not a cell range address');
+        }
+
+        // column index to letter
+        $fc = PHPExcel_Cell::stringFromColumnIndex($fc);
+        $lc = PHPExcel_Cell::stringFromColumnIndex($lc);
+
+        if ($fr == $lr and $fc == $lc) {
+            return "$fc$fr";
+        }
+        return "$fc$fr:$lc$lr";
+    }
+
+
+    /**
+     * Reads a cell range address in BIFF8 e.g. 'A2:B6' or 'A1'
+     * always fixed range
+     * section 2.5.14
+     *
+     * @param string $subData
+     * @return string
+     * @throws PHPExcel_Reader_Exception
+     */
+    private function readBIFF8CellRangeAddressFixed($subData)
+    {
+        // offset: 0; size: 2; index to first row
+        $fr = self::getInt2d($subData, 0) + 1;
+
+        // offset: 2; size: 2; index to last row
+        $lr = self::getInt2d($subData, 2) + 1;
+
+        // offset: 4; size: 2; index to first column
+        $fc = self::getInt2d($subData, 4);
+
+        // offset: 6; size: 2; index to last column
+        $lc = self::getInt2d($subData, 6);
+
+        // check values
+        if ($fr > $lr || $fc > $lc) {
+            throw new PHPExcel_Reader_Exception('Not a cell range address');
+        }
+
+        // column index to letter
+        $fc = PHPExcel_Cell::stringFromColumnIndex($fc);
+        $lc = PHPExcel_Cell::stringFromColumnIndex($lc);
+
+        if ($fr == $lr and $fc == $lc) {
+            return "$fc$fr";
+        }
+        return "$fc$fr:$lc$lr";
+    }
+
+
+    /**
+     * Reads a cell range address in BIFF8 e.g. 'A2:B6' or '$A$2:$B$6'
+     * there are flags indicating whether column/row index is relative
+     * section 3.3.4
+     *
+     * @param string $subData
+     * @return string
+     */
+    private function readBIFF8CellRangeAddress($subData)
+    {
+        // todo: if cell range is just a single cell, should this funciton
+        // not just return e.g. 'A1' and not 'A1:A1' ?
+
+        // offset: 0; size: 2; index to first row (0... 65535) (or offset (-32768... 32767))
+            $fr = self::getInt2d($subData, 0) + 1;
+
+        // offset: 2; size: 2; index to last row (0... 65535) (or offset (-32768... 32767))
+            $lr = self::getInt2d($subData, 2) + 1;
+
+        // offset: 4; size: 2; index to first column or column offset + relative flags
+
+        // bit: 7-0; mask 0x00FF; column index
+        $fc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::getInt2d($subData, 4));
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getInt2d($subData, 4))) {
+            $fc = '$' . $fc;
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getInt2d($subData, 4))) {
+            $fr = '$' . $fr;
+        }
+
+        // offset: 6; size: 2; index to last column or column offset + relative flags
+
+        // bit: 7-0; mask 0x00FF; column index
+        $lc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::getInt2d($subData, 6));
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getInt2d($subData, 6))) {
+            $lc = '$' . $lc;
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getInt2d($subData, 6))) {
+            $lr = '$' . $lr;
+        }
+
+        return "$fc$fr:$lc$lr";
+    }
+
+
+    /**
+     * Reads a cell range address in BIFF8 for shared formulas. Uses positive and negative values for row and column
+     * to indicate offsets from a base cell
+     * section 3.3.4
+     *
+     * @param string $subData
+     * @param string $baseCell Base cell
+     * @return string Cell range address
+     */
+    private function readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
+    {
+        list($baseCol, $baseRow) = PHPExcel_Cell::coordinateFromString($baseCell);
+        $baseCol = PHPExcel_Cell::columnIndexFromString($baseCol) - 1;
+
+        // TODO: if cell range is just a single cell, should this funciton
+        // not just return e.g. 'A1' and not 'A1:A1' ?
+
+        // offset: 0; size: 2; first row
+        $frIndex = self::getInt2d($subData, 0); // adjust below
+
+        // offset: 2; size: 2; relative index to first row (0... 65535) should be treated as offset (-32768... 32767)
+        $lrIndex = self::getInt2d($subData, 2); // adjust below
+
+        // offset: 4; size: 2; first column with relative/absolute flags
+
+        // bit: 7-0; mask 0x00FF; column index
+        $fcIndex = 0x00FF & self::getInt2d($subData, 4);
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getInt2d($subData, 4))) {
+            // absolute column index
+            $fc = PHPExcel_Cell::stringFromColumnIndex($fcIndex);
+            $fc = '$' . $fc;
+        } else {
+            // column offset
+            $fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
+            $fc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $fcIndex);
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getInt2d($subData, 4))) {
+            // absolute row index
+            $fr = $frIndex + 1;
+            $fr = '$' . $fr;
+        } else {
+            // row offset
+            $frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
+            $fr = $baseRow + $frIndex;
+        }
+
+        // offset: 6; size: 2; last column with relative/absolute flags
+
+        // bit: 7-0; mask 0x00FF; column index
+        $lcIndex = 0x00FF & self::getInt2d($subData, 6);
+        $lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
+        $lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getInt2d($subData, 6))) {
+            // absolute column index
+            $lc = PHPExcel_Cell::stringFromColumnIndex($lcIndex);
+            $lc = '$' . $lc;
+        } else {
+            // column offset
+            $lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
+            $lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getInt2d($subData, 6))) {
+            // absolute row index
+            $lr = $lrIndex + 1;
+            $lr = '$' . $lr;
+        } else {
+            // row offset
+            $lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
+            $lr = $baseRow + $lrIndex;
+        }
+
+        return "$fc$fr:$lc$lr";
+    }
+
+
+    /**
+     * Read BIFF8 cell range address list
+     * section 2.5.15
+     *
+     * @param string $subData
+     * @return array
+     */
+    private function readBIFF8CellRangeAddressList($subData)
+    {
+        $cellRangeAddresses = array();
+
+        // offset: 0; size: 2; number of the following cell range addresses
+        $nm = self::getInt2d($subData, 0);
+
+        $offset = 2;
+        // offset: 2; size: 8 * $nm; list of $nm (fixed) cell range addresses
+        for ($i = 0; $i < $nm; ++$i) {
+            $cellRangeAddresses[] = $this->readBIFF8CellRangeAddressFixed(substr($subData, $offset, 8));
+            $offset += 8;
+        }
+
+        return array(
+            'size' => 2 + 8 * $nm,
+            'cellRangeAddresses' => $cellRangeAddresses,
+        );
+    }
+
+
+    /**
+     * Read BIFF5 cell range address list
+     * section 2.5.15
+     *
+     * @param string $subData
+     * @return array
+     */
+    private function readBIFF5CellRangeAddressList($subData)
+    {
+        $cellRangeAddresses = array();
+
+        // offset: 0; size: 2; number of the following cell range addresses
+        $nm = self::getInt2d($subData, 0);
+
+        $offset = 2;
+        // offset: 2; size: 6 * $nm; list of $nm (fixed) cell range addresses
+        for ($i = 0; $i < $nm; ++$i) {
+            $cellRangeAddresses[] = $this->readBIFF5CellRangeAddressFixed(substr($subData, $offset, 6));
+            $offset += 6;
+        }
+
+        return array(
+            'size' => 2 + 6 * $nm,
+            'cellRangeAddresses' => $cellRangeAddresses,
+        );
+    }
+
+
+    /**
+     * Get a sheet range like Sheet1:Sheet3 from REF index
+     * Note: If there is only one sheet in the range, one gets e.g Sheet1
+     * It can also happen that the REF structure uses the -1 (FFFF) code to indicate deleted sheets,
+     * in which case an PHPExcel_Reader_Exception is thrown
+     *
+     * @param int $index
+     * @return string|false
+     * @throws PHPExcel_Reader_Exception
+     */
+    private function readSheetRangeByRefIndex($index)
+    {
+        if (isset($this->ref[$index])) {
+            $type = $this->externalBooks[$this->ref[$index]['externalBookIndex']]['type'];
+
+            switch ($type) {
+                case 'internal':
+                    // check if we have a deleted 3d reference
+                    if ($this->ref[$index]['firstSheetIndex'] == 0xFFFF or $this->ref[$index]['lastSheetIndex'] == 0xFFFF) {
+                        throw new PHPExcel_Reader_Exception('Deleted sheet reference');
+                    }
+
+                    // we have normal sheet range (collapsed or uncollapsed)
+                    $firstSheetName = $this->sheets[$this->ref[$index]['firstSheetIndex']]['name'];
+                    $lastSheetName = $this->sheets[$this->ref[$index]['lastSheetIndex']]['name'];
+
+                    if ($firstSheetName == $lastSheetName) {
+                        // collapsed sheet range
+                        $sheetRange = $firstSheetName;
+                    } else {
+                        $sheetRange = "$firstSheetName:$lastSheetName";
+                    }
+
+                    // escape the single-quotes
+                    $sheetRange = str_replace("'", "''", $sheetRange);
+
+                    // if there are special characters, we need to enclose the range in single-quotes
+                    // todo: check if we have identified the whole set of special characters
+                    // it seems that the following characters are not accepted for sheet names
+                    // and we may assume that they are not present: []*/:\?
+                    if (preg_match("/[ !\"@#£$%&{()}<>=+'|^,;-]/", $sheetRange)) {
+                        $sheetRange = "'$sheetRange'";
+                    }
+
+                    return $sheetRange;
+                    break;
+                default:
+                    // TODO: external sheet support
+                    throw new PHPExcel_Reader_Exception('Excel5 reader only supports internal sheets in fomulas');
+                    break;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * read BIFF8 constant value array from array data
+     * returns e.g. array('value' => '{1,2;3,4}', 'size' => 40}
+     * section 2.5.8
+     *
+     * @param string $arrayData
+     * @return array
+     */
+    private static function readBIFF8ConstantArray($arrayData)
+    {
+        // offset: 0; size: 1; number of columns decreased by 1
+        $nc = ord($arrayData[0]);
+
+        // offset: 1; size: 2; number of rows decreased by 1
+        $nr = self::getInt2d($arrayData, 1);
+        $size = 3; // initialize
+        $arrayData = substr($arrayData, 3);
+
+        // offset: 3; size: var; list of ($nc + 1) * ($nr + 1) constant values
+        $matrixChunks = array();
+        for ($r = 1; $r <= $nr + 1; ++$r) {
+            $items = array();
+            for ($c = 1; $c <= $nc + 1; ++$c) {
+                $constant = self::readBIFF8Constant($arrayData);
+                $items[] = $constant['value'];
+                $arrayData = substr($arrayData, $constant['size']);
+                $size += $constant['size'];
+            }
+            $matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
+        }
+        $matrix = '{' . implode(';', $matrixChunks) . '}';
+
+        return array(
+            'value' => $matrix,
+            'size' => $size,
+        );
+    }
+
+
+    /**
+     * read BIFF8 constant value which may be 'Empty Value', 'Number', 'String Value', 'Boolean Value', 'Error Value'
+     * section 2.5.7
+     * returns e.g. array('value' => '5', 'size' => 9)
+     *
+     * @param string $valueData
+     * @return array
+     */
+    private static function readBIFF8Constant($valueData)
+    {
+        // offset: 0; size: 1; identifier for type of constant
+        $identifier = ord($valueData[0]);
+
+        switch ($identifier) {
+            case 0x00: // empty constant (what is this?)
+                $value = '';
+                $size = 9;
+                break;
+            case 0x01: // number
+                // offset: 1; size: 8; IEEE 754 floating-point value
+                $value = self::extractNumber(substr($valueData, 1, 8));
+                $size = 9;
+                break;
+            case 0x02: // string value
+                // offset: 1; size: var; Unicode string, 16-bit string length
+                $string = self::readUnicodeStringLong(substr($valueData, 1));
+                $value = '"' . $string['value'] . '"';
+                $size = 1 + $string['size'];
+                break;
+            case 0x04: // boolean
+                // offset: 1; size: 1; 0 = FALSE, 1 = TRUE
+                if (ord($valueData[1])) {
+                    $value = 'TRUE';
+                } else {
+                    $value = 'FALSE';
+                }
+                $size = 9;
+                break;
+            case 0x10: // error code
+                // offset: 1; size: 1; error code
+                $value = PHPExcel_Reader_Excel5_ErrorCode::lookup(ord($valueData[1]));
+                $size = 9;
+                break;
+        }
+        return array(
+            'value' => $value,
+            'size' => $size,
+        );
+    }
+
+
+    /**
+     * Extract RGB color
+     * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.4
+     *
+     * @param string $rgb Encoded RGB value (4 bytes)
+     * @return array
+     */
+    private static function readRGB($rgb)
+    {
+        // offset: 0; size 1; Red component
+        $r = ord($rgb[0]);
+
+        // offset: 1; size: 1; Green component
+        $g = ord($rgb[1]);
+
+        // offset: 2; size: 1; Blue component
+        $b = ord($rgb[2]);
+
+        // HEX notation, e.g. 'FF00FC'
+        $rgb = sprintf('%02X%02X%02X', $r, $g, $b);
+
+        return array('rgb' => $rgb);
+    }
+
+
+    /**
+     * Read byte string (8-bit string length)
+     * OpenOffice documentation: 2.5.2
+     *
+     * @param string $subData
+     * @return array
+     */
+    private function readByteStringShort($subData)
+    {
+        // offset: 0; size: 1; length of the string (character count)
+        $ln = ord($subData[0]);
+
+        // offset: 1: size: var; character array (8-bit characters)
+        $value = $this->decodeCodepage(substr($subData, 1, $ln));
+
+        return array(
+            'value' => $value,
+            'size' => 1 + $ln, // size in bytes of data structure
+        );
+    }
+
+
+    /**
+     * Read byte string (16-bit string length)
+     * OpenOffice documentation: 2.5.2
+     *
+     * @param string $subData
+     * @return array
+     */
+    private function readByteStringLong($subData)
+    {
+        // offset: 0; size: 2; length of the string (character count)
+        $ln = self::getInt2d($subData, 0);
+
+        // offset: 2: size: var; character array (8-bit characters)
+        $value = $this->decodeCodepage(substr($subData, 2));
+
+        //return $string;
+        return array(
+            'value' => $value,
+            'size' => 2 + $ln, // size in bytes of data structure
+        );
+    }
+
+
+    /**
+     * Extracts an Excel Unicode short string (8-bit string length)
+     * OpenOffice documentation: 2.5.3
+     * function will automatically find out where the Unicode string ends.
+     *
+     * @param string $subData
+     * @return array
+     */
+    private static function readUnicodeStringShort($subData)
+    {
+        $value = '';
+
+        // offset: 0: size: 1; length of the string (character count)
+        $characterCount = ord($subData[0]);
+
+        $string = self::readUnicodeString(substr($subData, 1), $characterCount);
+
+        // add 1 for the string length
+        $string['size'] += 1;
+
+        return $string;
+    }
+
+
+    /**
+     * Extracts an Excel Unicode long string (16-bit string length)
+     * OpenOffice documentation: 2.5.3
+     * this function is under construction, needs to support rich text, and Asian phonetic settings
+     *
+     * @param string $subData
+     * @return array
+     */
+    private static function readUnicodeStringLong($subData)
+    {
+        $value = '';
+
+        // offset: 0: size: 2; length of the string (character count)
+        $characterCount = self::getInt2d($subData, 0);
+
+        $string = self::readUnicodeString(substr($subData, 2), $characterCount);
+
+        // add 2 for the string length
+        $string['size'] += 2;
+
+        return $string;
+    }
+
+
+    /**
+     * Read Unicode string with no string length field, but with known character count
+     * this function is under construction, needs to support rich text, and Asian phonetic settings
+     * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.3
+     *
+     * @param string $subData
+     * @param int $characterCount
+     * @return array
+     */
+    private static function readUnicodeString($subData, $characterCount)
+    {
+        $value = '';
+
+        // offset: 0: size: 1; option flags
+        // bit: 0; mask: 0x01; character compression (0 = compressed 8-bit, 1 = uncompressed 16-bit)
+        $isCompressed = !((0x01 & ord($subData[0])) >> 0);
+
+        // bit: 2; mask: 0x04; Asian phonetic settings
+        $hasAsian = (0x04) & ord($subData[0]) >> 2;
+
+        // bit: 3; mask: 0x08; Rich-Text settings
+        $hasRichText = (0x08) & ord($subData[0]) >> 3;
+
+        // offset: 1: size: var; character array
+        // this offset assumes richtext and Asian phonetic settings are off which is generally wrong
+        // needs to be fixed
+        $value = self::encodeUTF16(substr($subData, 1, $isCompressed ? $characterCount : 2 * $characterCount), $isCompressed);
+
+        return array(
+            'value' => $value,
+            'size' => $isCompressed ? 1 + $characterCount : 1 + 2 * $characterCount, // the size in bytes including the option flags
+        );
+    }
+
+
+    /**
+     * Convert UTF-8 string to string surounded by double quotes. Used for explicit string tokens in formulas.
+     * Example:  hello"world  -->  "hello""world"
+     *
+     * @param string $value UTF-8 encoded string
+     * @return string
+     */
+    private static function UTF8toExcelDoubleQuoted($value)
+    {
+        return '"' . str_replace('"', '""', $value) . '"';
+    }
+
+
+    /**
+     * Reads first 8 bytes of a string and return IEEE 754 float
+     *
+     * @param string $data Binary string that is at least 8 bytes long
+     * @return float
+     */
+    private static function extractNumber($data)
+    {
+        $rknumhigh = self::getInt4d($data, 4);
+        $rknumlow = self::getInt4d($data, 0);
+        $sign = ($rknumhigh & 0x80000000) >> 31;
+        $exp = (($rknumhigh & 0x7ff00000) >> 20) - 1023;
+        $mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
+        $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
+        $mantissalow2 = ($rknumlow & 0x7fffffff);
+        $value = $mantissa / pow(2, (20 - $exp));
+
+        if ($mantissalow1 != 0) {
+            $value += 1 / pow(2, (21 - $exp));
+        }
+
+        $value += $mantissalow2 / pow(2, (52 - $exp));
+        if ($sign) {
+            $value *= -1;
+        }
+
+        return $value;
+    }
+
+
+    private static function getIEEE754($rknum)
+    {
+        if (($rknum & 0x02) != 0) {
+            $value = $rknum >> 2;
+        } else {
+            // changes by mmp, info on IEEE754 encoding from
+            // research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html
+            // The RK format calls for using only the most significant 30 bits
+            // of the 64 bit floating point value. The other 34 bits are assumed
+            // to be 0 so we use the upper 30 bits of $rknum as follows...
+            $sign = ($rknum & 0x80000000) >> 31;
+            $exp = ($rknum & 0x7ff00000) >> 20;
+            $mantissa = (0x100000 | ($rknum & 0x000ffffc));
+            $value = $mantissa / pow(2, (20- ($exp - 1023)));
+            if ($sign) {
+                $value = -1 * $value;
+            }
+            //end of changes by mmp
+        }
+        if (($rknum & 0x01) != 0) {
+            $value /= 100;
+        }
+        return $value;
+    }
+
+
+    /**
+     * Get UTF-8 string from (compressed or uncompressed) UTF-16 string
+     *
+     * @param string $string
+     * @param bool $compressed
+     * @return string
+     */
+    private static function encodeUTF16($string, $compressed = '')
+    {
+        if ($compressed) {
+            $string = self::uncompressByteString($string);
+        }
+
+        return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', 'UTF-16LE');
+    }
+
+    /**
+     * Convert UTF-16 string in compressed notation to uncompressed form. Only used for BIFF8.
+     *
+     * @param string $string
+     * @return string
+     */
+    private static function uncompressByteString($string)
+    {
+        $uncompressedString = '';
+        $strLen = strlen($string);
+        for ($i = 0; $i < $strLen; ++$i) {
+            $uncompressedString .= $string[$i] . "\0";
+        }
+
+        return $uncompressedString;
+    }
+
+    /**
+     * Convert string to UTF-8. Only used for BIFF5.
+     *
+     * @param string $string
+     * @return string
+     */
+    private function decodeCodepage($string)
+    {
+        return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $this->codepage);
+    }
+
+    /**
+     * Read 16-bit unsigned integer
+     *
+     * @param string $data
+     * @param int $pos
+     * @return int
+     */
+    public static function getInt2d($data, $pos)
+    {
+        return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
+    }
+
+    /**
+     * Read 32-bit signed integer
+     *
+     * @param string $data
+     * @param int $pos
+     * @return int
+     */
+    public static function getInt4d($data, $pos)
+    {
+        // FIX: represent numbers correctly on 64-bit system
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
+        // Hacked by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
+        $_or_24 = ord($data[$pos + 3]);
+        if ($_or_24 >= 128) {
+            // negative number
+            $_ord_24 = -abs((256 - $_or_24) << 24);
+        } else {
+            $_ord_24 = ($_or_24 & 127) << 24;
+        }
+        return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
+    }
+
+    private function parseRichText($is = '')
+    {
+        $value = new PHPExcel_RichText();
+        $value->createText($is);
+
+        return $value;
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel5/Color.php b/lib/PHPExcel/Reader/Excel5/Color.php
new file mode 100644
index 000000000..1801df5e5
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Color.php
@@ -0,0 +1,32 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color
+{
+    /**
+     * Read color
+     *
+     * @param int $color Indexed color
+     * @param array $palette Color palette
+     * @return array RGB color value, example: array('rgb' => 'FF0000')
+     */
+    public static function map($color, $palette, $version)
+    {
+        if ($color <= 0x07 || $color >= 0x40) {
+            // special built-in color
+            return PHPExcel_Reader_Excel5_Color_BuiltIn::lookup($color);
+        } elseif (isset($palette) && isset($palette[$color - 8])) {
+            // palette color, color index 0x08 maps to pallete index 0
+            return $palette[$color - 8];
+        } else {
+            // default color table
+            if ($version == PHPExcel_Reader_Excel5::XLS_BIFF8) {
+                return PHPExcel_Reader_Excel5_Color_BIFF8::lookup($color);
+            } else {
+                // BIFF5
+                return PHPExcel_Reader_Excel5_Color_BIFF5::lookup($color);
+            }
+        }
+
+        return $color;
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Excel5/Color/BIFF5.php b/lib/PHPExcel/Reader/Excel5/Color/BIFF5.php
new file mode 100644
index 000000000..159c27fc7
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Color/BIFF5.php
@@ -0,0 +1,77 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color_BIFF5
+{
+    protected static $map = array(
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '8080FF',
+        0x19 => '802060',
+        0x1A => 'FFFFC0',
+        0x1B => 'A0E0F0',
+        0x1C => '600080',
+        0x1D => 'FF8080',
+        0x1E => '0080C0',
+        0x1F => 'C0C0FF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CFFF',
+        0x29 => '69FFFF',
+        0x2A => 'E0FFE0',
+        0x2B => 'FFFF80',
+        0x2C => 'A6CAF0',
+        0x2D => 'DD9CB3',
+        0x2E => 'B38FEE',
+        0x2F => 'E3E3E3',
+        0x30 => '2A6FF9',
+        0x31 => '3FB8CD',
+        0x32 => '488436',
+        0x33 => '958C41',
+        0x34 => '8E5E42',
+        0x35 => 'A0627A',
+        0x36 => '624FAC',
+        0x37 => '969696',
+        0x38 => '1D2FBE',
+        0x39 => '286676',
+        0x3A => '004500',
+        0x3B => '453E01',
+        0x3C => '6A2813',
+        0x3D => '85396A',
+        0x3E => '4A3285',
+        0x3F => '424242',
+    );
+
+    /**
+     * Map color array from BIFF5 built-in color index
+     *
+     * @param int $color
+     * @return array
+     */
+    public static function lookup($color)
+    {
+        if (isset(self::$map[$color])) {
+            return array('rgb' => self::$map[$color]);
+        }
+        return array('rgb' => '000000');
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Excel5/Color/BIFF8.php b/lib/PHPExcel/Reader/Excel5/Color/BIFF8.php
new file mode 100644
index 000000000..4d3f2d0a3
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Color/BIFF8.php
@@ -0,0 +1,77 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color_BIFF8
+{
+    protected static $map = array(
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '9999FF',
+        0x19 => '993366',
+        0x1A => 'FFFFCC',
+        0x1B => 'CCFFFF',
+        0x1C => '660066',
+        0x1D => 'FF8080',
+        0x1E => '0066CC',
+        0x1F => 'CCCCFF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CCFF',
+        0x29 => 'CCFFFF',
+        0x2A => 'CCFFCC',
+        0x2B => 'FFFF99',
+        0x2C => '99CCFF',
+        0x2D => 'FF99CC',
+        0x2E => 'CC99FF',
+        0x2F => 'FFCC99',
+        0x30 => '3366FF',
+        0x31 => '33CCCC',
+        0x32 => '99CC00',
+        0x33 => 'FFCC00',
+        0x34 => 'FF9900',
+        0x35 => 'FF6600',
+        0x36 => '666699',
+        0x37 => '969696',
+        0x38 => '003366',
+        0x39 => '339966',
+        0x3A => '003300',
+        0x3B => '333300',
+        0x3C => '993300',
+        0x3D => '993366',
+        0x3E => '333399',
+        0x3F => '333333',
+    );
+
+   /**
+     * Map color array from BIFF8 built-in color index
+     *
+     * @param int $color
+     * @return array
+     */
+    public static function lookup($color)
+    {
+        if (isset(self::$map[$color])) {
+            return array('rgb' => self::$map[$color]);
+        }
+        return array('rgb' => '000000');
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Excel5/Color/BuiltIn.php b/lib/PHPExcel/Reader/Excel5/Color/BuiltIn.php
new file mode 100644
index 000000000..a5b7e59b8
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Color/BuiltIn.php
@@ -0,0 +1,31 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color_BuiltIn
+{
+    protected static $map = array(
+        0x00 => '000000',
+        0x01 => 'FFFFFF',
+        0x02 => 'FF0000',
+        0x03 => '00FF00',
+        0x04 => '0000FF',
+        0x05 => 'FFFF00',
+        0x06 => 'FF00FF',
+        0x07 => '00FFFF',
+        0x40 => '000000', // system window text color
+        0x41 => 'FFFFFF', // system window background color
+    );
+
+    /**
+     * Map built-in color to RGB value
+     *
+     * @param int $color Indexed color
+     * @return array
+     */
+    public static function lookup($color)
+    {
+        if (isset(self::$map[$color])) {
+            return array('rgb' => self::$map[$color]);
+        }
+        return array('rgb' => '000000');
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Excel5/ErrorCode.php b/lib/PHPExcel/Reader/Excel5/ErrorCode.php
new file mode 100644
index 000000000..f1d1cb6d8
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/ErrorCode.php
@@ -0,0 +1,28 @@
+<?php
+
+class PHPExcel_Reader_Excel5_ErrorCode
+{
+    protected static $map = array(
+        0x00 => '#NULL!',
+        0x07 => '#DIV/0!',
+        0x0F => '#VALUE!',
+        0x17 => '#REF!',
+        0x1D => '#NAME?',
+        0x24 => '#NUM!',
+        0x2A => '#N/A',
+    );
+
+    /**
+     * Map error code, e.g. '#N/A'
+     *
+     * @param int $code
+     * @return string
+     */
+    public static function lookup($code)
+    {
+        if (isset(self::$map[$code])) {
+            return self::$map[$code];
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Excel5/Escher.php b/lib/PHPExcel/Reader/Excel5/Escher.php
new file mode 100644
index 000000000..2b99e2223
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Escher.php
@@ -0,0 +1,669 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Excel5_Escher
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Excel5_Escher
+{
+    const DGGCONTAINER      = 0xF000;
+    const BSTORECONTAINER   = 0xF001;
+    const DGCONTAINER       = 0xF002;
+    const SPGRCONTAINER     = 0xF003;
+    const SPCONTAINER       = 0xF004;
+    const DGG               = 0xF006;
+    const BSE               = 0xF007;
+    const DG                = 0xF008;
+    const SPGR              = 0xF009;
+    const SP                = 0xF00A;
+    const OPT               = 0xF00B;
+    const CLIENTTEXTBOX     = 0xF00D;
+    const CLIENTANCHOR      = 0xF010;
+    const CLIENTDATA        = 0xF011;
+    const BLIPJPEG          = 0xF01D;
+    const BLIPPNG           = 0xF01E;
+    const SPLITMENUCOLORS   = 0xF11E;
+    const TERTIARYOPT       = 0xF122;
+
+    /**
+     * Escher stream data (binary)
+     *
+     * @var string
+     */
+    private $data;
+
+    /**
+     * Size in bytes of the Escher stream data
+     *
+     * @var int
+     */
+    private $dataSize;
+
+    /**
+     * Current position of stream pointer in Escher stream data
+     *
+     * @var int
+     */
+    private $pos;
+
+    /**
+     * The object to be returned by the reader. Modified during load.
+     *
+     * @var mixed
+     */
+    private $object;
+
+    /**
+     * Create a new PHPExcel_Reader_Excel5_Escher instance
+     *
+     * @param mixed $object
+     */
+    public function __construct($object)
+    {
+        $this->object = $object;
+    }
+
+    /**
+     * Load Escher stream data. May be a partial Escher stream.
+     *
+     * @param string $data
+     */
+    public function load($data)
+    {
+        $this->data = $data;
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        $this->pos = 0;
+
+        // Parse Escher stream
+        while ($this->pos < $this->dataSize) {
+            // offset: 2; size: 2: Record Type
+            $fbt = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos + 2);
+
+            switch ($fbt) {
+                case self::DGGCONTAINER:
+                    $this->readDggContainer();
+                    break;
+                case self::DGG:
+                    $this->readDgg();
+                    break;
+                case self::BSTORECONTAINER:
+                    $this->readBstoreContainer();
+                    break;
+                case self::BSE:
+                    $this->readBSE();
+                    break;
+                case self::BLIPJPEG:
+                    $this->readBlipJPEG();
+                    break;
+                case self::BLIPPNG:
+                    $this->readBlipPNG();
+                    break;
+                case self::OPT:
+                    $this->readOPT();
+                    break;
+                case self::TERTIARYOPT:
+                    $this->readTertiaryOPT();
+                    break;
+                case self::SPLITMENUCOLORS:
+                    $this->readSplitMenuColors();
+                    break;
+                case self::DGCONTAINER:
+                    $this->readDgContainer();
+                    break;
+                case self::DG:
+                    $this->readDg();
+                    break;
+                case self::SPGRCONTAINER:
+                    $this->readSpgrContainer();
+                    break;
+                case self::SPCONTAINER:
+                    $this->readSpContainer();
+                    break;
+                case self::SPGR:
+                    $this->readSpgr();
+                    break;
+                case self::SP:
+                    $this->readSp();
+                    break;
+                case self::CLIENTTEXTBOX:
+                    $this->readClientTextbox();
+                    break;
+                case self::CLIENTANCHOR:
+                    $this->readClientAnchor();
+                    break;
+                case self::CLIENTDATA:
+                    $this->readClientData();
+                    break;
+                default:
+                    $this->readDefault();
+                    break;
+            }
+        }
+
+        return $this->object;
+    }
+
+    /**
+     * Read a generic record
+     */
+    private function readDefault()
+    {
+        // offset 0; size: 2; recVer and recInstance
+        $verInstance = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos);
+
+        // offset: 2; size: 2: Record Type
+        $fbt = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos + 2);
+
+        // bit: 0-3; mask: 0x000F; recVer
+        $recVer = (0x000F & $verInstance) >> 0;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read DggContainer record (Drawing Group Container)
+     */
+    private function readDggContainer()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $dggContainer = new PHPExcel_Shared_Escher_DggContainer();
+        $this->object->setDggContainer($dggContainer);
+        $reader = new PHPExcel_Reader_Excel5_Escher($dggContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read Dgg record (Drawing Group)
+     */
+    private function readDgg()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read BstoreContainer record (Blip Store Container)
+     */
+    private function readBstoreContainer()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
+        $this->object->setBstoreContainer($bstoreContainer);
+        $reader = new PHPExcel_Reader_Excel5_Escher($bstoreContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read BSE record
+     */
+    private function readBSE()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // add BSE to BstoreContainer
+        $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
+        $this->object->addBSE($BSE);
+
+        $BSE->setBLIPType($recInstance);
+
+        // offset: 0; size: 1; btWin32 (MSOBLIPTYPE)
+        $btWin32 = ord($recordData[0]);
+
+        // offset: 1; size: 1; btWin32 (MSOBLIPTYPE)
+        $btMacOS = ord($recordData[1]);
+
+        // offset: 2; size: 16; MD4 digest
+        $rgbUid = substr($recordData, 2, 16);
+
+        // offset: 18; size: 2; tag
+        $tag = PHPExcel_Reader_Excel5::getInt2d($recordData, 18);
+
+        // offset: 20; size: 4; size of BLIP in bytes
+        $size = PHPExcel_Reader_Excel5::getInt4d($recordData, 20);
+
+        // offset: 24; size: 4; number of references to this BLIP
+        $cRef = PHPExcel_Reader_Excel5::getInt4d($recordData, 24);
+
+        // offset: 28; size: 4; MSOFO file offset
+        $foDelay = PHPExcel_Reader_Excel5::getInt4d($recordData, 28);
+
+        // offset: 32; size: 1; unused1
+        $unused1 = ord($recordData{32});
+
+        // offset: 33; size: 1; size of nameData in bytes (including null terminator)
+        $cbName = ord($recordData{33});
+
+        // offset: 34; size: 1; unused2
+        $unused2 = ord($recordData{34});
+
+        // offset: 35; size: 1; unused3
+        $unused3 = ord($recordData{35});
+
+        // offset: 36; size: $cbName; nameData
+        $nameData = substr($recordData, 36, $cbName);
+
+        // offset: 36 + $cbName, size: var; the BLIP data
+        $blipData = substr($recordData, 36 + $cbName);
+
+        // record is a container, read contents
+        $reader = new PHPExcel_Reader_Excel5_Escher($BSE);
+        $reader->load($blipData);
+    }
+
+    /**
+     * Read BlipJPEG record. Holds raw JPEG image data
+     */
+    private function readBlipJPEG()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        $pos = 0;
+
+        // offset: 0; size: 16; rgbUid1 (MD4 digest of)
+        $rgbUid1 = substr($recordData, 0, 16);
+        $pos += 16;
+
+        // offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
+        if (in_array($recInstance, array(0x046B, 0x06E3))) {
+            $rgbUid2 = substr($recordData, 16, 16);
+            $pos += 16;
+        }
+
+        // offset: var; size: 1; tag
+        $tag = ord($recordData{$pos});
+        $pos += 1;
+
+        // offset: var; size: var; the raw image data
+        $data = substr($recordData, $pos);
+
+        $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
+        $blip->setData($data);
+
+        $this->object->setBlip($blip);
+    }
+
+    /**
+     * Read BlipPNG record. Holds raw PNG image data
+     */
+    private function readBlipPNG()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        $pos = 0;
+
+        // offset: 0; size: 16; rgbUid1 (MD4 digest of)
+        $rgbUid1 = substr($recordData, 0, 16);
+        $pos += 16;
+
+        // offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
+        if ($recInstance == 0x06E1) {
+            $rgbUid2 = substr($recordData, 16, 16);
+            $pos += 16;
+        }
+
+        // offset: var; size: 1; tag
+        $tag = ord($recordData{$pos});
+        $pos += 1;
+
+        // offset: var; size: var; the raw image data
+        $data = substr($recordData, $pos);
+
+        $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
+        $blip->setData($data);
+
+        $this->object->setBlip($blip);
+    }
+
+    /**
+     * Read OPT record. This record may occur within DggContainer record or SpContainer
+     */
+    private function readOPT()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        $this->readOfficeArtRGFOPTE($recordData, $recInstance);
+    }
+
+    /**
+     * Read TertiaryOPT record
+     */
+    private function readTertiaryOPT()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read SplitMenuColors record
+     */
+    private function readSplitMenuColors()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read DgContainer record (Drawing Container)
+     */
+    private function readDgContainer()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $dgContainer = new PHPExcel_Shared_Escher_DgContainer();
+        $this->object->setDgContainer($dgContainer);
+        $reader = new PHPExcel_Reader_Excel5_Escher($dgContainer);
+        $escher = $reader->load($recordData);
+    }
+
+    /**
+     * Read Dg record (Drawing)
+     */
+    private function readDg()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read SpgrContainer record (Shape Group Container)
+     */
+    private function readSpgrContainer()
+    {
+        // context is either context DgContainer or SpgrContainer
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
+
+        if ($this->object instanceof PHPExcel_Shared_Escher_DgContainer) {
+            // DgContainer
+            $this->object->setSpgrContainer($spgrContainer);
+        } else {
+            // SpgrContainer
+            $this->object->addChild($spgrContainer);
+        }
+
+        $reader = new PHPExcel_Reader_Excel5_Escher($spgrContainer);
+        $escher = $reader->load($recordData);
+    }
+
+    /**
+     * Read SpContainer record (Shape Container)
+     */
+    private function readSpContainer()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // add spContainer to spgrContainer
+        $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+        $this->object->addChild($spContainer);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $reader = new PHPExcel_Reader_Excel5_Escher($spContainer);
+        $escher = $reader->load($recordData);
+    }
+
+    /**
+     * Read Spgr record (Shape Group)
+     */
+    private function readSpgr()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read Sp record (Shape)
+     */
+    private function readSp()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read ClientTextbox record
+     */
+    private function readClientTextbox()
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
+
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read ClientAnchor record. This record holds information about where the shape is anchored in worksheet
+     */
+    private function readClientAnchor()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // offset: 2; size: 2; upper-left corner column index (0-based)
+        $c1 = PHPExcel_Reader_Excel5::getInt2d($recordData, 2);
+
+        // offset: 4; size: 2; upper-left corner horizontal offset in 1/1024 of column width
+        $startOffsetX = PHPExcel_Reader_Excel5::getInt2d($recordData, 4);
+
+        // offset: 6; size: 2; upper-left corner row index (0-based)
+        $r1 = PHPExcel_Reader_Excel5::getInt2d($recordData, 6);
+
+        // offset: 8; size: 2; upper-left corner vertical offset in 1/256 of row height
+        $startOffsetY = PHPExcel_Reader_Excel5::getInt2d($recordData, 8);
+
+        // offset: 10; size: 2; bottom-right corner column index (0-based)
+        $c2 = PHPExcel_Reader_Excel5::getInt2d($recordData, 10);
+
+        // offset: 12; size: 2; bottom-right corner horizontal offset in 1/1024 of column width
+        $endOffsetX = PHPExcel_Reader_Excel5::getInt2d($recordData, 12);
+
+        // offset: 14; size: 2; bottom-right corner row index (0-based)
+        $r2 = PHPExcel_Reader_Excel5::getInt2d($recordData, 14);
+
+        // offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height
+        $endOffsetY = PHPExcel_Reader_Excel5::getInt2d($recordData, 16);
+
+        // set the start coordinates
+        $this->object->setStartCoordinates(PHPExcel_Cell::stringFromColumnIndex($c1) . ($r1 + 1));
+
+        // set the start offsetX
+        $this->object->setStartOffsetX($startOffsetX);
+
+        // set the start offsetY
+        $this->object->setStartOffsetY($startOffsetY);
+
+        // set the end coordinates
+        $this->object->setEndCoordinates(PHPExcel_Cell::stringFromColumnIndex($c2) . ($r2 + 1));
+
+        // set the end offsetX
+        $this->object->setEndOffsetX($endOffsetX);
+
+        // set the end offsetY
+        $this->object->setEndOffsetY($endOffsetY);
+    }
+
+    /**
+     * Read ClientData record
+     */
+    private function readClientData()
+    {
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read OfficeArtRGFOPTE table of property-value pairs
+     *
+     * @param string $data Binary data
+     * @param int $n Number of properties
+     */
+    private function readOfficeArtRGFOPTE($data, $n)
+    {
+        $splicedComplexData = substr($data, 6 * $n);
+
+        // loop through property-value pairs
+        for ($i = 0; $i < $n; ++$i) {
+            // read 6 bytes at a time
+            $fopte = substr($data, 6 * $i, 6);
+
+            // offset: 0; size: 2; opid
+            $opid = PHPExcel_Reader_Excel5::getInt2d($fopte, 0);
+
+            // bit: 0-13; mask: 0x3FFF; opid.opid
+            $opidOpid = (0x3FFF & $opid) >> 0;
+
+            // bit: 14; mask 0x4000; 1 = value in op field is BLIP identifier
+            $opidFBid = (0x4000 & $opid) >> 14;
+
+            // bit: 15; mask 0x8000; 1 = this is a complex property, op field specifies size of complex data
+            $opidFComplex = (0x8000 & $opid) >> 15;
+
+            // offset: 2; size: 4; the value for this property
+            $op = PHPExcel_Reader_Excel5::getInt4d($fopte, 2);
+
+            if ($opidFComplex) {
+                $complexData = substr($splicedComplexData, 0, $op);
+                $splicedComplexData = substr($splicedComplexData, $op);
+
+                // we store string value with complex data
+                $value = $complexData;
+            } else {
+                // we store integer value
+                $value = $op;
+            }
+
+            $this->object->setOPT($opidOpid, $value);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel5/MD5.php b/lib/PHPExcel/Reader/Excel5/MD5.php
new file mode 100644
index 000000000..f14ea9469
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/MD5.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Excel5_MD5
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt        LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Excel5_MD5
+{
+    // Context
+    private $a;
+    private $b;
+    private $c;
+    private $d;
+
+    /**
+     * MD5 stream constructor
+     */
+    public function __construct()
+    {
+        $this->reset();
+    }
+
+    /**
+     * Reset the MD5 stream context
+     */
+    public function reset()
+    {
+        $this->a = 0x67452301;
+        $this->b = 0xEFCDAB89;
+        $this->c = 0x98BADCFE;
+        $this->d = 0x10325476;
+    }
+
+    /**
+     * Get MD5 stream context
+     *
+     * @return string
+     */
+    public function getContext()
+    {
+        $s = '';
+        foreach (array('a', 'b', 'c', 'd') as $i) {
+            $v = $this->{$i};
+            $s .= chr($v & 0xff);
+            $s .= chr(($v >> 8) & 0xff);
+            $s .= chr(($v >> 16) & 0xff);
+            $s .= chr(($v >> 24) & 0xff);
+        }
+
+        return $s;
+    }
+
+    /**
+     * Add data to context
+     *
+     * @param string $data Data to add
+     */
+    public function add($data)
+    {
+        $words = array_values(unpack('V16', $data));
+
+        $A = $this->a;
+        $B = $this->b;
+        $C = $this->c;
+        $D = $this->d;
+
+        $F = array('PHPExcel_Reader_Excel5_MD5','f');
+        $G = array('PHPExcel_Reader_Excel5_MD5','g');
+        $H = array('PHPExcel_Reader_Excel5_MD5','h');
+        $I = array('PHPExcel_Reader_Excel5_MD5','i');
+
+        /* ROUND 1 */
+        self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478);
+        self::step($F, $D, $A, $B, $C, $words[1], 12, 0xe8c7b756);
+        self::step($F, $C, $D, $A, $B, $words[2], 17, 0x242070db);
+        self::step($F, $B, $C, $D, $A, $words[3], 22, 0xc1bdceee);
+        self::step($F, $A, $B, $C, $D, $words[4], 7, 0xf57c0faf);
+        self::step($F, $D, $A, $B, $C, $words[5], 12, 0x4787c62a);
+        self::step($F, $C, $D, $A, $B, $words[6], 17, 0xa8304613);
+        self::step($F, $B, $C, $D, $A, $words[7], 22, 0xfd469501);
+        self::step($F, $A, $B, $C, $D, $words[8], 7, 0x698098d8);
+        self::step($F, $D, $A, $B, $C, $words[9], 12, 0x8b44f7af);
+        self::step($F, $C, $D, $A, $B, $words[10], 17, 0xffff5bb1);
+        self::step($F, $B, $C, $D, $A, $words[11], 22, 0x895cd7be);
+        self::step($F, $A, $B, $C, $D, $words[12], 7, 0x6b901122);
+        self::step($F, $D, $A, $B, $C, $words[13], 12, 0xfd987193);
+        self::step($F, $C, $D, $A, $B, $words[14], 17, 0xa679438e);
+        self::step($F, $B, $C, $D, $A, $words[15], 22, 0x49b40821);
+
+        /* ROUND 2 */
+        self::step($G, $A, $B, $C, $D, $words[1], 5, 0xf61e2562);
+        self::step($G, $D, $A, $B, $C, $words[6], 9, 0xc040b340);
+        self::step($G, $C, $D, $A, $B, $words[11], 14, 0x265e5a51);
+        self::step($G, $B, $C, $D, $A, $words[0], 20, 0xe9b6c7aa);
+        self::step($G, $A, $B, $C, $D, $words[5], 5, 0xd62f105d);
+        self::step($G, $D, $A, $B, $C, $words[10], 9, 0x02441453);
+        self::step($G, $C, $D, $A, $B, $words[15], 14, 0xd8a1e681);
+        self::step($G, $B, $C, $D, $A, $words[4], 20, 0xe7d3fbc8);
+        self::step($G, $A, $B, $C, $D, $words[9], 5, 0x21e1cde6);
+        self::step($G, $D, $A, $B, $C, $words[14], 9, 0xc33707d6);
+        self::step($G, $C, $D, $A, $B, $words[3], 14, 0xf4d50d87);
+        self::step($G, $B, $C, $D, $A, $words[8], 20, 0x455a14ed);
+        self::step($G, $A, $B, $C, $D, $words[13], 5, 0xa9e3e905);
+        self::step($G, $D, $A, $B, $C, $words[2], 9, 0xfcefa3f8);
+        self::step($G, $C, $D, $A, $B, $words[7], 14, 0x676f02d9);
+        self::step($G, $B, $C, $D, $A, $words[12], 20, 0x8d2a4c8a);
+
+        /* ROUND 3 */
+        self::step($H, $A, $B, $C, $D, $words[5], 4, 0xfffa3942);
+        self::step($H, $D, $A, $B, $C, $words[8], 11, 0x8771f681);
+        self::step($H, $C, $D, $A, $B, $words[11], 16, 0x6d9d6122);
+        self::step($H, $B, $C, $D, $A, $words[14], 23, 0xfde5380c);
+        self::step($H, $A, $B, $C, $D, $words[1], 4, 0xa4beea44);
+        self::step($H, $D, $A, $B, $C, $words[4], 11, 0x4bdecfa9);
+        self::step($H, $C, $D, $A, $B, $words[7], 16, 0xf6bb4b60);
+        self::step($H, $B, $C, $D, $A, $words[10], 23, 0xbebfbc70);
+        self::step($H, $A, $B, $C, $D, $words[13], 4, 0x289b7ec6);
+        self::step($H, $D, $A, $B, $C, $words[0], 11, 0xeaa127fa);
+        self::step($H, $C, $D, $A, $B, $words[3], 16, 0xd4ef3085);
+        self::step($H, $B, $C, $D, $A, $words[6], 23, 0x04881d05);
+        self::step($H, $A, $B, $C, $D, $words[9], 4, 0xd9d4d039);
+        self::step($H, $D, $A, $B, $C, $words[12], 11, 0xe6db99e5);
+        self::step($H, $C, $D, $A, $B, $words[15], 16, 0x1fa27cf8);
+        self::step($H, $B, $C, $D, $A, $words[2], 23, 0xc4ac5665);
+
+        /* ROUND 4 */
+        self::step($I, $A, $B, $C, $D, $words[0], 6, 0xf4292244);
+        self::step($I, $D, $A, $B, $C, $words[7], 10, 0x432aff97);
+        self::step($I, $C, $D, $A, $B, $words[14], 15, 0xab9423a7);
+        self::step($I, $B, $C, $D, $A, $words[5], 21, 0xfc93a039);
+        self::step($I, $A, $B, $C, $D, $words[12], 6, 0x655b59c3);
+        self::step($I, $D, $A, $B, $C, $words[3], 10, 0x8f0ccc92);
+        self::step($I, $C, $D, $A, $B, $words[10], 15, 0xffeff47d);
+        self::step($I, $B, $C, $D, $A, $words[1], 21, 0x85845dd1);
+        self::step($I, $A, $B, $C, $D, $words[8], 6, 0x6fa87e4f);
+        self::step($I, $D, $A, $B, $C, $words[15], 10, 0xfe2ce6e0);
+        self::step($I, $C, $D, $A, $B, $words[6], 15, 0xa3014314);
+        self::step($I, $B, $C, $D, $A, $words[13], 21, 0x4e0811a1);
+        self::step($I, $A, $B, $C, $D, $words[4], 6, 0xf7537e82);
+        self::step($I, $D, $A, $B, $C, $words[11], 10, 0xbd3af235);
+        self::step($I, $C, $D, $A, $B, $words[2], 15, 0x2ad7d2bb);
+        self::step($I, $B, $C, $D, $A, $words[9], 21, 0xeb86d391);
+
+        $this->a = ($this->a + $A) & 0xffffffff;
+        $this->b = ($this->b + $B) & 0xffffffff;
+        $this->c = ($this->c + $C) & 0xffffffff;
+        $this->d = ($this->d + $D) & 0xffffffff;
+    }
+
+    private static function f($X, $Y, $Z)
+    {
+        return (($X & $Y) | ((~ $X) & $Z)); // X AND Y OR NOT X AND Z
+    }
+
+    private static function g($X, $Y, $Z)
+    {
+        return (($X & $Z) | ($Y & (~ $Z))); // X AND Z OR Y AND NOT Z
+    }
+
+    private static function h($X, $Y, $Z)
+    {
+        return ($X ^ $Y ^ $Z); // X XOR Y XOR Z
+    }
+
+    private static function i($X, $Y, $Z)
+    {
+        return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
+    }
+
+    private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
+    {
+        $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;
+        $A = self::rotate($A, $s);
+        $A = ($B + $A) & 0xffffffff;
+    }
+
+    private static function rotate($decimal, $bits)
+    {
+        $binary = str_pad(decbin($decimal), 32, "0", STR_PAD_LEFT);
+        return bindec(substr($binary, $bits).substr($binary, 0, $bits));
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel5/RC4.php b/lib/PHPExcel/Reader/Excel5/RC4.php
new file mode 100644
index 000000000..5640539cb
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/RC4.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Excel5_RC4
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Excel5_RC4
+{
+    // Context
+    protected $s = array();
+    protected $i = 0;
+    protected $j = 0;
+
+    /**
+     * RC4 stream decryption/encryption constrcutor
+     *
+     * @param string $key Encryption key/passphrase
+     */
+    public function __construct($key)
+    {
+        $len = strlen($key);
+
+        for ($this->i = 0; $this->i < 256; $this->i++) {
+            $this->s[$this->i] = $this->i;
+        }
+
+        $this->j = 0;
+        for ($this->i = 0; $this->i < 256; $this->i++) {
+            $this->j = ($this->j + $this->s[$this->i] + ord($key[$this->i % $len])) % 256;
+            $t = $this->s[$this->i];
+            $this->s[$this->i] = $this->s[$this->j];
+            $this->s[$this->j] = $t;
+        }
+        $this->i = $this->j = 0;
+    }
+
+    /**
+     * Symmetric decryption/encryption function
+     *
+     * @param string $data Data to encrypt/decrypt
+     *
+     * @return string
+     */
+    public function RC4($data)
+    {
+        $len = strlen($data);
+        for ($c = 0; $c < $len; $c++) {
+            $this->i = ($this->i + 1) % 256;
+            $this->j = ($this->j + $this->s[$this->i]) % 256;
+            $t = $this->s[$this->i];
+            $this->s[$this->i] = $this->s[$this->j];
+            $this->s[$this->j] = $t;
+
+            $t = ($this->s[$this->i] + $this->s[$this->j]) % 256;
+
+            $data[$c] = chr(ord($data[$c]) ^ $this->s[$t]);
+        }
+        return $data;
+    }
+}
diff --git a/lib/PHPExcel/Reader/Excel5/Style/Border.php b/lib/PHPExcel/Reader/Excel5/Style/Border.php
new file mode 100644
index 000000000..fb45b9d5b
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Style/Border.php
@@ -0,0 +1,36 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Style_Border
+{
+    protected static $map = array(
+        0x00 => PHPExcel_Style_Border::BORDER_NONE,
+        0x01 => PHPExcel_Style_Border::BORDER_THIN,
+        0x02 => PHPExcel_Style_Border::BORDER_MEDIUM,
+        0x03 => PHPExcel_Style_Border::BORDER_DASHED,
+        0x04 => PHPExcel_Style_Border::BORDER_DOTTED,
+        0x05 => PHPExcel_Style_Border::BORDER_THICK,
+        0x06 => PHPExcel_Style_Border::BORDER_DOUBLE,
+        0x07 => PHPExcel_Style_Border::BORDER_HAIR,
+        0x08 => PHPExcel_Style_Border::BORDER_MEDIUMDASHED,
+        0x09 => PHPExcel_Style_Border::BORDER_DASHDOT,
+        0x0A => PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT,
+        0x0B => PHPExcel_Style_Border::BORDER_DASHDOTDOT,
+        0x0C => PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT,
+        0x0D => PHPExcel_Style_Border::BORDER_SLANTDASHDOT,
+    );
+
+    /**
+     * Map border style
+     * OpenOffice documentation: 2.5.11
+     *
+     * @param int $index
+     * @return string
+     */
+    public static function lookup($index)
+    {
+        if (isset(self::$map[$index])) {
+            return self::$map[$index];
+        }
+        return PHPExcel_Style_Border::BORDER_NONE;
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Excel5/Style/FillPattern.php b/lib/PHPExcel/Reader/Excel5/Style/FillPattern.php
new file mode 100644
index 000000000..c92d19a69
--- /dev/null
+++ b/lib/PHPExcel/Reader/Excel5/Style/FillPattern.php
@@ -0,0 +1,41 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Style_FillPattern
+{
+    protected static $map = array(
+        0x00 => PHPExcel_Style_Fill::FILL_NONE,
+        0x01 => PHPExcel_Style_Fill::FILL_SOLID,
+        0x02 => PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY,
+        0x03 => PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY,
+        0x04 => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY,
+        0x05 => PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL,
+        0x06 => PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL,
+        0x07 => PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN,
+        0x08 => PHPExcel_Style_Fill::FILL_PATTERN_DARKUP,
+        0x09 => PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID,
+        0x0A => PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS,
+        0x0B => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+        0x0C => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL,
+        0x0D => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN,
+        0x0E => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP,
+        0x0F => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID,
+        0x10 => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS,
+        0x11 => PHPExcel_Style_Fill::FILL_PATTERN_GRAY125,
+        0x12 => PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625,
+    );
+
+    /**
+     * Get fill pattern from index
+     * OpenOffice documentation: 2.5.12
+     *
+     * @param int $index
+     * @return string
+     */
+    public static function lookup($index)
+    {
+        if (isset(self::$map[$index])) {
+            return self::$map[$index];
+        }
+        return PHPExcel_Style_Fill::FILL_NONE;
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPExcel/Reader/Exception.php b/lib/PHPExcel/Reader/Exception.php
new file mode 100644
index 000000000..48b3f8253
--- /dev/null
+++ b/lib/PHPExcel/Reader/Exception.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Exception
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Exception extends PHPExcel_Exception
+{
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
+}
diff --git a/lib/PHPExcel/Reader/Gnumeric.php b/lib/PHPExcel/Reader/Gnumeric.php
new file mode 100644
index 000000000..913e52bc8
--- /dev/null
+++ b/lib/PHPExcel/Reader/Gnumeric.php
@@ -0,0 +1,850 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Gnumeric
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * Formats
+     *
+     * @var array
+     */
+    private $styles = array();
+
+    /**
+     * Shared Expressions
+     *
+     * @var array
+     */
+    private $expressions = array();
+
+    private $referenceHelper = null;
+
+    /**
+     * Create a new PHPExcel_Reader_Gnumeric
+     */
+    public function __construct()
+    {
+        $this->readFilter     = new PHPExcel_Reader_DefaultReadFilter();
+        $this->referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+    }
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return     boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        // Check if gzlib functions are available
+        if (!function_exists('gzread')) {
+            throw new PHPExcel_Reader_Exception("gzlib library is not enabled");
+        }
+
+        // Read signature data (first 3 bytes)
+        $fh = fopen($pFilename, 'r');
+        $data = fread($fh, 2);
+        fclose($fh);
+
+        if ($data != chr(0x1F).chr(0x8B)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+     *
+     * @param     string         $pFilename
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function listWorksheetNames($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $xml = new XMLReader();
+        $xml->xml($this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, PHPExcel_Settings::getLibXmlLoaderOptions());
+        $xml->setParserProperty(2, true);
+
+        $worksheetNames = array();
+        while ($xml->read()) {
+            if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
+                $xml->read();    //    Move onto the value node
+                $worksheetNames[] = (string) $xml->value;
+            } elseif ($xml->name == 'gnm:Sheets') {
+                //    break out of the loop once we've got our sheet names rather than parse the entire file
+                break;
+            }
+        }
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param   string     $pFilename
+     * @throws   PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $xml = new XMLReader();
+        $xml->xml($this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, PHPExcel_Settings::getLibXmlLoaderOptions());
+        $xml->setParserProperty(2, true);
+
+        $worksheetInfo = array();
+        while ($xml->read()) {
+            if ($xml->name == 'gnm:Sheet' && $xml->nodeType == XMLReader::ELEMENT) {
+                $tmpInfo = array(
+                    'worksheetName' => '',
+                    'lastColumnLetter' => 'A',
+                    'lastColumnIndex' => 0,
+                    'totalRows' => 0,
+                    'totalColumns' => 0,
+                );
+
+                while ($xml->read()) {
+                    if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
+                        $xml->read();    //    Move onto the value node
+                        $tmpInfo['worksheetName'] = (string) $xml->value;
+                    } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
+                        $xml->read();    //    Move onto the value node
+                        $tmpInfo['lastColumnIndex'] = (int) $xml->value;
+                        $tmpInfo['totalColumns'] = (int) $xml->value + 1;
+                    } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
+                        $xml->read();    //    Move onto the value node
+                        $tmpInfo['totalRows'] = (int) $xml->value + 1;
+                        break;
+                    }
+                }
+                $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+                $worksheetInfo[] = $tmpInfo;
+            }
+        }
+
+        return $worksheetInfo;
+    }
+
+    private function gzfileGetContents($filename)
+    {
+        $file = @gzopen($filename, 'rb');
+        if ($file !== false) {
+            $data = '';
+            while (!gzeof($file)) {
+                $data .= gzread($file, 1024);
+            }
+            gzclose($file);
+        }
+        return $data;
+    }
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
+
+        // Load into this instance
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
+
+    /**
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param     string         $pFilename
+     * @param    PHPExcel    $objPHPExcel
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $timezoneObj = new DateTimeZone('Europe/London');
+        $GMT = new DateTimeZone('UTC');
+
+        $gFileData = $this->gzfileGetContents($pFilename);
+
+//        echo '<pre>';
+//        echo htmlentities($gFileData,ENT_QUOTES,'UTF-8');
+//        echo '</pre><hr />';
+//
+        $xml = simplexml_load_string($this->securityScan($gFileData), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+        $namespacesMeta = $xml->getNamespaces(true);
+
+//        var_dump($namespacesMeta);
+//
+        $gnmXML = $xml->children($namespacesMeta['gnm']);
+
+        $docProps = $objPHPExcel->getProperties();
+        //    Document Properties are held differently, depending on the version of Gnumeric
+        if (isset($namespacesMeta['office'])) {
+            $officeXML = $xml->children($namespacesMeta['office']);
+            $officeDocXML = $officeXML->{'document-meta'};
+            $officeDocMetaXML = $officeDocXML->meta;
+
+            foreach ($officeDocMetaXML as $officePropertyData) {
+                $officePropertyDC = array();
+                if (isset($namespacesMeta['dc'])) {
+                    $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
+                }
+                foreach ($officePropertyDC as $propertyName => $propertyValue) {
+                    $propertyValue = (string) $propertyValue;
+                    switch ($propertyName) {
+                        case 'title':
+                            $docProps->setTitle(trim($propertyValue));
+                            break;
+                        case 'subject':
+                            $docProps->setSubject(trim($propertyValue));
+                            break;
+                        case 'creator':
+                            $docProps->setCreator(trim($propertyValue));
+                            $docProps->setLastModifiedBy(trim($propertyValue));
+                            break;
+                        case 'date':
+                            $creationDate = strtotime(trim($propertyValue));
+                            $docProps->setCreated($creationDate);
+                            $docProps->setModified($creationDate);
+                            break;
+                        case 'description':
+                            $docProps->setDescription(trim($propertyValue));
+                            break;
+                    }
+                }
+                $officePropertyMeta = array();
+                if (isset($namespacesMeta['meta'])) {
+                    $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
+                }
+                foreach ($officePropertyMeta as $propertyName => $propertyValue) {
+                    $attributes = $propertyValue->attributes($namespacesMeta['meta']);
+                    $propertyValue = (string) $propertyValue;
+                    switch ($propertyName) {
+                        case 'keyword':
+                            $docProps->setKeywords(trim($propertyValue));
+                            break;
+                        case 'initial-creator':
+                            $docProps->setCreator(trim($propertyValue));
+                            $docProps->setLastModifiedBy(trim($propertyValue));
+                            break;
+                        case 'creation-date':
+                            $creationDate = strtotime(trim($propertyValue));
+                            $docProps->setCreated($creationDate);
+                            $docProps->setModified($creationDate);
+                            break;
+                        case 'user-defined':
+                            list(, $attrName) = explode(':', $attributes['name']);
+                            switch ($attrName) {
+                                case 'publisher':
+                                    $docProps->setCompany(trim($propertyValue));
+                                    break;
+                                case 'category':
+                                    $docProps->setCategory(trim($propertyValue));
+                                    break;
+                                case 'manager':
+                                    $docProps->setManager(trim($propertyValue));
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+        } elseif (isset($gnmXML->Summary)) {
+            foreach ($gnmXML->Summary->Item as $summaryItem) {
+                $propertyName = $summaryItem->name;
+                $propertyValue = $summaryItem->{'val-string'};
+                switch ($propertyName) {
+                    case 'title':
+                        $docProps->setTitle(trim($propertyValue));
+                        break;
+                    case 'comments':
+                        $docProps->setDescription(trim($propertyValue));
+                        break;
+                    case 'keywords':
+                        $docProps->setKeywords(trim($propertyValue));
+                        break;
+                    case 'category':
+                        $docProps->setCategory(trim($propertyValue));
+                        break;
+                    case 'manager':
+                        $docProps->setManager(trim($propertyValue));
+                        break;
+                    case 'author':
+                        $docProps->setCreator(trim($propertyValue));
+                        $docProps->setLastModifiedBy(trim($propertyValue));
+                        break;
+                    case 'company':
+                        $docProps->setCompany(trim($propertyValue));
+                        break;
+                }
+            }
+        }
+
+        $worksheetID = 0;
+        foreach ($gnmXML->Sheets->Sheet as $sheet) {
+            $worksheetName = (string) $sheet->Name;
+//            echo '<b>Worksheet: ', $worksheetName,'</b><br />';
+            if ((isset($this->loadSheetsOnly)) && (!in_array($worksheetName, $this->loadSheetsOnly))) {
+                continue;
+            }
+
+            $maxRow = $maxCol = 0;
+
+            // Create new Worksheet
+            $objPHPExcel->createSheet();
+            $objPHPExcel->setActiveSheetIndex($worksheetID);
+            //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+            //        cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+            //        name in line with the formula, not the reverse
+            $objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
+
+            if ((!$this->readDataOnly) && (isset($sheet->PrintInformation))) {
+                if (isset($sheet->PrintInformation->Margins)) {
+                    foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) {
+                        $marginAttributes = $margin->attributes();
+                        $marginSize = 72 / 100;    //    Default
+                        switch ($marginAttributes['PrefUnit']) {
+                            case 'mm':
+                                $marginSize = intval($marginAttributes['Points']) / 100;
+                                break;
+                        }
+                        switch ($key) {
+                            case 'top':
+                                $objPHPExcel->getActiveSheet()->getPageMargins()->setTop($marginSize);
+                                break;
+                            case 'bottom':
+                                $objPHPExcel->getActiveSheet()->getPageMargins()->setBottom($marginSize);
+                                break;
+                            case 'left':
+                                $objPHPExcel->getActiveSheet()->getPageMargins()->setLeft($marginSize);
+                                break;
+                            case 'right':
+                                $objPHPExcel->getActiveSheet()->getPageMargins()->setRight($marginSize);
+                                break;
+                            case 'header':
+                                $objPHPExcel->getActiveSheet()->getPageMargins()->setHeader($marginSize);
+                                break;
+                            case 'footer':
+                                $objPHPExcel->getActiveSheet()->getPageMargins()->setFooter($marginSize);
+                                break;
+                        }
+                    }
+                }
+            }
+
+            foreach ($sheet->Cells->Cell as $cell) {
+                $cellAttributes = $cell->attributes();
+                $row = (int) $cellAttributes->Row + 1;
+                $column = (int) $cellAttributes->Col;
+
+                if ($row > $maxRow) {
+                    $maxRow = $row;
+                }
+                if ($column > $maxCol) {
+                    $maxCol = $column;
+                }
+
+                $column = PHPExcel_Cell::stringFromColumnIndex($column);
+
+                // Read cell?
+                if ($this->getReadFilter() !== null) {
+                    if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
+                        continue;
+                    }
+                }
+
+                $ValueType = $cellAttributes->ValueType;
+                $ExprID = (string) $cellAttributes->ExprID;
+//                echo 'Cell ', $column, $row,'<br />';
+//                echo 'Type is ', $ValueType,'<br />';
+//                echo 'Value is ', $cell,'<br />';
+                $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+                if ($ExprID > '') {
+                    if (((string) $cell) > '') {
+                        $this->expressions[$ExprID] = array(
+                            'column'    => $cellAttributes->Col,
+                            'row'        => $cellAttributes->Row,
+                            'formula'    => (string) $cell
+                        );
+//                        echo 'NEW EXPRESSION ', $ExprID,'<br />';
+                    } else {
+                        $expression = $this->expressions[$ExprID];
+
+                        $cell = $this->referenceHelper->updateFormulaReferences(
+                            $expression['formula'],
+                            'A1',
+                            $cellAttributes->Col - $expression['column'],
+                            $cellAttributes->Row - $expression['row'],
+                            $worksheetName
+                        );
+//                        echo 'SHARED EXPRESSION ', $ExprID,'<br />';
+//                        echo 'New Value is ', $cell,'<br />';
+                    }
+                    $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+                } else {
+                    switch ($ValueType) {
+                        case '10':        //    NULL
+                            $type = PHPExcel_Cell_DataType::TYPE_NULL;
+                            break;
+                        case '20':        //    Boolean
+                            $type = PHPExcel_Cell_DataType::TYPE_BOOL;
+                            $cell = ($cell == 'TRUE') ? true: false;
+                            break;
+                        case '30':        //    Integer
+                            $cell = intval($cell);
+                            // Excel 2007+ doesn't differentiate between integer and float, so set the value and dropthru to the next (numeric) case
+                        case '40':        //    Float
+                            $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                            break;
+                        case '50':        //    Error
+                            $type = PHPExcel_Cell_DataType::TYPE_ERROR;
+                            break;
+                        case '60':        //    String
+                            $type = PHPExcel_Cell_DataType::TYPE_STRING;
+                            break;
+                        case '70':        //    Cell Range
+                        case '80':        //    Array
+                    }
+                }
+                $objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell, $type);
+            }
+
+            if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
+                foreach ($sheet->Objects->children('gnm', true) as $key => $comment) {
+                    $commentAttributes = $comment->attributes();
+                    //    Only comment objects are handled at the moment
+                    if ($commentAttributes->Text) {
+                        $objPHPExcel->getActiveSheet()->getComment((string)$commentAttributes->ObjectBound)->setAuthor((string)$commentAttributes->Author)->setText($this->parseRichText((string)$commentAttributes->Text));
+                    }
+                }
+            }
+//            echo '$maxCol=', $maxCol,'; $maxRow=', $maxRow,'<br />';
+//
+            foreach ($sheet->Styles->StyleRegion as $styleRegion) {
+                $styleAttributes = $styleRegion->attributes();
+                if (($styleAttributes['startRow'] <= $maxRow) &&
+                    ($styleAttributes['startCol'] <= $maxCol)) {
+                    $startColumn = PHPExcel_Cell::stringFromColumnIndex((int) $styleAttributes['startCol']);
+                    $startRow = $styleAttributes['startRow'] + 1;
+
+                    $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
+                    $endColumn = PHPExcel_Cell::stringFromColumnIndex($endColumn);
+                    $endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
+                    $endRow += 1;
+                    $cellRange = $startColumn.$startRow.':'.$endColumn.$endRow;
+//                    echo $cellRange,'<br />';
+
+                    $styleAttributes = $styleRegion->Style->attributes();
+//                    var_dump($styleAttributes);
+//                    echo '<br />';
+
+                    //    We still set the number format mask for date/time values, even if readDataOnly is true
+                    if ((!$this->readDataOnly) ||
+                        (PHPExcel_Shared_Date::isDateTimeFormatCode((string) $styleAttributes['Format']))) {
+                        $styleArray = array();
+                        $styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
+                        //    If readDataOnly is false, we set all formatting information
+                        if (!$this->readDataOnly) {
+                            switch ($styleAttributes['HAlign']) {
+                                case '1':
+                                    $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+                                    break;
+                                case '2':
+                                    $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_LEFT;
+                                    break;
+                                case '4':
+                                    $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_RIGHT;
+                                    break;
+                                case '8':
+                                    $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER;
+                                    break;
+                                case '16':
+                                case '64':
+                                    $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS;
+                                    break;
+                                case '32':
+                                    $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY;
+                                    break;
+                            }
+
+                            switch ($styleAttributes['VAlign']) {
+                                case '1':
+                                    $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_TOP;
+                                    break;
+                                case '2':
+                                    $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+                                    break;
+                                case '4':
+                                    $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_CENTER;
+                                    break;
+                                case '8':
+                                    $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_JUSTIFY;
+                                    break;
+                            }
+
+                            $styleArray['alignment']['wrap'] = ($styleAttributes['WrapText'] == '1') ? true : false;
+                            $styleArray['alignment']['shrinkToFit'] = ($styleAttributes['ShrinkToFit'] == '1') ? true : false;
+                            $styleArray['alignment']['indent'] = (intval($styleAttributes["Indent"]) > 0) ? $styleAttributes["indent"] : 0;
+
+                            $RGB = self::parseGnumericColour($styleAttributes["Fore"]);
+                            $styleArray['font']['color']['rgb'] = $RGB;
+                            $RGB = self::parseGnumericColour($styleAttributes["Back"]);
+                            $shade = $styleAttributes["Shade"];
+                            if (($RGB != '000000') || ($shade != '0')) {
+                                $styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
+                                $RGB2 = self::parseGnumericColour($styleAttributes["PatternColor"]);
+                                $styleArray['fill']['endcolor']['rgb'] = $RGB2;
+                                switch ($shade) {
+                                    case '1':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_SOLID;
+                                        break;
+                                    case '2':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR;
+                                        break;
+                                    case '3':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_PATH;
+                                        break;
+                                    case '4':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN;
+                                        break;
+                                    case '5':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY;
+                                        break;
+                                    case '6':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID;
+                                        break;
+                                    case '7':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL;
+                                        break;
+                                    case '8':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS;
+                                        break;
+                                    case '9':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKUP;
+                                        break;
+                                    case '10':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL;
+                                        break;
+                                    case '11':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625;
+                                        break;
+                                    case '12':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY125;
+                                        break;
+                                    case '13':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN;
+                                        break;
+                                    case '14':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY;
+                                        break;
+                                    case '15':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID;
+                                        break;
+                                    case '16':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL;
+                                        break;
+                                    case '17':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS;
+                                        break;
+                                    case '18':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP;
+                                        break;
+                                    case '19':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL;
+                                        break;
+                                    case '20':
+                                        $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY;
+                                        break;
+                                }
+                            }
+
+                            $fontAttributes = $styleRegion->Style->Font->attributes();
+//                            var_dump($fontAttributes);
+//                            echo '<br />';
+                            $styleArray['font']['name'] = (string) $styleRegion->Style->Font;
+                            $styleArray['font']['size'] = intval($fontAttributes['Unit']);
+                            $styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? true : false;
+                            $styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? true : false;
+                            $styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? true : false;
+                            switch ($fontAttributes['Underline']) {
+                                case '1':
+                                    $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
+                                    break;
+                                case '2':
+                                    $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLE;
+                                    break;
+                                case '3':
+                                    $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING;
+                                    break;
+                                case '4':
+                                    $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING;
+                                    break;
+                                default:
+                                    $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_NONE;
+                                    break;
+                            }
+                            switch ($fontAttributes['Script']) {
+                                case '1':
+                                    $styleArray['font']['superScript'] = true;
+                                    break;
+                                case '-1':
+                                    $styleArray['font']['subScript'] = true;
+                                    break;
+                            }
+
+                            if (isset($styleRegion->Style->StyleBorder)) {
+                                if (isset($styleRegion->Style->StyleBorder->Top)) {
+                                    $styleArray['borders']['top'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
+                                }
+                                if (isset($styleRegion->Style->StyleBorder->Bottom)) {
+                                    $styleArray['borders']['bottom'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
+                                }
+                                if (isset($styleRegion->Style->StyleBorder->Left)) {
+                                    $styleArray['borders']['left'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
+                                }
+                                if (isset($styleRegion->Style->StyleBorder->Right)) {
+                                    $styleArray['borders']['right'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
+                                }
+                                if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
+                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+                                    $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_BOTH;
+                                } elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
+                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+                                    $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_UP;
+                                } elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
+                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
+                                    $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_DOWN;
+                                }
+                            }
+                            if (isset($styleRegion->Style->HyperLink)) {
+                                //    TO DO
+                                $hyperlink = $styleRegion->Style->HyperLink->attributes();
+                            }
+                        }
+//                        var_dump($styleArray);
+//                        echo '<br />';
+                        $objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
+                    }
+                }
+            }
+
+            if ((!$this->readDataOnly) && (isset($sheet->Cols))) {
+                //    Column Widths
+                $columnAttributes = $sheet->Cols->attributes();
+                $defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
+                $c = 0;
+                foreach ($sheet->Cols->ColInfo as $columnOverride) {
+                    $columnAttributes = $columnOverride->attributes();
+                    $column = $columnAttributes['No'];
+                    $columnWidth = $columnAttributes['Unit']  / 5.4;
+                    $hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
+                    $columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
+                    while ($c < $column) {
+                        $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
+                        ++$c;
+                    }
+                    while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
+                        $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
+                        if ($hidden) {
+                            $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setVisible(false);
+                        }
+                        ++$c;
+                    }
+                }
+                while ($c <= $maxCol) {
+                    $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
+                    ++$c;
+                }
+            }
+
+            if ((!$this->readDataOnly) && (isset($sheet->Rows))) {
+                //    Row Heights
+                $rowAttributes = $sheet->Rows->attributes();
+                $defaultHeight = $rowAttributes['DefaultSizePts'];
+                $r = 0;
+
+                foreach ($sheet->Rows->RowInfo as $rowOverride) {
+                    $rowAttributes = $rowOverride->attributes();
+                    $row = $rowAttributes['No'];
+                    $rowHeight = $rowAttributes['Unit'];
+                    $hidden = ((isset($rowAttributes['Hidden'])) && ($rowAttributes['Hidden'] == '1')) ? true : false;
+                    $rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
+                    while ($r < $row) {
+                        ++$r;
+                        $objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+                    }
+                    while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
+                        ++$r;
+                        $objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
+                        if ($hidden) {
+                            $objPHPExcel->getActiveSheet()->getRowDimension($r)->setVisible(false);
+                        }
+                    }
+                }
+                while ($r < $maxRow) {
+                    ++$r;
+                    $objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+                }
+            }
+
+            //    Handle Merged Cells in this worksheet
+            if (isset($sheet->MergedRegions)) {
+                foreach ($sheet->MergedRegions->Merge as $mergeCells) {
+                    if (strpos($mergeCells, ':') !== false) {
+                        $objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
+                    }
+                }
+            }
+
+            $worksheetID++;
+        }
+
+        //    Loop through definedNames (global named ranges)
+        if (isset($gnmXML->Names)) {
+            foreach ($gnmXML->Names->Name as $namedRange) {
+                $name = (string) $namedRange->name;
+                $range = (string) $namedRange->value;
+                if (stripos($range, '#REF!') !== false) {
+                    continue;
+                }
+
+                $range = explode('!', $range);
+                $range[0] = trim($range[0], "'");
+                if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
+                    $extractedRange = str_replace('$', '', $range[1]);
+                    $objPHPExcel->addNamedRange(new PHPExcel_NamedRange($name, $worksheet, $extractedRange));
+                }
+            }
+        }
+
+        // Return
+        return $objPHPExcel;
+    }
+
+    private static function parseBorderAttributes($borderAttributes)
+    {
+        $styleArray = array();
+        if (isset($borderAttributes["Color"])) {
+            $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes["Color"]);
+        }
+
+        switch ($borderAttributes["Style"]) {
+            case '0':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_NONE;
+                break;
+            case '1':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                break;
+            case '2':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
+                break;
+            case '3':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
+                break;
+            case '4':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHED;
+                break;
+            case '5':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_THICK;
+                break;
+            case '6':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_DOUBLE;
+                break;
+            case '7':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_DOTTED;
+                break;
+            case '8':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
+                break;
+            case '9':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOT;
+                break;
+            case '10':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
+                break;
+            case '11':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOTDOT;
+                break;
+            case '12':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
+                break;
+            case '13':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
+                break;
+        }
+        return $styleArray;
+    }
+
+    private function parseRichText($is = '')
+    {
+        $value = new PHPExcel_RichText();
+        $value->createText($is);
+
+        return $value;
+    }
+
+    private static function parseGnumericColour($gnmColour)
+    {
+        list($gnmR, $gnmG, $gnmB) = explode(':', $gnmColour);
+        $gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
+        $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
+        $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
+        return $gnmR . $gnmG . $gnmB;
+    }
+}
diff --git a/lib/PHPExcel/Reader/HTML.php b/lib/PHPExcel/Reader/HTML.php
new file mode 100644
index 000000000..ac762a4f2
--- /dev/null
+++ b/lib/PHPExcel/Reader/HTML.php
@@ -0,0 +1,549 @@
+<?php
+
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_HTML
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+/** PHPExcel root directory */
+class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+
+    /**
+     * Input encoding
+     *
+     * @var string
+     */
+    protected $inputEncoding = 'ANSI';
+
+    /**
+     * Sheet index to read
+     *
+     * @var int
+     */
+    protected $sheetIndex = 0;
+
+    /**
+     * Formats
+     *
+     * @var array
+     */
+    protected $formats = array(
+        'h1' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 24,
+            ),
+        ), //    Bold, 24pt
+        'h2' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 18,
+            ),
+        ), //    Bold, 18pt
+        'h3' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 13.5,
+            ),
+        ), //    Bold, 13.5pt
+        'h4' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 12,
+            ),
+        ), //    Bold, 12pt
+        'h5' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 10,
+            ),
+        ), //    Bold, 10pt
+        'h6' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 7.5,
+            ),
+        ), //    Bold, 7.5pt
+        'a' => array(
+            'font' => array(
+                'underline' => true,
+                'color' => array(
+                    'argb' => PHPExcel_Style_Color::COLOR_BLUE,
+                ),
+            ),
+        ), //    Blue underlined
+        'hr' => array(
+            'borders' => array(
+                'bottom' => array(
+                    'style' => PHPExcel_Style_Border::BORDER_THIN,
+                    'color' => array(
+                        PHPExcel_Style_Color::COLOR_BLACK,
+                    ),
+                ),
+            ),
+        ), //    Bottom border
+    );
+
+    protected $rowspan = array();
+
+    /**
+     * Create a new PHPExcel_Reader_HTML
+     */
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
+
+    /**
+     * Validate that the current file is an HTML file
+     *
+     * @return boolean
+     */
+    protected function isValidFormat()
+    {
+        //    Reading 2048 bytes should be enough to validate that the format is HTML
+        $data = fread($this->fileHandle, 2048);
+        if ((strpos($data, '<') !== false) &&
+                (strlen($data) !== strlen(strip_tags($data)))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param  string                    $pFilename
+     * @return PHPExcel
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
+
+        // Load into this instance
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
+
+    /**
+     * Set input encoding
+     *
+     * @param string $pValue Input encoding
+     */
+    public function setInputEncoding($pValue = 'ANSI')
+    {
+        $this->inputEncoding = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get input encoding
+     *
+     * @return string
+     */
+    public function getInputEncoding()
+    {
+        return $this->inputEncoding;
+    }
+
+    //    Data Array used for testing only, should write to PHPExcel object on completion of tests
+    protected $dataArray = array();
+    protected $tableLevel = 0;
+    protected $nestedColumn = array('A');
+
+    protected function setTableStartColumn($column)
+    {
+        if ($this->tableLevel == 0) {
+            $column = 'A';
+        }
+        ++$this->tableLevel;
+        $this->nestedColumn[$this->tableLevel] = $column;
+
+        return $this->nestedColumn[$this->tableLevel];
+    }
+
+    protected function getTableStartColumn()
+    {
+        return $this->nestedColumn[$this->tableLevel];
+    }
+
+    protected function releaseTableStartColumn()
+    {
+        --$this->tableLevel;
+
+        return array_pop($this->nestedColumn);
+    }
+
+    protected function flushCell($sheet, $column, $row, &$cellContent)
+    {
+        if (is_string($cellContent)) {
+            //    Simple String content
+            if (trim($cellContent) > '') {
+                //    Only actually write it if there's content in the string
+//                echo 'FLUSH CELL: ' , $column , $row , ' => ' , $cellContent , '<br />';
+                //    Write to worksheet to be done here...
+                //    ... we return the cell so we can mess about with styles more easily
+                $sheet->setCellValue($column . $row, $cellContent, true);
+                $this->dataArray[$row][$column] = $cellContent;
+            }
+        } else {
+            //    We have a Rich Text run
+            //    TODO
+            $this->dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
+        }
+        $cellContent = (string) '';
+    }
+
+    protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
+    {
+        foreach ($element->childNodes as $child) {
+            if ($child instanceof DOMText) {
+                $domText = preg_replace('/\s+/u', ' ', trim($child->nodeValue));
+                if (is_string($cellContent)) {
+                    //    simply append the text if the cell content is a plain text string
+                    $cellContent .= $domText;
+                } else {
+                    //    but if we have a rich text run instead, we need to append it correctly
+                    //    TODO
+                }
+            } elseif ($child instanceof DOMElement) {
+//                echo '<b>DOM ELEMENT: </b>' , strtoupper($child->nodeName) , '<br />';
+
+                $attributeArray = array();
+                foreach ($child->attributes as $attribute) {
+//                    echo '<b>ATTRIBUTE: </b>' , $attribute->name , ' => ' , $attribute->value , '<br />';
+                    $attributeArray[$attribute->name] = $attribute->value;
+                }
+
+                switch ($child->nodeName) {
+                    case 'meta':
+                        foreach ($attributeArray as $attributeName => $attributeValue) {
+                            switch ($attributeName) {
+                                case 'content':
+                                    //    TODO
+                                    //    Extract character set, so we can convert to UTF-8 if required
+                                    break;
+                            }
+                        }
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        break;
+                    case 'title':
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        $sheet->setTitle($cellContent);
+                        $cellContent = '';
+                        break;
+                    case 'span':
+                    case 'div':
+                    case 'font':
+                    case 'i':
+                    case 'em':
+                    case 'strong':
+                    case 'b':
+//                        echo 'STYLING, SPAN OR DIV<br />';
+                        if ($cellContent > '') {
+                            $cellContent .= ' ';
+                        }
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        if ($cellContent > '') {
+                            $cellContent .= ' ';
+                        }
+//                        echo 'END OF STYLING, SPAN OR DIV<br />';
+                        break;
+                    case 'hr':
+                        $this->flushCell($sheet, $column, $row, $cellContent);
+                        ++$row;
+                        if (isset($this->formats[$child->nodeName])) {
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                        } else {
+                            $cellContent = '----------';
+                            $this->flushCell($sheet, $column, $row, $cellContent);
+                        }
+                        ++$row;
+                        // Add a break after a horizontal rule, simply by allowing the code to dropthru
+                    case 'br':
+                        if ($this->tableLevel > 0) {
+                            //    If we're inside a table, replace with a \n
+                            $cellContent .= "\n";
+                        } else {
+                            //    Otherwise flush our existing content and move the row cursor on
+                            $this->flushCell($sheet, $column, $row, $cellContent);
+                            ++$row;
+                        }
+//                        echo 'HARD LINE BREAK: ' , '<br />';
+                        break;
+                    case 'a':
+//                        echo 'START OF HYPERLINK: ' , '<br />';
+                        foreach ($attributeArray as $attributeName => $attributeValue) {
+                            switch ($attributeName) {
+                                case 'href':
+//                                    echo 'Link to ' , $attributeValue , '<br />';
+                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
+                                    if (isset($this->formats[$child->nodeName])) {
+                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                                    }
+                                    break;
+                            }
+                        }
+                        $cellContent .= ' ';
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                        echo 'END OF HYPERLINK:' , '<br />';
+                        break;
+                    case 'h1':
+                    case 'h2':
+                    case 'h3':
+                    case 'h4':
+                    case 'h5':
+                    case 'h6':
+                    case 'ol':
+                    case 'ul':
+                    case 'p':
+                        if ($this->tableLevel > 0) {
+                            //    If we're inside a table, replace with a \n
+                            $cellContent .= "\n";
+//                            echo 'LIST ENTRY: ' , '<br />';
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                            echo 'END OF LIST ENTRY:' , '<br />';
+                        } else {
+                            if ($cellContent > '') {
+                                $this->flushCell($sheet, $column, $row, $cellContent);
+                                $row++;
+                            }
+//                            echo 'START OF PARAGRAPH: ' , '<br />';
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                            echo 'END OF PARAGRAPH:' , '<br />';
+                            $this->flushCell($sheet, $column, $row, $cellContent);
+
+                            if (isset($this->formats[$child->nodeName])) {
+                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                            }
+
+                            $row++;
+                            $column = 'A';
+                        }
+                        break;
+                    case 'li':
+                        if ($this->tableLevel > 0) {
+                            //    If we're inside a table, replace with a \n
+                            $cellContent .= "\n";
+//                            echo 'LIST ENTRY: ' , '<br />';
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                            echo 'END OF LIST ENTRY:' , '<br />';
+                        } else {
+                            if ($cellContent > '') {
+                                $this->flushCell($sheet, $column, $row, $cellContent);
+                            }
+                            ++$row;
+//                            echo 'LIST ENTRY: ' , '<br />';
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                            echo 'END OF LIST ENTRY:' , '<br />';
+                            $this->flushCell($sheet, $column, $row, $cellContent);
+                            $column = 'A';
+                        }
+                        break;
+                    case 'table':
+                        $this->flushCell($sheet, $column, $row, $cellContent);
+                        $column = $this->setTableStartColumn($column);
+//                        echo 'START OF TABLE LEVEL ' , $this->tableLevel , '<br />';
+                        if ($this->tableLevel > 1) {
+                            --$row;
+                        }
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                        echo 'END OF TABLE LEVEL ' , $this->tableLevel , '<br />';
+                        $column = $this->releaseTableStartColumn();
+                        if ($this->tableLevel > 1) {
+                            ++$column;
+                        } else {
+                            ++$row;
+                        }
+                        break;
+                    case 'thead':
+                    case 'tbody':
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        break;
+                    case 'tr':
+                        $column = $this->getTableStartColumn();
+                        $cellContent = '';
+//                        echo 'START OF TABLE ' , $this->tableLevel , ' ROW<br />';
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        ++$row;
+//                        echo 'END OF TABLE ' , $this->tableLevel , ' ROW<br />';
+                        break;
+                    case 'th':
+                    case 'td':
+//                        echo 'START OF TABLE ' , $this->tableLevel , ' CELL<br />';
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                        echo 'END OF TABLE ' , $this->tableLevel , ' CELL<br />';
+
+                        while (isset($this->rowspan[$column . $row])) {
+                            ++$column;
+                        }
+
+                        $this->flushCell($sheet, $column, $row, $cellContent);
+
+//                        if (isset($attributeArray['style']) && !empty($attributeArray['style'])) {
+//                            $styleAry = $this->getPhpExcelStyleArray($attributeArray['style']);
+//
+//                            if (!empty($styleAry)) {
+//                                $sheet->getStyle($column . $row)->applyFromArray($styleAry);
+//                            }
+//                        }
+
+                        if (isset($attributeArray['rowspan']) && isset($attributeArray['colspan'])) {
+                            //create merging rowspan and colspan
+                            $columnTo = $column;
+                            for ($i = 0; $i < $attributeArray['colspan'] - 1; $i++) {
+                                ++$columnTo;
+                            }
+                            $range = $column . $row . ':' . $columnTo . ($row + $attributeArray['rowspan'] - 1);
+                            foreach (\PHPExcel_Cell::extractAllCellReferencesInRange($range) as $value) {
+                                $this->rowspan[$value] = true;
+                            }
+                            $sheet->mergeCells($range);
+                            $column = $columnTo;
+                        } elseif (isset($attributeArray['rowspan'])) {
+                            //create merging rowspan
+                            $range = $column . $row . ':' . $column . ($row + $attributeArray['rowspan'] - 1);
+                            foreach (\PHPExcel_Cell::extractAllCellReferencesInRange($range) as $value) {
+                                $this->rowspan[$value] = true;
+                            }
+                            $sheet->mergeCells($range);
+                        } elseif (isset($attributeArray['colspan'])) {
+                            //create merging colspan
+                            $columnTo = $column;
+                            for ($i = 0; $i < $attributeArray['colspan'] - 1; $i++) {
+                                ++$columnTo;
+                            }
+                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
+                            $column = $columnTo;
+                        }
+                        ++$column;
+                        break;
+                    case 'body':
+                        $row = 1;
+                        $column = 'A';
+                        $content = '';
+                        $this->tableLevel = 0;
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        break;
+                    default:
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                }
+            }
+        }
+    }
+
+    /**
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param  string                    $pFilename
+     * @param  PHPExcel                  $objPHPExcel
+     * @return PHPExcel
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        // Open file to validate
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid HTML file.");
+        }
+        //    Close after validating
+        fclose($this->fileHandle);
+
+        // Create new PHPExcel
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
+            $objPHPExcel->createSheet();
+        }
+        $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
+
+        //    Create a new DOM object
+        $dom = new domDocument;
+        //    Reload the HTML file into the DOM object
+        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
+        if ($loaded === false) {
+            throw new PHPExcel_Reader_Exception('Failed to load ' . $pFilename . ' as a DOM Document');
+        }
+
+        //    Discard white space
+        $dom->preserveWhiteSpace = false;
+
+        $row = 0;
+        $column = 'A';
+        $content = '';
+        $this->processDomElement($dom, $objPHPExcel->getActiveSheet(), $row, $column, $content);
+
+        // Return
+        return $objPHPExcel;
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return int
+     */
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param  int                  $pValue Sheet index
+     * @return PHPExcel_Reader_HTML
+     */
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
+     *
+     * @param     string         $xml
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function securityScan($xml)
+    {
+        $pattern = '/\\0?' . implode('\\0?', str_split('<!ENTITY')) . '\\0?/';
+        if (preg_match($pattern, $xml)) {
+            throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
+        }
+        return $xml;
+    }
+}
diff --git a/lib/PHPExcel/Reader/IReadFilter.php b/lib/PHPExcel/Reader/IReadFilter.php
new file mode 100644
index 000000000..f7c852d9d
--- /dev/null
+++ b/lib/PHPExcel/Reader/IReadFilter.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * PHPExcel_Reader_IReadFilter
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+interface PHPExcel_Reader_IReadFilter
+{
+    /**
+     * Should this cell be read?
+     *
+     * @param    $column           Column address (as a string value like "A", or "IV")
+     * @param    $row              Row number
+     * @param    $worksheetName    Optional worksheet name
+     * @return   boolean
+     */
+    public function readCell($column, $row, $worksheetName = '');
+}
diff --git a/lib/PHPExcel/Reader/IReader.php b/lib/PHPExcel/Reader/IReader.php
new file mode 100644
index 000000000..903454641
--- /dev/null
+++ b/lib/PHPExcel/Reader/IReader.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * PHPExcel_Reader_IReader
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+interface PHPExcel_Reader_IReader
+{
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return     boolean
+     */
+    public function canRead($pFilename);
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return  PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename);
+}
diff --git a/lib/PHPExcel/Reader/OOCalc.php b/lib/PHPExcel/Reader/OOCalc.php
new file mode 100644
index 000000000..a889d9570
--- /dev/null
+++ b/lib/PHPExcel/Reader/OOCalc.php
@@ -0,0 +1,696 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_OOCalc
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * Formats
+     *
+     * @var array
+     */
+    private $styles = array();
+
+    /**
+     * Create a new PHPExcel_Reader_OOCalc
+     */
+    public function __construct()
+    {
+        $this->readFilter     = new PHPExcel_Reader_DefaultReadFilter();
+    }
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return     boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        // Check if zip class exists
+//        if (!class_exists($zipClass, false)) {
+//            throw new PHPExcel_Reader_Exception($zipClass . " library is not enabled");
+//        }
+
+        $mimeType = 'UNKNOWN';
+        // Load file
+        $zip = new $zipClass;
+        if ($zip->open($pFilename) === true) {
+            // check if it is an OOXML archive
+            $stat = $zip->statName('mimetype');
+            if ($stat && ($stat['size'] <= 255)) {
+                $mimeType = $zip->getFromName($stat['name']);
+            } elseif ($stat = $zip->statName('META-INF/manifest.xml')) {
+                $xml = simplexml_load_string($this->securityScan($zip->getFromName('META-INF/manifest.xml')), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+                $namespacesContent = $xml->getNamespaces(true);
+                if (isset($namespacesContent['manifest'])) {
+                    $manifest = $xml->children($namespacesContent['manifest']);
+                    foreach ($manifest as $manifestDataSet) {
+                        $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
+                        if ($manifestAttributes->{'full-path'} == '/') {
+                            $mimeType = (string) $manifestAttributes->{'media-type'};
+                            break;
+                        }
+                    }
+                }
+            }
+
+            $zip->close();
+
+            return ($mimeType === 'application/vnd.oasis.opendocument.spreadsheet');
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+     *
+     * @param     string         $pFilename
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function listWorksheetNames($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
+        if (!$zip->open($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
+        }
+
+        $worksheetNames = array();
+
+        $xml = new XMLReader();
+        $res = $xml->xml($this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'), null, PHPExcel_Settings::getLibXmlLoaderOptions());
+        $xml->setParserProperty(2, true);
+
+        //    Step into the first level of content of the XML
+        $xml->read();
+        while ($xml->read()) {
+            //    Quickly jump through to the office:body node
+            while ($xml->name !== 'office:body') {
+                if ($xml->isEmptyElement) {
+                    $xml->read();
+                } else {
+                    $xml->next();
+                }
+            }
+            //    Now read each node until we find our first table:table node
+            while ($xml->read()) {
+                if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+                    //    Loop through each table:table node reading the table:name attribute for each worksheet name
+                    do {
+                        $worksheetNames[] = $xml->getAttribute('table:name');
+                        $xml->next();
+                    } while ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT);
+                }
+            }
+        }
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param   string     $pFilename
+     * @throws   PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $worksheetInfo = array();
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
+        if (!$zip->open($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
+        }
+
+        $xml = new XMLReader();
+        $res = $xml->xml($this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'), null, PHPExcel_Settings::getLibXmlLoaderOptions());
+        $xml->setParserProperty(2, true);
+
+        //    Step into the first level of content of the XML
+        $xml->read();
+        while ($xml->read()) {
+            //    Quickly jump through to the office:body node
+            while ($xml->name !== 'office:body') {
+                if ($xml->isEmptyElement) {
+                    $xml->read();
+                } else {
+                    $xml->next();
+                }
+            }
+                //    Now read each node until we find our first table:table node
+            while ($xml->read()) {
+                if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+                    $worksheetNames[] = $xml->getAttribute('table:name');
+
+                    $tmpInfo = array(
+                        'worksheetName' => $xml->getAttribute('table:name'),
+                        'lastColumnLetter' => 'A',
+                        'lastColumnIndex' => 0,
+                        'totalRows' => 0,
+                        'totalColumns' => 0,
+                    );
+
+                    //    Loop through each child node of the table:table element reading
+                    $currCells = 0;
+                    do {
+                        $xml->read();
+                        if ($xml->name == 'table:table-row' && $xml->nodeType == XMLReader::ELEMENT) {
+                            $rowspan = $xml->getAttribute('table:number-rows-repeated');
+                            $rowspan = empty($rowspan) ? 1 : $rowspan;
+                            $tmpInfo['totalRows'] += $rowspan;
+                            $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                            $currCells = 0;
+                            //    Step into the row
+                            $xml->read();
+                            do {
+                                if ($xml->name == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                    if (!$xml->isEmptyElement) {
+                                        $currCells++;
+                                        $xml->next();
+                                    } else {
+                                        $xml->read();
+                                    }
+                                } elseif ($xml->name == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                    $mergeSize = $xml->getAttribute('table:number-columns-repeated');
+                                    $currCells += $mergeSize;
+                                    $xml->read();
+                                }
+                            } while ($xml->name != 'table:table-row');
+                        }
+                    } while ($xml->name != 'table:table');
+
+                    $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                    $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
+                    $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+                    $worksheetInfo[] = $tmpInfo;
+                }
+            }
+
+//                foreach ($workbookData->table as $worksheetDataSet) {
+//                    $worksheetData = $worksheetDataSet->children($namespacesContent['table']);
+//                    $worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
+//
+//                    $rowIndex = 0;
+//                    foreach ($worksheetData as $key => $rowData) {
+//                        switch ($key) {
+//                            case 'table-row' :
+//                                $rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
+//                                $rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
+//                                        $rowDataTableAttributes['number-rows-repeated'] : 1;
+//                                $columnIndex = 0;
+//
+//                                foreach ($rowData as $key => $cellData) {
+//                                    $cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
+//                                    $colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
+//                                        $cellDataTableAttributes['number-columns-repeated'] : 1;
+//                                    $cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
+//                                    if (isset($cellDataOfficeAttributes['value-type'])) {
+//                                        $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex + $colRepeats - 1);
+//                                        $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex + $rowRepeats);
+//                                    }
+//                                    $columnIndex += $colRepeats;
+//                                }
+//                                $rowIndex += $rowRepeats;
+//                                break;
+//                        }
+//                    }
+//
+//                    $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+//                    $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+//
+//                }
+//            }
+        }
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
+
+        // Load into this instance
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
+
+    private static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
+    {
+        $styleAttributeValue = strtolower($styleAttributeValue);
+        foreach ($styleList as $style) {
+            if ($styleAttributeValue == strtolower($style)) {
+                $styleAttributeValue = $style;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param     string         $pFilename
+     * @param    PHPExcel    $objPHPExcel
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
+
+        $timezoneObj = new DateTimeZone('Europe/London');
+        $GMT = new DateTimeZone('UTC');
+
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
+        if (!$zip->open($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
+        }
+
+//        echo '<h1>Meta Information</h1>';
+        $xml = simplexml_load_string($this->securityScan($zip->getFromName("meta.xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+        $namespacesMeta = $xml->getNamespaces(true);
+//        echo '<pre>';
+//        print_r($namespacesMeta);
+//        echo '</pre><hr />';
+
+        $docProps = $objPHPExcel->getProperties();
+        $officeProperty = $xml->children($namespacesMeta['office']);
+        foreach ($officeProperty as $officePropertyData) {
+            $officePropertyDC = array();
+            if (isset($namespacesMeta['dc'])) {
+                $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
+            }
+            foreach ($officePropertyDC as $propertyName => $propertyValue) {
+                $propertyValue = (string) $propertyValue;
+                switch ($propertyName) {
+                    case 'title':
+                        $docProps->setTitle($propertyValue);
+                        break;
+                    case 'subject':
+                        $docProps->setSubject($propertyValue);
+                        break;
+                    case 'creator':
+                        $docProps->setCreator($propertyValue);
+                        $docProps->setLastModifiedBy($propertyValue);
+                        break;
+                    case 'date':
+                        $creationDate = strtotime($propertyValue);
+                        $docProps->setCreated($creationDate);
+                        $docProps->setModified($creationDate);
+                        break;
+                    case 'description':
+                        $docProps->setDescription($propertyValue);
+                        break;
+                }
+            }
+            $officePropertyMeta = array();
+            if (isset($namespacesMeta['dc'])) {
+                $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
+            }
+            foreach ($officePropertyMeta as $propertyName => $propertyValue) {
+                $propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
+                $propertyValue = (string) $propertyValue;
+                switch ($propertyName) {
+                    case 'initial-creator':
+                        $docProps->setCreator($propertyValue);
+                        break;
+                    case 'keyword':
+                        $docProps->setKeywords($propertyValue);
+                        break;
+                    case 'creation-date':
+                        $creationDate = strtotime($propertyValue);
+                        $docProps->setCreated($creationDate);
+                        break;
+                    case 'user-defined':
+                        $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+                        foreach ($propertyValueAttributes as $key => $value) {
+                            if ($key == 'name') {
+                                $propertyValueName = (string) $value;
+                            } elseif ($key == 'value-type') {
+                                switch ($value) {
+                                    case 'date':
+                                        $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'date');
+                                        $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
+                                        break;
+                                    case 'boolean':
+                                        $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'bool');
+                                        $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+                                        break;
+                                    case 'float':
+                                        $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'r4');
+                                        $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
+                                        break;
+                                    default:
+                                        $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+                                }
+                            }
+                        }
+                        $docProps->setCustomProperty($propertyValueName, $propertyValue, $propertyValueType);
+                        break;
+                }
+            }
+        }
+
+
+//        echo '<h1>Workbook Content</h1>';
+        $xml = simplexml_load_string($this->securityScan($zip->getFromName("content.xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
+        $namespacesContent = $xml->getNamespaces(true);
+//        echo '<pre>';
+//        print_r($namespacesContent);
+//        echo '</pre><hr />';
+
+        $workbook = $xml->children($namespacesContent['office']);
+        foreach ($workbook->body->spreadsheet as $workbookData) {
+            $workbookData = $workbookData->children($namespacesContent['table']);
+            $worksheetID = 0;
+            foreach ($workbookData->table as $worksheetDataSet) {
+                $worksheetData = $worksheetDataSet->children($namespacesContent['table']);
+//                print_r($worksheetData);
+//                echo '<br />';
+                $worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
+//                print_r($worksheetDataAttributes);
+//                echo '<br />';
+                if ((isset($this->loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
+                    (!in_array($worksheetDataAttributes['name'], $this->loadSheetsOnly))) {
+                    continue;
+                }
+
+//                echo '<h2>Worksheet '.$worksheetDataAttributes['name'].'</h2>';
+                // Create new Worksheet
+                $objPHPExcel->createSheet();
+                $objPHPExcel->setActiveSheetIndex($worksheetID);
+                if (isset($worksheetDataAttributes['name'])) {
+                    $worksheetName = (string) $worksheetDataAttributes['name'];
+                    //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+                    //        formula cells... during the load, all formulae should be correct, and we're simply
+                    //        bringing the worksheet name in line with the formula, not the reverse
+                    $objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
+                }
+
+                $rowID = 1;
+                foreach ($worksheetData as $key => $rowData) {
+//                    echo '<b>'.$key.'</b><br />';
+                    switch ($key) {
+                        case 'table-header-rows':
+                            foreach ($rowData as $key => $cellData) {
+                                $rowData = $cellData;
+                                break;
+                            }
+                        case 'table-row':
+                            $rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
+                            $rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ? $rowDataTableAttributes['number-rows-repeated'] : 1;
+                            $columnID = 'A';
+                            foreach ($rowData as $key => $cellData) {
+                                if ($this->getReadFilter() !== null) {
+                                    if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+                                        continue;
+                                    }
+                                }
+
+//                                echo '<b>'.$columnID.$rowID.'</b><br />';
+                                $cellDataText = (isset($namespacesContent['text'])) ? $cellData->children($namespacesContent['text']) : '';
+                                $cellDataOffice = $cellData->children($namespacesContent['office']);
+                                $cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
+                                $cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
+
+//                                echo 'Office Attributes: ';
+//                                print_r($cellDataOfficeAttributes);
+//                                echo '<br />Table Attributes: ';
+//                                print_r($cellDataTableAttributes);
+//                                echo '<br />Cell Data Text';
+//                                print_r($cellDataText);
+//                                echo '<br />';
+//
+                                $type = $formatting = $hyperlink = null;
+                                $hasCalculatedValue = false;
+                                $cellDataFormula = '';
+                                if (isset($cellDataTableAttributes['formula'])) {
+                                    $cellDataFormula = $cellDataTableAttributes['formula'];
+                                    $hasCalculatedValue = true;
+                                }
+
+                                if (isset($cellDataOffice->annotation)) {
+//                                    echo 'Cell has comment<br />';
+                                    $annotationText = $cellDataOffice->annotation->children($namespacesContent['text']);
+                                    $textArray = array();
+                                    foreach ($annotationText as $t) {
+                                        if (isset($t->span)) {
+                                            foreach ($t->span as $text) {
+                                                $textArray[] = (string)$text;
+                                            }
+                                        } else {
+                                            $textArray[] = (string) $t;
+                                        }
+                                    }
+                                    $text = implode("\n", $textArray);
+//                                    echo $text, '<br />';
+                                    $objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)->setText($this->parseRichText($text));
+//                                                                    ->setAuthor( $author )
+                                }
+
+                                if (isset($cellDataText->p)) {
+                                    // Consolidate if there are multiple p records (maybe with spans as well)
+                                    $dataArray = array();
+                                    // Text can have multiple text:p and within those, multiple text:span.
+                                    // text:p newlines, but text:span does not.
+                                    // Also, here we assume there is no text data is span fields are specified, since
+                                    // we have no way of knowing proper positioning anyway.
+                                    foreach ($cellDataText->p as $pData) {
+                                        if (isset($pData->span)) {
+                                            // span sections do not newline, so we just create one large string here
+                                            $spanSection = "";
+                                            foreach ($pData->span as $spanData) {
+                                                $spanSection .= $spanData;
+                                            }
+                                            array_push($dataArray, $spanSection);
+                                        } else {
+                                            array_push($dataArray, $pData);
+                                        }
+                                    }
+                                    $allCellDataText = implode($dataArray, "\n");
+
+//                                    echo 'Value Type is '.$cellDataOfficeAttributes['value-type'].'<br />';
+                                    switch ($cellDataOfficeAttributes['value-type']) {
+                                        case 'string':
+                                            $type = PHPExcel_Cell_DataType::TYPE_STRING;
+                                            $dataValue = $allCellDataText;
+                                            if (isset($dataValue->a)) {
+                                                $dataValue = $dataValue->a;
+                                                $cellXLinkAttributes = $dataValue->attributes($namespacesContent['xlink']);
+                                                $hyperlink = $cellXLinkAttributes['href'];
+                                            }
+                                            break;
+                                        case 'boolean':
+                                            $type = PHPExcel_Cell_DataType::TYPE_BOOL;
+                                            $dataValue = ($allCellDataText == 'TRUE') ? true : false;
+                                            break;
+                                        case 'percentage':
+                                            $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                            $dataValue = (float) $cellDataOfficeAttributes['value'];
+                                            if (floor($dataValue) == $dataValue) {
+                                                $dataValue = (integer) $dataValue;
+                                            }
+                                            $formatting = PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00;
+                                            break;
+                                        case 'currency':
+                                            $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                            $dataValue = (float) $cellDataOfficeAttributes['value'];
+                                            if (floor($dataValue) == $dataValue) {
+                                                $dataValue = (integer) $dataValue;
+                                            }
+                                            $formatting = PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
+                                            break;
+                                        case 'float':
+                                            $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                            $dataValue = (float) $cellDataOfficeAttributes['value'];
+                                            if (floor($dataValue) == $dataValue) {
+                                                if ($dataValue == (integer) $dataValue) {
+                                                    $dataValue = (integer) $dataValue;
+                                                } else {
+                                                    $dataValue = (float) $dataValue;
+                                                }
+                                            }
+                                            break;
+                                        case 'date':
+                                            $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                            $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
+                                            $dateObj->setTimeZone($timezoneObj);
+                                            list($year, $month, $day, $hour, $minute, $second) = explode(' ', $dateObj->format('Y m d H i s'));
+                                            $dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year, $month, $day, $hour, $minute, $second);
+                                            if ($dataValue != floor($dataValue)) {
+                                                $formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15.' '.PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
+                                            } else {
+                                                $formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15;
+                                            }
+                                            break;
+                                        case 'time':
+                                            $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+                                            $dataValue = PHPExcel_Shared_Date::PHPToExcel(strtotime('01-01-1970 '.implode(':', sscanf($cellDataOfficeAttributes['time-value'], 'PT%dH%dM%dS'))));
+                                            $formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
+                                            break;
+                                    }
+//                                    echo 'Data value is '.$dataValue.'<br />';
+//                                    if ($hyperlink !== null) {
+//                                        echo 'Hyperlink is '.$hyperlink.'<br />';
+//                                    }
+                                } else {
+                                    $type = PHPExcel_Cell_DataType::TYPE_NULL;
+                                    $dataValue = null;
+                                }
+
+                                if ($hasCalculatedValue) {
+                                    $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+//                                    echo 'Formula: ', $cellDataFormula, PHP_EOL;
+                                    $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=')+1);
+                                    $temp = explode('"', $cellDataFormula);
+                                    $tKey = false;
+                                    foreach ($temp as &$value) {
+                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
+                                        if ($tKey = !$tKey) {
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value);    //  Cell range reference in another sheet
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value);       //  Cell reference in another sheet
+                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value);    //  Cell range reference
+                                            $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value);                  //  Simple cell reference
+                                            $value = PHPExcel_Calculation::translateSeparator(';', ',', $value, $inBraces);
+                                        }
+                                    }
+                                    unset($value);
+                                    //    Then rebuild the formula string
+                                    $cellDataFormula = implode('"', $temp);
+//                                    echo 'Adjusted Formula: ', $cellDataFormula, PHP_EOL;
+                                }
+
+                                $colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ? $cellDataTableAttributes['number-columns-repeated'] : 1;
+                                if ($type !== null) {
+                                    for ($i = 0; $i < $colRepeats; ++$i) {
+                                        if ($i > 0) {
+                                            ++$columnID;
+                                        }
+                                        if ($type !== PHPExcel_Cell_DataType::TYPE_NULL) {
+                                            for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
+                                                $rID = $rowID + $rowAdjust;
+                                                $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue), $type);
+                                                if ($hasCalculatedValue) {
+//                                                    echo 'Forumla result is '.$dataValue.'<br />';
+                                                    $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
+                                                }
+                                                if ($formatting !== null) {
+                                                    $objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
+                                                } else {
+                                                    $objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_GENERAL);
+                                                }
+                                                if ($hyperlink !== null) {
+                                                    $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                //    Merged cells
+                                if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
+                                    if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->readDataOnly)) {
+                                        $columnTo = $columnID;
+                                        if (isset($cellDataTableAttributes['number-columns-spanned'])) {
+                                            $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
+                                        }
+                                        $rowTo = $rowID;
+                                        if (isset($cellDataTableAttributes['number-rows-spanned'])) {
+                                            $rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
+                                        }
+                                        $cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
+                                        $objPHPExcel->getActiveSheet()->mergeCells($cellRange);
+                                    }
+                                }
+
+                                ++$columnID;
+                            }
+                            $rowID += $rowRepeats;
+                            break;
+                    }
+                }
+                ++$worksheetID;
+            }
+        }
+
+        // Return
+        return $objPHPExcel;
+    }
+
+    private function parseRichText($is = '')
+    {
+        $value = new PHPExcel_RichText();
+
+        $value->createText($is);
+
+        return $value;
+    }
+}
diff --git a/lib/PHPExcel/Reader/SYLK.php b/lib/PHPExcel/Reader/SYLK.php
new file mode 100644
index 000000000..e232be65e
--- /dev/null
+++ b/lib/PHPExcel/Reader/SYLK.php
@@ -0,0 +1,478 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_SYLK
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+    /**
+     * Input encoding
+     *
+     * @var string
+     */
+    private $inputEncoding = 'ANSI';
+
+    /**
+     * Sheet index to read
+     *
+     * @var int
+     */
+    private $sheetIndex = 0;
+
+    /**
+     * Formats
+     *
+     * @var array
+     */
+    private $formats = array();
+
+    /**
+     * Format Count
+     *
+     * @var int
+     */
+    private $format = 0;
+
+    /**
+     * Create a new PHPExcel_Reader_SYLK
+     */
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
+
+    /**
+     * Validate that the current file is a SYLK file
+     *
+     * @return boolean
+     */
+    protected function isValidFormat()
+    {
+        // Read sample data (first 2 KB will do)
+        $data = fread($this->fileHandle, 2048);
+
+        // Count delimiters in file
+        $delimiterCount = substr_count($data, ';');
+        if ($delimiterCount < 1) {
+            return false;
+        }
+
+        // Analyze first line looking for ID; signature
+        $lines = explode("\n", $data);
+        if (substr($lines[0], 0, 4) != 'ID;P') {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Set input encoding
+     *
+     * @param string $pValue Input encoding
+     */
+    public function setInputEncoding($pValue = 'ANSI')
+    {
+        $this->inputEncoding = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get input encoding
+     *
+     * @return string
+     */
+    public function getInputEncoding()
+    {
+        return $this->inputEncoding;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param   string     $pFilename
+     * @throws   PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Open file
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+        $fileHandle = $this->fileHandle;
+        rewind($fileHandle);
+
+        $worksheetInfo = array();
+        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
+        $worksheetInfo[0]['lastColumnLetter'] = 'A';
+        $worksheetInfo[0]['lastColumnIndex'] = 0;
+        $worksheetInfo[0]['totalRows'] = 0;
+        $worksheetInfo[0]['totalColumns'] = 0;
+
+        // Loop through file
+        $rowData = array();
+
+        // loop through one row (line) at a time in the file
+        $rowIndex = 0;
+        while (($rowData = fgets($fileHandle)) !== false) {
+            $columnIndex = 0;
+
+            // convert SYLK encoded $rowData to UTF-8
+            $rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
+
+            // explode each row at semicolons while taking into account that literal semicolon (;)
+            // is escaped like this (;;)
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
+
+            $dataType = array_shift($rowData);
+            if ($dataType == 'C') {
+                //  Read cell value data
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum[0]) {
+                        case 'C':
+                        case 'X':
+                            $columnIndex = substr($rowDatum, 1) - 1;
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $rowIndex = substr($rowDatum, 1);
+                            break;
+                    }
+
+                    $worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
+                    $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
+                }
+            }
+        }
+
+        $worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
+        $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+
+        // Close file
+        fclose($fileHandle);
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads PHPExcel from file
+     *
+     * @param     string         $pFilename
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
+
+        // Load into this instance
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
+
+    /**
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param     string         $pFilename
+     * @param    PHPExcel    $objPHPExcel
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        // Open file
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+        $fileHandle = $this->fileHandle;
+        rewind($fileHandle);
+
+        // Create new PHPExcel
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
+            $objPHPExcel->createSheet();
+        }
+        $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
+
+        $fromFormats    = array('\-',    '\ ');
+        $toFormats        = array('-',    ' ');
+
+        // Loop through file
+        $rowData = array();
+        $column = $row = '';
+
+        // loop through one row (line) at a time in the file
+        while (($rowData = fgets($fileHandle)) !== false) {
+            // convert SYLK encoded $rowData to UTF-8
+            $rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
+
+            // explode each row at semicolons while taking into account that literal semicolon (;)
+            // is escaped like this (;;)
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
+
+            $dataType = array_shift($rowData);
+            //    Read shared styles
+            if ($dataType == 'P') {
+                $formatArray = array();
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum[0]) {
+                        case 'P':
+                            $formatArray['numberformat']['code'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
+                            break;
+                        case 'E':
+                        case 'F':
+                            $formatArray['font']['name'] = substr($rowDatum, 1);
+                            break;
+                        case 'L':
+                            $formatArray['font']['size'] = substr($rowDatum, 1);
+                            break;
+                        case 'S':
+                            $styleSettings = substr($rowDatum, 1);
+                            for ($i=0; $i<strlen($styleSettings); ++$i) {
+                                switch ($styleSettings[$i]) {
+                                    case 'I':
+                                        $formatArray['font']['italic'] = true;
+                                        break;
+                                    case 'D':
+                                        $formatArray['font']['bold'] = true;
+                                        break;
+                                    case 'T':
+                                        $formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'B':
+                                        $formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'L':
+                                        $formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'R':
+                                        $formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                }
+                            }
+                            break;
+                    }
+                }
+                $this->formats['P'.$this->format++] = $formatArray;
+            //    Read cell value data
+            } elseif ($dataType == 'C') {
+                $hasCalculatedValue = false;
+                $cellData = $cellDataFormula = '';
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum[0]) {
+                        case 'C':
+                        case 'X':
+                            $column = substr($rowDatum, 1);
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
+                            break;
+                        case 'K':
+                            $cellData = substr($rowDatum, 1);
+                            break;
+                        case 'E':
+                            $cellDataFormula = '='.substr($rowDatum, 1);
+                            //    Convert R1C1 style references to A1 style references (but only when not quoted)
+                            $temp = explode('"', $cellDataFormula);
+                            $key = false;
+                            foreach ($temp as &$value) {
+                                //    Only count/replace in alternate array entries
+                                if ($key = !$key) {
+                                    preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
+                                    //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                                    //        through the formula from left to right. Reversing means that we work right to left.through
+                                    //        the formula
+                                    $cellReferences = array_reverse($cellReferences);
+                                    //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
+                                    //        then modify the formula to use that new reference
+                                    foreach ($cellReferences as $cellReference) {
+                                        $rowReference = $cellReference[2][0];
+                                        //    Empty R reference is the current row
+                                        if ($rowReference == '') {
+                                            $rowReference = $row;
+                                        }
+                                        //    Bracketed R references are relative to the current row
+                                        if ($rowReference[0] == '[') {
+                                            $rowReference = $row + trim($rowReference, '[]');
+                                        }
+                                        $columnReference = $cellReference[4][0];
+                                        //    Empty C reference is the current column
+                                        if ($columnReference == '') {
+                                            $columnReference = $column;
+                                        }
+                                        //    Bracketed C references are relative to the current column
+                                        if ($columnReference[0] == '[') {
+                                            $columnReference = $column + trim($columnReference, '[]');
+                                        }
+                                        $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+
+                                        $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                                    }
+                                }
+                            }
+                            unset($value);
+                            //    Then rebuild the formula string
+                            $cellDataFormula = implode('"', $temp);
+                            $hasCalculatedValue = true;
+                            break;
+                    }
+                }
+                $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+                $cellData = PHPExcel_Calculation::unwrapResult($cellData);
+
+                // Set cell value
+                $objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+                if ($hasCalculatedValue) {
+                    $cellData = PHPExcel_Calculation::unwrapResult($cellData);
+                    $objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
+                }
+            //    Read cell formatting
+            } elseif ($dataType == 'F') {
+                $formatStyle = $columnWidth = $styleSettings = '';
+                $styleData = array();
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum[0]) {
+                        case 'C':
+                        case 'X':
+                            $column = substr($rowDatum, 1);
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
+                            break;
+                        case 'P':
+                            $formatStyle = $rowDatum;
+                            break;
+                        case 'W':
+                            list($startCol, $endCol, $columnWidth) = explode(' ', substr($rowDatum, 1));
+                            break;
+                        case 'S':
+                            $styleSettings = substr($rowDatum, 1);
+                            for ($i=0; $i<strlen($styleSettings); ++$i) {
+                                switch ($styleSettings[$i]) {
+                                    case 'I':
+                                        $styleData['font']['italic'] = true;
+                                        break;
+                                    case 'D':
+                                        $styleData['font']['bold'] = true;
+                                        break;
+                                    case 'T':
+                                        $styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'B':
+                                        $styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'L':
+                                        $styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'R':
+                                        $styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                }
+                            }
+                            break;
+                    }
+                }
+                if (($formatStyle > '') && ($column > '') && ($row > '')) {
+                    $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+                    if (isset($this->formats[$formatStyle])) {
+                        $objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->formats[$formatStyle]);
+                    }
+                }
+                if ((!empty($styleData)) && ($column > '') && ($row > '')) {
+                    $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+                    $objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
+                }
+                if ($columnWidth > '') {
+                    if ($startCol == $endCol) {
+                        $startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+                        $objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
+                    } else {
+                        $startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+                        $endCol = PHPExcel_Cell::stringFromColumnIndex($endCol-1);
+                        $objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
+                        do {
+                            $objPHPExcel->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
+                        } while ($startCol != $endCol);
+                    }
+                }
+            } else {
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum[0]) {
+                        case 'C':
+                        case 'X':
+                            $column = substr($rowDatum, 1);
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
+                            break;
+                    }
+                }
+            }
+        }
+
+        // Close file
+        fclose($fileHandle);
+
+        // Return
+        return $objPHPExcel;
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return int
+     */
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param    int        $pValue        Sheet index
+     * @return PHPExcel_Reader_SYLK
+     */
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/ReferenceHelper.php b/lib/PHPExcel/ReferenceHelper.php
new file mode 100644
index 000000000..bdede7733
--- /dev/null
+++ b/lib/PHPExcel/ReferenceHelper.php
@@ -0,0 +1,913 @@
+<?php
+
+/**
+ * PHPExcel_ReferenceHelper (Singleton)
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_ReferenceHelper
+{
+    /**    Constants                */
+    /**    Regular Expressions      */
+    const REFHELPER_REGEXP_CELLREF      = '((\w*|\'[^!]*\')!)?(?<![:a-z\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])';
+    const REFHELPER_REGEXP_CELLRANGE    = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)';
+    const REFHELPER_REGEXP_ROWRANGE     = '((\w*|\'[^!]*\')!)?(\$?\d+):(\$?\d+)';
+    const REFHELPER_REGEXP_COLRANGE     = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
+
+    /**
+     * Instance of this class
+     *
+     * @var PHPExcel_ReferenceHelper
+     */
+    private static $instance;
+
+    /**
+     * Get an instance of this class
+     *
+     * @return PHPExcel_ReferenceHelper
+     */
+    public static function getInstance()
+    {
+        if (!isset(self::$instance) || (self::$instance === null)) {
+            self::$instance = new PHPExcel_ReferenceHelper();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Create a new PHPExcel_ReferenceHelper
+     */
+    protected function __construct()
+    {
+    }
+
+    /**
+     * Compare two column addresses
+     * Intended for use as a Callback function for sorting column addresses by column
+     *
+     * @param   string   $a  First column to test (e.g. 'AA')
+     * @param   string   $b  Second column to test (e.g. 'Z')
+     * @return  integer
+     */
+    public static function columnSort($a, $b)
+    {
+        return strcasecmp(strlen($a) . $a, strlen($b) . $b);
+    }
+
+    /**
+     * Compare two column addresses
+     * Intended for use as a Callback function for reverse sorting column addresses by column
+     *
+     * @param   string   $a  First column to test (e.g. 'AA')
+     * @param   string   $b  Second column to test (e.g. 'Z')
+     * @return  integer
+     */
+    public static function columnReverseSort($a, $b)
+    {
+        return 1 - strcasecmp(strlen($a) . $a, strlen($b) . $b);
+    }
+
+    /**
+     * Compare two cell addresses
+     * Intended for use as a Callback function for sorting cell addresses by column and row
+     *
+     * @param   string   $a  First cell to test (e.g. 'AA1')
+     * @param   string   $b  Second cell to test (e.g. 'Z1')
+     * @return  integer
+     */
+    public static function cellSort($a, $b)
+    {
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+
+        if ($ar == $br) {
+            return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+        }
+        return ($ar < $br) ? -1 : 1;
+    }
+
+    /**
+     * Compare two cell addresses
+     * Intended for use as a Callback function for sorting cell addresses by column and row
+     *
+     * @param   string   $a  First cell to test (e.g. 'AA1')
+     * @param   string   $b  Second cell to test (e.g. 'Z1')
+     * @return  integer
+     */
+    public static function cellReverseSort($a, $b)
+    {
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+
+        if ($ar == $br) {
+            return 1 - strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+        }
+        return ($ar < $br) ? 1 : -1;
+    }
+
+    /**
+     * Test whether a cell address falls within a defined range of cells
+     *
+     * @param   string     $cellAddress        Address of the cell we're testing
+     * @param   integer    $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer    $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     * @param   integer    $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer    $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @return  boolean
+     */
+    private static function cellAddressInDeleteRange($cellAddress, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)
+    {
+        list($cellColumn, $cellRow) = PHPExcel_Cell::coordinateFromString($cellAddress);
+        $cellColumnIndex = PHPExcel_Cell::columnIndexFromString($cellColumn);
+        //    Is cell within the range of rows/columns if we're deleting
+        if ($pNumRows < 0 &&
+            ($cellRow >= ($beforeRow + $pNumRows)) &&
+            ($cellRow < $beforeRow)) {
+            return true;
+        } elseif ($pNumCols < 0 &&
+            ($cellColumnIndex >= ($beforeColumnIndex + $pNumCols)) &&
+            ($cellColumnIndex < $beforeColumnIndex)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Update page breaks when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustPageBreaks(PHPExcel_Worksheet $pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aBreaks = $pSheet->getBreaks();
+        ($pNumCols > 0 || $pNumRows > 0) ?
+            uksort($aBreaks, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
+            uksort($aBreaks, array('PHPExcel_ReferenceHelper','cellSort'));
+
+        foreach ($aBreaks as $key => $value) {
+            if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
+                //    If we're deleting, then clear any defined breaks that are within the range
+                //        of rows/columns that we're deleting
+                $pSheet->setBreak($key, PHPExcel_Worksheet::BREAK_NONE);
+            } else {
+                //    Otherwise update any affected breaks by inserting a new break at the appropriate point
+                //        and removing the old affected break
+                $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+                if ($key != $newReference) {
+                    $pSheet->setBreak($newReference, $value)
+                        ->setBreak($key, PHPExcel_Worksheet::BREAK_NONE);
+                }
+            }
+        }
+    }
+
+    /**
+     * Update cell comments when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aComments = $pSheet->getComments();
+        $aNewComments = array(); // the new array of all comments
+
+        foreach ($aComments as $key => &$value) {
+            // Any comments inside a deleted range will be ignored
+            if (!self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
+                // Otherwise build a new array of comments indexed by the adjusted cell reference
+                $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+                $aNewComments[$newReference] = $value;
+            }
+        }
+        //    Replace the comments array with the new set of comments
+        $pSheet->setComments($aNewComments);
+    }
+
+    /**
+     * Update hyperlinks when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aHyperlinkCollection = $pSheet->getHyperlinkCollection();
+        ($pNumCols > 0 || $pNumRows > 0) ? uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) : uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellSort'));
+
+        foreach ($aHyperlinkCollection as $key => $value) {
+            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+            if ($key != $newReference) {
+                $pSheet->setHyperlink($newReference, $value);
+                $pSheet->setHyperlink($key, null);
+            }
+        }
+    }
+
+    /**
+     * Update data validations when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aDataValidationCollection = $pSheet->getDataValidationCollection();
+        ($pNumCols > 0 || $pNumRows > 0) ? uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) : uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellSort'));
+        
+        foreach ($aDataValidationCollection as $key => $value) {
+            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+            if ($key != $newReference) {
+                $pSheet->setDataValidation($newReference, $value);
+                $pSheet->setDataValidation($key, null);
+            }
+        }
+    }
+
+    /**
+     * Update merged cells when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aMergeCells = $pSheet->getMergeCells();
+        $aNewMergeCells = array(); // the new array of all merge cells
+        foreach ($aMergeCells as $key => &$value) {
+            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+            $aNewMergeCells[$newReference] = $newReference;
+        }
+        $pSheet->setMergeCells($aNewMergeCells); // replace the merge cells array
+    }
+
+    /**
+     * Update protected cells when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aProtectedCells = $pSheet->getProtectedCells();
+        ($pNumCols > 0 || $pNumRows > 0) ?
+            uksort($aProtectedCells, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
+            uksort($aProtectedCells, array('PHPExcel_ReferenceHelper','cellSort'));
+        foreach ($aProtectedCells as $key => $value) {
+            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+            if ($key != $newReference) {
+                $pSheet->protectCells($newReference, $value, true);
+                $pSheet->unprotectCells($key);
+            }
+        }
+    }
+
+    /**
+     * Update column dimensions when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aColumnDimensions = array_reverse($pSheet->getColumnDimensions(), true);
+        if (!empty($aColumnDimensions)) {
+            foreach ($aColumnDimensions as $objColumnDimension) {
+                $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', $pBefore, $pNumCols, $pNumRows);
+                list($newReference) = PHPExcel_Cell::coordinateFromString($newReference);
+                if ($objColumnDimension->getColumnIndex() != $newReference) {
+                    $objColumnDimension->setColumnIndex($newReference);
+                }
+            }
+            $pSheet->refreshColumnDimensions();
+        }
+    }
+
+    /**
+     * Update row dimensions when inserting/deleting rows/columns
+     *
+     * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
+     * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
+     * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
+     * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
+     * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    {
+        $aRowDimensions = array_reverse($pSheet->getRowDimensions(), true);
+        if (!empty($aRowDimensions)) {
+            foreach ($aRowDimensions as $objRowDimension) {
+                $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), $pBefore, $pNumCols, $pNumRows);
+                list(, $newReference) = PHPExcel_Cell::coordinateFromString($newReference);
+                if ($objRowDimension->getRowIndex() != $newReference) {
+                    $objRowDimension->setRowIndex($newReference);
+                }
+            }
+            $pSheet->refreshRowDimensions();
+
+            $copyDimension = $pSheet->getRowDimension($beforeRow - 1);
+            for ($i = $beforeRow; $i <= $beforeRow - 1 + $pNumRows; ++$i) {
+                $newDimension = $pSheet->getRowDimension($i);
+                $newDimension->setRowHeight($copyDimension->getRowHeight());
+                $newDimension->setVisible($copyDimension->getVisible());
+                $newDimension->setOutlineLevel($copyDimension->getOutlineLevel());
+                $newDimension->setCollapsed($copyDimension->getCollapsed());
+            }
+        }
+    }
+
+    /**
+     * Insert a new column or row, updating all possible related data
+     *
+     * @param   string              $pBefore    Insert before this cell address (e.g. 'A1')
+     * @param   integer             $pNumCols   Number of columns to insert/delete (negative values indicate deletion)
+     * @param   integer             $pNumRows   Number of rows to insert/delete (negative values indicate deletion)
+     * @param   PHPExcel_Worksheet  $pSheet     The worksheet that we're editing
+     * @throws  PHPExcel_Exception
+     */
+    public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = null)
+    {
+        $remove = ($pNumCols < 0 || $pNumRows < 0);
+        $aCellCollection = $pSheet->getCellCollection();
+
+        // Get coordinates of $pBefore
+        $beforeColumn    = 'A';
+        $beforeRow        = 1;
+        list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString($pBefore);
+        $beforeColumnIndex = PHPExcel_Cell::columnIndexFromString($beforeColumn);
+
+        // Clear cells if we are removing columns or rows
+        $highestColumn    = $pSheet->getHighestColumn();
+        $highestRow    = $pSheet->getHighestRow();
+
+        // 1. Clear column strips if we are removing columns
+        if ($pNumCols < 0 && $beforeColumnIndex - 2 + $pNumCols > 0) {
+            for ($i = 1; $i <= $highestRow - 1; ++$i) {
+                for ($j = $beforeColumnIndex - 1 + $pNumCols; $j <= $beforeColumnIndex - 2; ++$j) {
+                    $coordinate = PHPExcel_Cell::stringFromColumnIndex($j) . $i;
+                    $pSheet->removeConditionalStyles($coordinate);
+                    if ($pSheet->cellExists($coordinate)) {
+                        $pSheet->getCell($coordinate)->setValueExplicit('', PHPExcel_Cell_DataType::TYPE_NULL);
+                        $pSheet->getCell($coordinate)->setXfIndex(0);
+                    }
+                }
+            }
+        }
+
+        // 2. Clear row strips if we are removing rows
+        if ($pNumRows < 0 && $beforeRow - 1 + $pNumRows > 0) {
+            for ($i = $beforeColumnIndex - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
+                for ($j = $beforeRow + $pNumRows; $j <= $beforeRow - 1; ++$j) {
+                    $coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . $j;
+                    $pSheet->removeConditionalStyles($coordinate);
+                    if ($pSheet->cellExists($coordinate)) {
+                        $pSheet->getCell($coordinate)->setValueExplicit('', PHPExcel_Cell_DataType::TYPE_NULL);
+                        $pSheet->getCell($coordinate)->setXfIndex(0);
+                    }
+                }
+            }
+        }
+
+        // Loop through cells, bottom-up, and change cell coordinates
+        if ($remove) {
+            // It's faster to reverse and pop than to use unshift, especially with large cell collections
+            $aCellCollection = array_reverse($aCellCollection);
+        }
+        while ($cellID = array_pop($aCellCollection)) {
+            $cell = $pSheet->getCell($cellID);
+            $cellIndex = PHPExcel_Cell::columnIndexFromString($cell->getColumn());
+
+            if ($cellIndex-1 + $pNumCols < 0) {
+                continue;
+            }
+
+            // New coordinates
+            $newCoordinates = PHPExcel_Cell::stringFromColumnIndex($cellIndex-1 + $pNumCols) . ($cell->getRow() + $pNumRows);
+
+            // Should the cell be updated? Move value and cellXf index from one cell to another.
+            if (($cellIndex >= $beforeColumnIndex) && ($cell->getRow() >= $beforeRow)) {
+                // Update cell styles
+                $pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex());
+
+                // Insert this cell at its new location
+                if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
+                    // Formula should be adjusted
+                    $pSheet->getCell($newCoordinates)
+                           ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                } else {
+                    // Formula should not be adjusted
+                    $pSheet->getCell($newCoordinates)->setValue($cell->getValue());
+                }
+
+                // Clear the original cell
+                $pSheet->getCellCacheController()->deleteCacheData($cellID);
+            } else {
+                /*    We don't need to update styles for rows/columns before our insertion position,
+                        but we do still need to adjust any formulae    in those cells                    */
+                if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
+                    // Formula should be adjusted
+                    $cell->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                }
+
+            }
+        }
+
+        // Duplicate styles for the newly inserted cells
+        $highestColumn    = $pSheet->getHighestColumn();
+        $highestRow    = $pSheet->getHighestRow();
+
+        if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
+            for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
+                // Style
+                $coordinate = PHPExcel_Cell::stringFromColumnIndex($beforeColumnIndex - 2) . $i;
+                if ($pSheet->cellExists($coordinate)) {
+                    $xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
+                    $conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
+                        $pSheet->getConditionalStyles($coordinate) : false;
+                    for ($j = $beforeColumnIndex - 1; $j <= $beforeColumnIndex - 2 + $pNumCols; ++$j) {
+                        $pSheet->getCellByColumnAndRow($j, $i)->setXfIndex($xfIndex);
+                        if ($conditionalStyles) {
+                            $cloned = array();
+                            foreach ($conditionalStyles as $conditionalStyle) {
+                                $cloned[] = clone $conditionalStyle;
+                            }
+                            $pSheet->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($j) . $i, $cloned);
+                        }
+                    }
+                }
+
+            }
+        }
+
+        if ($pNumRows > 0 && $beforeRow - 1 > 0) {
+            for ($i = $beforeColumnIndex - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
+                // Style
+                $coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . ($beforeRow - 1);
+                if ($pSheet->cellExists($coordinate)) {
+                    $xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
+                    $conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
+                        $pSheet->getConditionalStyles($coordinate) : false;
+                    for ($j = $beforeRow; $j <= $beforeRow - 1 + $pNumRows; ++$j) {
+                        $pSheet->getCell(PHPExcel_Cell::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
+                        if ($conditionalStyles) {
+                            $cloned = array();
+                            foreach ($conditionalStyles as $conditionalStyle) {
+                                $cloned[] = clone $conditionalStyle;
+                            }
+                            $pSheet->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($i) . $j, $cloned);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Update worksheet: column dimensions
+        $this->adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        // Update worksheet: row dimensions
+        $this->adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        //    Update worksheet: page breaks
+        $this->adjustPageBreaks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        //    Update worksheet: comments
+        $this->adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        // Update worksheet: hyperlinks
+        $this->adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        // Update worksheet: data validations
+        $this->adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        // Update worksheet: merge cells
+        $this->adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        // Update worksheet: protected cells
+        $this->adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+
+        // Update worksheet: autofilter
+        $autoFilter = $pSheet->getAutoFilter();
+        $autoFilterRange = $autoFilter->getRange();
+        if (!empty($autoFilterRange)) {
+            if ($pNumCols != 0) {
+                $autoFilterColumns = array_keys($autoFilter->getColumns());
+                if (count($autoFilterColumns) > 0) {
+                    sscanf($pBefore, '%[A-Z]%d', $column, $row);
+                    $columnIndex = PHPExcel_Cell::columnIndexFromString($column);
+                    list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
+                    if ($columnIndex <= $rangeEnd[0]) {
+                        if ($pNumCols < 0) {
+                            //    If we're actually deleting any columns that fall within the autofilter range,
+                            //        then we delete any rules for those columns
+                            $deleteColumn = $columnIndex + $pNumCols - 1;
+                            $deleteCount = abs($pNumCols);
+                            for ($i = 1; $i <= $deleteCount; ++$i) {
+                                if (in_array(PHPExcel_Cell::stringFromColumnIndex($deleteColumn), $autoFilterColumns)) {
+                                    $autoFilter->clearColumn(PHPExcel_Cell::stringFromColumnIndex($deleteColumn));
+                                }
+                                ++$deleteColumn;
+                            }
+                        }
+                        $startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
+
+                        //    Shuffle columns in autofilter range
+                        if ($pNumCols > 0) {
+                            //    For insert, we shuffle from end to beginning to avoid overwriting
+                            $startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+                            $toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+                            $endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
+
+                            $startColRef = $startCol;
+                            $endColRef = $rangeEnd[0];
+                            $toColRef = $rangeEnd[0]+$pNumCols;
+
+                            do {
+                                $autoFilter->shiftColumn(PHPExcel_Cell::stringFromColumnIndex($endColRef-1), PHPExcel_Cell::stringFromColumnIndex($toColRef-1));
+                                --$endColRef;
+                                --$toColRef;
+                            } while ($startColRef <= $endColRef);
+                        } else {
+                            //    For delete, we shuffle from beginning to end to avoid overwriting
+                            $startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+                            $toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+                            $endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
+                            do {
+                                $autoFilter->shiftColumn($startColID, $toColID);
+                                ++$startColID;
+                                ++$toColID;
+                            } while ($startColID != $endColID);
+                        }
+                    }
+                }
+            }
+            $pSheet->setAutoFilter($this->updateCellReference($autoFilterRange, $pBefore, $pNumCols, $pNumRows));
+        }
+
+        // Update worksheet: freeze pane
+        if ($pSheet->getFreezePane() != '') {
+            $pSheet->freezePane($this->updateCellReference($pSheet->getFreezePane(), $pBefore, $pNumCols, $pNumRows));
+        }
+
+        // Page setup
+        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
+            $pSheet->getPageSetup()->setPrintArea($this->updateCellReference($pSheet->getPageSetup()->getPrintArea(), $pBefore, $pNumCols, $pNumRows));
+        }
+
+        // Update worksheet: drawings
+        $aDrawings = $pSheet->getDrawingCollection();
+        foreach ($aDrawings as $objDrawing) {
+            $newReference = $this->updateCellReference($objDrawing->getCoordinates(), $pBefore, $pNumCols, $pNumRows);
+            if ($objDrawing->getCoordinates() != $newReference) {
+                $objDrawing->setCoordinates($newReference);
+            }
+        }
+
+        // Update workbook: named ranges
+        if (count($pSheet->getParent()->getNamedRanges()) > 0) {
+            foreach ($pSheet->getParent()->getNamedRanges() as $namedRange) {
+                if ($namedRange->getWorksheet()->getHashCode() == $pSheet->getHashCode()) {
+                    $namedRange->setRange($this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows));
+                }
+            }
+        }
+
+        // Garbage collect
+        $pSheet->garbageCollect();
+    }
+
+    /**
+     * Update references within formulas
+     *
+     * @param    string    $pFormula    Formula to update
+     * @param    int        $pBefore    Insert before this one
+     * @param    int        $pNumCols    Number of columns to insert
+     * @param    int        $pNumRows    Number of rows to insert
+     * @param   string  $sheetName  Worksheet name/title
+     * @return    string    Updated formula
+     * @throws    PHPExcel_Exception
+     */
+    public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '')
+    {
+        //    Update cell references in the formula
+        $formulaBlocks = explode('"', $pFormula);
+        $i = false;
+        foreach ($formulaBlocks as &$formulaBlock) {
+            //    Ignore blocks that were enclosed in quotes (alternating entries in the $formulaBlocks array after the explode)
+            if ($i = !$i) {
+                $adjustCount = 0;
+                $newCellTokens = $cellTokens = array();
+                //    Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
+                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
+                        $fromString .= $match[3].':'.$match[4];
+                        $modified3 = substr($this->updateCellReference('$A'.$match[3], $pBefore, $pNumCols, $pNumRows), 2);
+                        $modified4 = substr($this->updateCellReference('$A'.$match[4], $pBefore, $pNumCols, $pNumRows), 2);
+
+                        if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                                $toString = ($match[2] > '') ? $match[2].'!' : '';
+                                $toString .= $modified3.':'.$modified4;
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = 100000;
+                                $row = 10000000 + trim($match[3], '$');
+                                $cellIndex = $column.$row;
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString);
+                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)'.preg_quote($fromString).'(?!\d)/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                //    Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
+                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
+                        $fromString .= $match[3].':'.$match[4];
+                        $modified3 = substr($this->updateCellReference($match[3].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+                        $modified4 = substr($this->updateCellReference($match[4].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+
+                        if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                                $toString = ($match[2] > '') ? $match[2].'!' : '';
+                                $toString .= $modified3.':'.$modified4;
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = PHPExcel_Cell::columnIndexFromString(trim($match[3], '$')) + 100000;
+                                $row = 10000000;
+                                $cellIndex = $column.$row;
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString);
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?![A-Z])/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                //    Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
+                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
+                        $fromString .= $match[3].':'.$match[4];
+                        $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
+                        $modified4 = $this->updateCellReference($match[4], $pBefore, $pNumCols, $pNumRows);
+
+                        if ($match[3].$match[4] !== $modified3.$modified4) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                                $toString = ($match[2] > '') ? $match[2].'!' : '';
+                                $toString .= $modified3.':'.$modified4;
+                                list($column, $row) = PHPExcel_Cell::coordinateFromString($match[3]);
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = PHPExcel_Cell::columnIndexFromString(trim($column, '$')) + 100000;
+                                $row = trim($row, '$') + 10000000;
+                                $cellIndex = $column.$row;
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString);
+                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)'.preg_quote($fromString).'(?!\d)/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                //    Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
+                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
+                        $fromString .= $match[3];
+
+                        $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
+                        if ($match[3] !== $modified3) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                                $toString = ($match[2] > '') ? $match[2].'!' : '';
+                                $toString .= $modified3;
+                                list($column, $row) = PHPExcel_Cell::coordinateFromString($match[3]);
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = PHPExcel_Cell::columnIndexFromString(trim($column, '$')) + 100000;
+                                $row = trim($row, '$') + 10000000;
+                                $cellIndex = $row . $column;
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString);
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?!\d)/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                if ($adjustCount > 0) {
+                    if ($pNumCols > 0 || $pNumRows > 0) {
+                        krsort($cellTokens);
+                        krsort($newCellTokens);
+                    } else {
+                        ksort($cellTokens);
+                        ksort($newCellTokens);
+                    }   //  Update cell references in the formula
+                    $formulaBlock = str_replace('\\', '', preg_replace($cellTokens, $newCellTokens, $formulaBlock));
+                }
+            }
+        }
+        unset($formulaBlock);
+
+        //    Then rebuild the formula string
+        return implode('"', $formulaBlocks);
+    }
+
+    /**
+     * Update cell reference
+     *
+     * @param    string    $pCellRange            Cell range
+     * @param    int        $pBefore            Insert before this one
+     * @param    int        $pNumCols            Number of columns to increment
+     * @param    int        $pNumRows            Number of rows to increment
+     * @return    string    Updated cell range
+     * @throws    PHPExcel_Exception
+     */
+    public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    {
+        // Is it in another worksheet? Will not have to update anything.
+        if (strpos($pCellRange, "!") !== false) {
+            return $pCellRange;
+        // Is it a range or a single cell?
+        } elseif (strpos($pCellRange, ':') === false && strpos($pCellRange, ',') === false) {
+            // Single cell
+            return $this->updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
+        } elseif (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
+            // Range
+            return $this->updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
+        } else {
+            // Return original
+            return $pCellRange;
+        }
+    }
+
+    /**
+     * Update named formulas (i.e. containing worksheet references / named ranges)
+     *
+     * @param PHPExcel $pPhpExcel    Object to update
+     * @param string $oldName        Old name (name to replace)
+     * @param string $newName        New name
+     */
+    public function updateNamedFormulas(PHPExcel $pPhpExcel, $oldName = '', $newName = '')
+    {
+        if ($oldName == '') {
+            return;
+        }
+
+        foreach ($pPhpExcel->getWorksheetIterator() as $sheet) {
+            foreach ($sheet->getCellCollection(false) as $cellID) {
+                $cell = $sheet->getCell($cellID);
+                if (($cell !== null) && ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA)) {
+                    $formula = $cell->getValue();
+                    if (strpos($formula, $oldName) !== false) {
+                        $formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
+                        $formula = str_replace($oldName . "!", $newName . "!", $formula);
+                        $cell->setValueExplicit($formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Update cell range
+     *
+     * @param    string    $pCellRange            Cell range    (e.g. 'B2:D4', 'B:C' or '2:3')
+     * @param    int        $pBefore            Insert before this one
+     * @param    int        $pNumCols            Number of columns to increment
+     * @param    int        $pNumRows            Number of rows to increment
+     * @return    string    Updated cell range
+     * @throws    PHPExcel_Exception
+     */
+    private function updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    {
+        if (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
+            // Update range
+            $range = PHPExcel_Cell::splitRange($pCellRange);
+            $ic = count($range);
+            for ($i = 0; $i < $ic; ++$i) {
+                $jc = count($range[$i]);
+                for ($j = 0; $j < $jc; ++$j) {
+                    if (ctype_alpha($range[$i][$j])) {
+                        $r = PHPExcel_Cell::coordinateFromString($this->updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
+                        $range[$i][$j] = $r[0];
+                    } elseif (ctype_digit($range[$i][$j])) {
+                        $r = PHPExcel_Cell::coordinateFromString($this->updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
+                        $range[$i][$j] = $r[1];
+                    } else {
+                        $range[$i][$j] = $this->updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
+                    }
+                }
+            }
+
+            // Recreate range string
+            return PHPExcel_Cell::buildRange($range);
+        } else {
+            throw new PHPExcel_Exception("Only cell ranges may be passed to this method.");
+        }
+    }
+
+    /**
+     * Update single cell reference
+     *
+     * @param    string    $pCellReference        Single cell reference
+     * @param    int        $pBefore            Insert before this one
+     * @param    int        $pNumCols            Number of columns to increment
+     * @param    int        $pNumRows            Number of rows to increment
+     * @return    string    Updated cell reference
+     * @throws    PHPExcel_Exception
+     */
+    private function updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    {
+        if (strpos($pCellReference, ':') === false && strpos($pCellReference, ',') === false) {
+            // Get coordinates of $pBefore
+            list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString($pBefore);
+
+            // Get coordinates of $pCellReference
+            list($newColumn, $newRow) = PHPExcel_Cell::coordinateFromString($pCellReference);
+
+            // Verify which parts should be updated
+            $updateColumn = (($newColumn[0] != '$') && ($beforeColumn[0] != '$') && (PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)));
+            $updateRow = (($newRow[0] != '$') && ($beforeRow[0] != '$') && $newRow >= $beforeRow);
+
+            // Create new column reference
+            if ($updateColumn) {
+                $newColumn    = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($newColumn) - 1 + $pNumCols);
+            }
+
+            // Create new row reference
+            if ($updateRow) {
+                $newRow    = $newRow + $pNumRows;
+            }
+
+            // Return new reference
+            return $newColumn . $newRow;
+        } else {
+            throw new PHPExcel_Exception("Only single cell references may be passed to this method.");
+        }
+    }
+
+    /**
+     * __clone implementation. Cloning should not be allowed in a Singleton!
+     *
+     * @throws    PHPExcel_Exception
+     */
+    final public function __clone()
+    {
+        throw new PHPExcel_Exception("Cloning a Singleton is not allowed!");
+    }
+}
diff --git a/lib/PHPExcel/RichText.php b/lib/PHPExcel/RichText.php
new file mode 100644
index 000000000..74a3534af
--- /dev/null
+++ b/lib/PHPExcel/RichText.php
@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * PHPExcel_RichText
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_RichText
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_RichText implements PHPExcel_IComparable
+{
+    /**
+     * Rich text elements
+     *
+     * @var PHPExcel_RichText_ITextElement[]
+     */
+    private $richTextElements;
+
+    /**
+     * Create a new PHPExcel_RichText instance
+     *
+     * @param PHPExcel_Cell $pCell
+     * @throws PHPExcel_Exception
+     */
+    public function __construct(PHPExcel_Cell $pCell = null)
+    {
+        // Initialise variables
+        $this->richTextElements = array();
+
+        // Rich-Text string attached to cell?
+        if ($pCell !== null) {
+            // Add cell text and style
+            if ($pCell->getValue() != "") {
+                $objRun = new PHPExcel_RichText_Run($pCell->getValue());
+                $objRun->setFont(clone $pCell->getParent()->getStyle($pCell->getCoordinate())->getFont());
+                $this->addText($objRun);
+            }
+
+            // Set parent value
+            $pCell->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
+        }
+    }
+
+    /**
+     * Add text
+     *
+     * @param PHPExcel_RichText_ITextElement $pText Rich text element
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_RichText
+     */
+    public function addText(PHPExcel_RichText_ITextElement $pText = null)
+    {
+        $this->richTextElements[] = $pText;
+        return $this;
+    }
+
+    /**
+     * Create text
+     *
+     * @param string $pText Text
+     * @return PHPExcel_RichText_TextElement
+     * @throws PHPExcel_Exception
+     */
+    public function createText($pText = '')
+    {
+        $objText = new PHPExcel_RichText_TextElement($pText);
+        $this->addText($objText);
+        return $objText;
+    }
+
+    /**
+     * Create text run
+     *
+     * @param string $pText Text
+     * @return PHPExcel_RichText_Run
+     * @throws PHPExcel_Exception
+     */
+    public function createTextRun($pText = '')
+    {
+        $objText = new PHPExcel_RichText_Run($pText);
+        $this->addText($objText);
+        return $objText;
+    }
+
+    /**
+     * Get plain text
+     *
+     * @return string
+     */
+    public function getPlainText()
+    {
+        // Return value
+        $returnValue = '';
+
+        // Loop through all PHPExcel_RichText_ITextElement
+        foreach ($this->richTextElements as $text) {
+            $returnValue .= $text->getText();
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+    /**
+     * Convert to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getPlainText();
+    }
+
+    /**
+     * Get Rich Text elements
+     *
+     * @return PHPExcel_RichText_ITextElement[]
+     */
+    public function getRichTextElements()
+    {
+        return $this->richTextElements;
+    }
+
+    /**
+     * Set Rich Text elements
+     *
+     * @param PHPExcel_RichText_ITextElement[] $pElements Array of elements
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_RichText
+     */
+    public function setRichTextElements($pElements = null)
+    {
+        if (is_array($pElements)) {
+            $this->richTextElements = $pElements;
+        } else {
+            throw new PHPExcel_Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        $hashElements = '';
+        foreach ($this->richTextElements as $element) {
+            $hashElements .= $element->getHashCode();
+        }
+
+        return md5(
+            $hashElements .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/RichText/ITextElement.php b/lib/PHPExcel/RichText/ITextElement.php
new file mode 100644
index 000000000..5db343201
--- /dev/null
+++ b/lib/PHPExcel/RichText/ITextElement.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * PHPExcel_RichText_ITextElement
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_RichText
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+interface PHPExcel_RichText_ITextElement
+{
+    /**
+     * Get text
+     *
+     * @return string    Text
+     */
+    public function getText();
+
+    /**
+     * Set text
+     *
+     * @param     $pText string    Text
+     * @return PHPExcel_RichText_ITextElement
+     */
+    public function setText($pText = '');
+
+    /**
+     * Get font
+     *
+     * @return PHPExcel_Style_Font
+     */
+    public function getFont();
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode();
+}
diff --git a/lib/PHPExcel/RichText/Run.php b/lib/PHPExcel/RichText/Run.php
new file mode 100644
index 000000000..5737bb0d6
--- /dev/null
+++ b/lib/PHPExcel/RichText/Run.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * PHPExcel_RichText_Run
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_RichText
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
+{
+    /**
+     * Font
+     *
+     * @var PHPExcel_Style_Font
+     */
+    private $font;
+
+    /**
+     * Create a new PHPExcel_RichText_Run instance
+     *
+     * @param     string        $pText        Text
+     */
+    public function __construct($pText = '')
+    {
+        // Initialise variables
+        $this->setText($pText);
+        $this->font = new PHPExcel_Style_Font();
+    }
+
+    /**
+     * Get font
+     *
+     * @return PHPExcel_Style_Font
+     */
+    public function getFont()
+    {
+        return $this->font;
+    }
+
+    /**
+     * Set font
+     *
+     * @param    PHPExcel_Style_Font        $pFont        Font
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_RichText_ITextElement
+     */
+    public function setFont(PHPExcel_Style_Font $pFont = null)
+    {
+        $this->font = $pFont;
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->getText() .
+            $this->font->getHashCode() .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/RichText/TextElement.php b/lib/PHPExcel/RichText/TextElement.php
new file mode 100644
index 000000000..f86e70315
--- /dev/null
+++ b/lib/PHPExcel/RichText/TextElement.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * PHPExcel_RichText_TextElement
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_RichText
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
+{
+    /**
+     * Text
+     *
+     * @var string
+     */
+    private $text;
+
+    /**
+     * Create a new PHPExcel_RichText_TextElement instance
+     *
+     * @param     string        $pText        Text
+     */
+    public function __construct($pText = '')
+    {
+        // Initialise variables
+        $this->text = $pText;
+    }
+
+    /**
+     * Get text
+     *
+     * @return string    Text
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set text
+     *
+     * @param     $pText string    Text
+     * @return PHPExcel_RichText_ITextElement
+     */
+    public function setText($pText = '')
+    {
+        $this->text = $pText;
+        return $this;
+    }
+
+    /**
+     * Get font
+     *
+     * @return PHPExcel_Style_Font
+     */
+    public function getFont()
+    {
+        return null;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->text .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Settings.php b/lib/PHPExcel/Settings.php
new file mode 100644
index 000000000..dcbc89fc0
--- /dev/null
+++ b/lib/PHPExcel/Settings.php
@@ -0,0 +1,389 @@
+<?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Settings
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Settings
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Settings
+{
+    /**    constants */
+    /**    Available Zip library classes */
+    const PCLZIP     = 'PHPExcel_Shared_ZipArchive';
+    const ZIPARCHIVE = 'ZipArchive';
+
+    /**    Optional Chart Rendering libraries */
+    const CHART_RENDERER_JPGRAPH = 'jpgraph';
+
+    /**    Optional PDF Rendering libraries */
+    const PDF_RENDERER_TCPDF  = 'tcPDF';
+    const PDF_RENDERER_DOMPDF = 'DomPDF';
+    const PDF_RENDERER_MPDF   = 'mPDF';
+
+
+    private static $chartRenderers = array(
+        self::CHART_RENDERER_JPGRAPH,
+    );
+
+    private static $pdfRenderers = array(
+        self::PDF_RENDERER_TCPDF,
+        self::PDF_RENDERER_DOMPDF,
+        self::PDF_RENDERER_MPDF,
+    );
+
+
+    /**
+     * Name of the class used for Zip file management
+     *    e.g.
+     *        ZipArchive
+     *
+     * @var string
+     */
+    private static $zipClass = self::ZIPARCHIVE;
+
+
+    /**
+     * Name of the external Library used for rendering charts
+     *    e.g.
+     *        jpgraph
+     *
+     * @var string
+     */
+    private static $chartRendererName;
+
+    /**
+     * Directory Path to the external Library used for rendering charts
+     *
+     * @var string
+     */
+    private static $chartRendererPath;
+
+
+    /**
+     * Name of the external Library used for rendering PDF files
+     *    e.g.
+     *         mPDF
+     *
+     * @var string
+     */
+    private static $pdfRendererName;
+
+    /**
+     * Directory Path to the external Library used for rendering PDF files
+     *
+     * @var string
+     */
+    private static $pdfRendererPath;
+
+    /**
+     * Default options for libxml loader
+     *
+     * @var int
+     */
+    private static $libXmlLoaderOptions = null;
+
+    /**
+     * Set the Zip handler Class that PHPExcel should use for Zip file management (PCLZip or ZipArchive)
+     *
+     * @param string $zipClass    The Zip handler class that PHPExcel should use for Zip file management
+     *      e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
+     * @return    boolean    Success or failure
+     */
+    public static function setZipClass($zipClass)
+    {
+        if (($zipClass === self::PCLZIP) ||
+            ($zipClass === self::ZIPARCHIVE)) {
+            self::$zipClass = $zipClass;
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Return the name of the Zip handler Class that PHPExcel is configured to use (PCLZip or ZipArchive)
+     *    or Zip file management
+     *
+     * @return string Name of the Zip handler Class that PHPExcel is configured to use
+     *    for Zip file management
+     *    e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
+     */
+    public static function getZipClass()
+    {
+        return self::$zipClass;
+    }
+
+
+    /**
+     * Return the name of the method that is currently configured for cell cacheing
+     *
+     * @return string Name of the cacheing method
+     */
+    public static function getCacheStorageMethod()
+    {
+        return PHPExcel_CachedObjectStorageFactory::getCacheStorageMethod();
+    }
+
+
+    /**
+     * Return the name of the class that is currently being used for cell cacheing
+     *
+     * @return string Name of the class currently being used for cacheing
+     */
+    public static function getCacheStorageClass()
+    {
+        return PHPExcel_CachedObjectStorageFactory::getCacheStorageClass();
+    }
+
+
+    /**
+     * Set the method that should be used for cell cacheing
+     *
+     * @param string $method Name of the cacheing method
+     * @param array $arguments Optional configuration arguments for the cacheing method
+     * @return boolean Success or failure
+     */
+    public static function setCacheStorageMethod($method = PHPExcel_CachedObjectStorageFactory::cache_in_memory, $arguments = array())
+    {
+        return PHPExcel_CachedObjectStorageFactory::initialize($method, $arguments);
+    }
+
+
+    /**
+     * Set the locale code to use for formula translations and any special formatting
+     *
+     * @param string $locale The locale code to use (e.g. "fr" or "pt_br" or "en_uk")
+     * @return boolean Success or failure
+     */
+    public static function setLocale($locale = 'en_us')
+    {
+        return PHPExcel_Calculation::getInstance()->setLocale($locale);
+    }
+
+
+    /**
+     * Set details of the external library that PHPExcel should use for rendering charts
+     *
+     * @param string $libraryName    Internal reference name of the library
+     *    e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+     * @param string $libraryBaseDir Directory path to the library's base folder
+     *
+     * @return    boolean    Success or failure
+     */
+    public static function setChartRenderer($libraryName, $libraryBaseDir)
+    {
+        if (!self::setChartRendererName($libraryName)) {
+            return false;
+        }
+        return self::setChartRendererPath($libraryBaseDir);
+    }
+
+
+    /**
+     * Identify to PHPExcel the external library to use for rendering charts
+     *
+     * @param string $libraryName    Internal reference name of the library
+     *    e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+     *
+     * @return    boolean    Success or failure
+     */
+    public static function setChartRendererName($libraryName)
+    {
+        if (!in_array($libraryName, self::$chartRenderers)) {
+            return false;
+        }
+        self::$chartRendererName = $libraryName;
+
+        return true;
+    }
+
+
+    /**
+     * Tell PHPExcel where to find the external library to use for rendering charts
+     *
+     * @param string $libraryBaseDir    Directory path to the library's base folder
+     * @return    boolean    Success or failure
+     */
+    public static function setChartRendererPath($libraryBaseDir)
+    {
+        if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
+            return false;
+        }
+        self::$chartRendererPath = $libraryBaseDir;
+
+        return true;
+    }
+
+
+    /**
+     * Return the Chart Rendering Library that PHPExcel is currently configured to use (e.g. jpgraph)
+     *
+     * @return string|NULL Internal reference name of the Chart Rendering Library that PHPExcel is
+     *    currently configured to use
+     *    e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+     */
+    public static function getChartRendererName()
+    {
+        return self::$chartRendererName;
+    }
+
+
+    /**
+     * Return the directory path to the Chart Rendering Library that PHPExcel is currently configured to use
+     *
+     * @return string|NULL Directory Path to the Chart Rendering Library that PHPExcel is
+     *     currently configured to use
+     */
+    public static function getChartRendererPath()
+    {
+        return self::$chartRendererPath;
+    }
+
+
+    /**
+     * Set details of the external library that PHPExcel should use for rendering PDF files
+     *
+     * @param string $libraryName Internal reference name of the library
+     *     e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+     *     PHPExcel_Settings::PDF_RENDERER_DOMPDF
+     *  or PHPExcel_Settings::PDF_RENDERER_MPDF
+     * @param string $libraryBaseDir Directory path to the library's base folder
+     *
+     * @return boolean Success or failure
+     */
+    public static function setPdfRenderer($libraryName, $libraryBaseDir)
+    {
+        if (!self::setPdfRendererName($libraryName)) {
+            return false;
+        }
+        return self::setPdfRendererPath($libraryBaseDir);
+    }
+
+
+    /**
+     * Identify to PHPExcel the external library to use for rendering PDF files
+     *
+     * @param string $libraryName Internal reference name of the library
+     *     e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+     *    PHPExcel_Settings::PDF_RENDERER_DOMPDF
+     *     or PHPExcel_Settings::PDF_RENDERER_MPDF
+     *
+     * @return boolean Success or failure
+     */
+    public static function setPdfRendererName($libraryName)
+    {
+        if (!in_array($libraryName, self::$pdfRenderers)) {
+            return false;
+        }
+        self::$pdfRendererName = $libraryName;
+
+        return true;
+    }
+
+
+    /**
+     * Tell PHPExcel where to find the external library to use for rendering PDF files
+     *
+     * @param string $libraryBaseDir Directory path to the library's base folder
+     * @return boolean Success or failure
+     */
+    public static function setPdfRendererPath($libraryBaseDir)
+    {
+        if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
+            return false;
+        }
+        self::$pdfRendererPath = $libraryBaseDir;
+
+        return true;
+    }
+
+
+    /**
+     * Return the PDF Rendering Library that PHPExcel is currently configured to use (e.g. dompdf)
+     *
+     * @return string|NULL Internal reference name of the PDF Rendering Library that PHPExcel is
+     *     currently configured to use
+     *  e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+     *  PHPExcel_Settings::PDF_RENDERER_DOMPDF
+     *  or PHPExcel_Settings::PDF_RENDERER_MPDF
+     */
+    public static function getPdfRendererName()
+    {
+        return self::$pdfRendererName;
+    }
+
+    /**
+     * Return the directory path to the PDF Rendering Library that PHPExcel is currently configured to use
+     *
+     * @return string|NULL Directory Path to the PDF Rendering Library that PHPExcel is
+     *        currently configured to use
+     */
+    public static function getPdfRendererPath()
+    {
+        return self::$pdfRendererPath;
+    }
+
+    /**
+     * Set options for libxml loader
+     *
+     * @param   int   $options   Options for libxml loader
+     */
+    public static function setLibXmlLoaderOptions($options = null)
+    {
+        if (is_null($options) && defined('LIBXML_DTDLOAD')) {
+            $options = LIBXML_DTDLOAD | LIBXML_DTDATTR;
+        }
+        if (version_compare(PHP_VERSION, '5.2.11') >= 0) {
+            @libxml_disable_entity_loader((bool) $options);
+        }
+        self::$libXmlLoaderOptions = $options;
+    }
+
+    /**
+     * Get defined options for libxml loader.
+     * Defaults to LIBXML_DTDLOAD | LIBXML_DTDATTR when not set explicitly.
+     *
+     * @return int Default options for libxml loader
+     */
+    public static function getLibXmlLoaderOptions()
+    {
+        if (is_null(self::$libXmlLoaderOptions) && defined('LIBXML_DTDLOAD')) {
+            self::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR);
+        } elseif (is_null(self::$libXmlLoaderOptions)) {
+            self::$libXmlLoaderOptions = true;
+        }
+        if (version_compare(PHP_VERSION, '5.2.11') >= 0) {
+            @libxml_disable_entity_loader((bool) self::$libXmlLoaderOptions);
+        }
+        return self::$libXmlLoaderOptions;
+    }
+}
diff --git a/lib/PHPExcel/Shared/CodePage.php b/lib/PHPExcel/Shared/CodePage.php
new file mode 100644
index 000000000..b3e440e29
--- /dev/null
+++ b/lib/PHPExcel/Shared/CodePage.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * PHPExcel_Shared_CodePage
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_CodePage
+{
+    /**
+     * Convert Microsoft Code Page Identifier to Code Page Name which iconv
+     * and mbstring understands
+     *
+     * @param integer $codePage Microsoft Code Page Indentifier
+     * @return string Code Page Name
+     * @throws PHPExcel_Exception
+     */
+    public static function NumberToName($codePage = 1252)
+    {
+        switch ($codePage) {
+            case 367:
+                return 'ASCII';    //    ASCII
+            case 437:
+                return 'CP437';    //    OEM US
+            case 720:
+                throw new PHPExcel_Exception('Code page 720 not supported.');    //    OEM Arabic
+            case 737:
+                return 'CP737';    //    OEM Greek
+            case 775:
+                return 'CP775';    //    OEM Baltic
+            case 850:
+                return 'CP850';    //    OEM Latin I
+            case 852:
+                return 'CP852';    //    OEM Latin II (Central European)
+            case 855:
+                return 'CP855';    //    OEM Cyrillic
+            case 857:
+                return 'CP857';    //    OEM Turkish
+            case 858:
+                return 'CP858';    //    OEM Multilingual Latin I with Euro
+            case 860:
+                return 'CP860';    //    OEM Portugese
+            case 861:
+                return 'CP861';    //    OEM Icelandic
+            case 862:
+                return 'CP862';    //    OEM Hebrew
+            case 863:
+                return 'CP863';    //    OEM Canadian (French)
+            case 864:
+                return 'CP864';    //    OEM Arabic
+            case 865:
+                return 'CP865';    //    OEM Nordic
+            case 866:
+                return 'CP866';    //    OEM Cyrillic (Russian)
+            case 869:
+                return 'CP869';    //    OEM Greek (Modern)
+            case 874:
+                return 'CP874';    //    ANSI Thai
+            case 932:
+                return 'CP932';    //    ANSI Japanese Shift-JIS
+            case 936:
+                return 'CP936';    //    ANSI Chinese Simplified GBK
+            case 949:
+                return 'CP949';    //    ANSI Korean (Wansung)
+            case 950:
+                return 'CP950';    //    ANSI Chinese Traditional BIG5
+            case 1200:
+                return 'UTF-16LE'; //    UTF-16 (BIFF8)
+            case 1250:
+                return 'CP1250';   //    ANSI Latin II (Central European)
+            case 1251:
+                return 'CP1251';   //    ANSI Cyrillic
+            case 0:
+                //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
+            case 1252:
+                return 'CP1252';   //    ANSI Latin I (BIFF4-BIFF7)
+            case 1253:
+                return 'CP1253';   //    ANSI Greek
+            case 1254:
+                return 'CP1254';   //    ANSI Turkish
+            case 1255:
+                return 'CP1255';   //    ANSI Hebrew
+            case 1256:
+                return 'CP1256';   //    ANSI Arabic
+            case 1257:
+                return 'CP1257';   //    ANSI Baltic
+            case 1258:
+                return 'CP1258';   //    ANSI Vietnamese
+            case 1361:
+                return 'CP1361';   //    ANSI Korean (Johab)
+            case 10000:
+                return 'MAC';      //    Apple Roman
+            case 10001:
+                return 'CP932';    //    Macintosh Japanese
+            case 10002:
+                return 'CP950';    //    Macintosh Chinese Traditional
+            case 10003:
+                return 'CP1361';   //    Macintosh Korean
+            case 10004:	
+                return 'MACARABIC';  //	Apple Arabic
+            case 10005:
+                return 'MACHEBREW';		//	Apple Hebrew
+            case 10006:
+                return 'MACGREEK';  //    Macintosh Greek
+            case 10007:
+                return 'MACCYRILLIC';  //    Macintosh Cyrillic
+            case 10008:
+                return 'CP936';  //    Macintosh - Simplified Chinese (GB 2312)
+            case 10010:
+                return 'MACROMANIA';	//	Macintosh Romania
+            case 10017:
+                return 'MACUKRAINE';	//	Macintosh Ukraine
+            case 10021:
+                return 'MACTHAI';	//	Macintosh Thai
+            case 10029:
+                return 'MACCENTRALEUROPE';  //    Macintosh Central Europe
+            case 10079:
+                return 'MACICELAND';  //    Macintosh Icelandic
+            case 10081:
+                return 'MACTURKISH';  //    Macintosh Turkish
+            case 10082:
+                return 'MACCROATIAN';	//	Macintosh Croatian
+            case 21010:
+                return 'UTF-16LE';  //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
+            case 32768:
+                return 'MAC';      //    Apple Roman
+            case 32769:
+                throw new PHPExcel_Exception('Code page 32769 not supported.');  //    ANSI Latin I (BIFF2-BIFF3)
+            case 65000:
+                return 'UTF-7';    //    Unicode (UTF-7)
+            case 65001:
+                return 'UTF-8';    //    Unicode (UTF-8)
+        }
+        throw new PHPExcel_Exception('Unknown codepage: ' . $codePage);
+    }
+}
diff --git a/lib/PHPExcel/Shared/Date.php b/lib/PHPExcel/Shared/Date.php
new file mode 100644
index 000000000..b00a39a3d
--- /dev/null
+++ b/lib/PHPExcel/Shared/Date.php
@@ -0,0 +1,418 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Date
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Date
+{
+    /** constants */
+    const CALENDAR_WINDOWS_1900 = 1900;        //    Base date of 1st Jan 1900 = 1.0
+    const CALENDAR_MAC_1904 = 1904;            //    Base date of 2nd Jan 1904 = 1.0
+
+    /*
+     * Names of the months of the year, indexed by shortname
+     * Planned usage for locale settings
+     *
+     * @public
+     * @var    string[]
+     */
+    public static $monthNames = array(
+        'Jan' => 'January',
+        'Feb' => 'February',
+        'Mar' => 'March',
+        'Apr' => 'April',
+        'May' => 'May',
+        'Jun' => 'June',
+        'Jul' => 'July',
+        'Aug' => 'August',
+        'Sep' => 'September',
+        'Oct' => 'October',
+        'Nov' => 'November',
+        'Dec' => 'December',
+    );
+
+    /*
+     * Names of the months of the year, indexed by shortname
+     * Planned usage for locale settings
+     *
+     * @public
+     * @var    string[]
+     */
+    public static $numberSuffixes = array(
+        'st',
+        'nd',
+        'rd',
+        'th',
+    );
+
+    /*
+     * Base calendar year to use for calculations
+     *
+     * @private
+     * @var    int
+     */
+    protected static $excelBaseDate = self::CALENDAR_WINDOWS_1900;
+
+    /**
+     * Set the Excel calendar (Windows 1900 or Mac 1904)
+     *
+     * @param     integer    $baseDate           Excel base date (1900 or 1904)
+     * @return    boolean                        Success or failure
+     */
+    public static function setExcelCalendar($baseDate)
+    {
+        if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
+            ($baseDate == self::CALENDAR_MAC_1904)) {
+            self::$excelBaseDate = $baseDate;
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Return the Excel calendar (Windows 1900 or Mac 1904)
+     *
+     * @return     integer    Excel base date (1900 or 1904)
+     */
+    public static function getExcelCalendar()
+    {
+        return self::$excelBaseDate;
+    }
+
+
+    /**
+     *    Convert a date from Excel to PHP
+     *
+     *    @param        integer        $dateValue            Excel date/time value
+     *    @param        boolean        $adjustToTimezone    Flag indicating whether $dateValue should be treated as
+     *                                                    a UST timestamp, or adjusted to UST
+     *    @param        string         $timezone            The timezone for finding the adjustment from UST
+     *    @return       integer        PHP serialized date/time
+     */
+    public static function ExcelToPHP($dateValue = 0, $adjustToTimezone = false, $timezone = null)
+    {
+        if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
+            $myexcelBaseDate = 25569;
+            //    Adjust for the spurious 29-Feb-1900 (Day 60)
+            if ($dateValue < 60) {
+                --$myexcelBaseDate;
+            }
+        } else {
+            $myexcelBaseDate = 24107;
+        }
+
+        // Perform conversion
+        if ($dateValue >= 1) {
+            $utcDays = $dateValue - $myexcelBaseDate;
+            $returnValue = round($utcDays * 86400);
+            if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
+                $returnValue = (integer) $returnValue;
+            }
+        } else {
+            $hours = round($dateValue * 24);
+            $mins = round($dateValue * 1440) - round($hours * 60);
+            $secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
+            $returnValue = (integer) gmmktime($hours, $mins, $secs);
+        }
+
+        $timezoneAdjustment = ($adjustToTimezone) ?
+            PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone, $returnValue) :
+            0;
+
+        return $returnValue + $timezoneAdjustment;
+    }
+
+
+    /**
+     * Convert a date from Excel to a PHP Date/Time object
+     *
+     * @param    integer        $dateValue        Excel date/time value
+     * @return    DateTime                    PHP date/time object
+     */
+    public static function ExcelToPHPObject($dateValue = 0)
+    {
+        $dateTime = self::ExcelToPHP($dateValue);
+        $days = floor($dateTime / 86400);
+        $time = round((($dateTime / 86400) - $days) * 86400);
+        $hours = round($time / 3600);
+        $minutes = round($time / 60) - ($hours * 60);
+        $seconds = round($time) - ($hours * 3600) - ($minutes * 60);
+
+        $dateObj = date_create('1-Jan-1970+'.$days.' days');
+        $dateObj->setTime($hours, $minutes, $seconds);
+
+        return $dateObj;
+    }
+
+
+    /**
+     *    Convert a date from PHP to Excel
+     *
+     *    @param    mixed        $dateValue            PHP serialized date/time or date object
+     *    @param    boolean        $adjustToTimezone    Flag indicating whether $dateValue should be treated as
+     *                                                    a UST timestamp, or adjusted to UST
+     *    @param    string         $timezone            The timezone for finding the adjustment from UST
+     *    @return    mixed        Excel date/time value
+     *                            or boolean FALSE on failure
+     */
+    public static function PHPToExcel($dateValue = 0, $adjustToTimezone = false, $timezone = null)
+    {
+        $saveTimeZone = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+
+        $timezoneAdjustment = ($adjustToTimezone) ?
+            PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone ? $timezone : $saveTimeZone, $dateValue) :
+            0;
+
+        $retValue = false;
+        if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
+            $dateValue->add(new DateInterval('PT' . $timezoneAdjustment . 'S'));
+            $retValue = self::FormattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'), $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s'));
+        } elseif (is_numeric($dateValue)) {
+            $dateValue += $timezoneAdjustment;
+            $retValue = self::FormattedPHPToExcel(date('Y', $dateValue), date('m', $dateValue), date('d', $dateValue), date('H', $dateValue), date('i', $dateValue), date('s', $dateValue));
+        } elseif (is_string($dateValue)) {
+            $retValue = self::stringToExcel($dateValue);
+        }
+        date_default_timezone_set($saveTimeZone);
+
+        return $retValue;
+    }
+
+
+    /**
+     * FormattedPHPToExcel
+     *
+     * @param    integer    $year
+     * @param    integer    $month
+     * @param    integer    $day
+     * @param    integer    $hours
+     * @param    integer    $minutes
+     * @param    integer    $seconds
+     * @return   integer    Excel date/time value
+     */
+    public static function FormattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0)
+    {
+        if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
+            //
+            //    Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
+            //    This affects every date following 28th February 1900
+            //
+            $excel1900isLeapYear = true;
+            if (($year == 1900) && ($month <= 2)) {
+                $excel1900isLeapYear = false;
+            }
+            $myexcelBaseDate = 2415020;
+        } else {
+            $myexcelBaseDate = 2416481;
+            $excel1900isLeapYear = false;
+        }
+
+        //    Julian base date Adjustment
+        if ($month > 2) {
+            $month -= 3;
+        } else {
+            $month += 9;
+            --$year;
+        }
+
+        //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
+        $century = substr($year, 0, 2);
+        $decade = substr($year, 2, 2);
+        $excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myexcelBaseDate + $excel1900isLeapYear;
+
+        $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
+
+        return (float) $excelDate + $excelTime;
+    }
+
+
+    /**
+     * Is a given cell a date/time?
+     *
+     * @param     PHPExcel_Cell    $pCell
+     * @return     boolean
+     */
+    public static function isDateTime(PHPExcel_Cell $pCell)
+    {
+        return self::isDateTimeFormat(
+            $pCell->getWorksheet()->getStyle(
+                $pCell->getCoordinate()
+            )->getNumberFormat()
+        );
+    }
+
+
+    /**
+     * Is a given number format a date/time?
+     *
+     * @param     PHPExcel_Style_NumberFormat    $pFormat
+     * @return     boolean
+     */
+    public static function isDateTimeFormat(PHPExcel_Style_NumberFormat $pFormat)
+    {
+        return self::isDateTimeFormatCode($pFormat->getFormatCode());
+    }
+
+
+    private static $possibleDateFormatCharacters = 'eymdHs';
+
+    /**
+     * Is a given number format code a date/time?
+     *
+     * @param     string    $pFormatCode
+     * @return     boolean
+     */
+    public static function isDateTimeFormatCode($pFormatCode = '')
+    {
+        if (strtolower($pFormatCode) === strtolower(PHPExcel_Style_NumberFormat::FORMAT_GENERAL)) {
+            //    "General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
+            return false;
+        }
+        if (preg_match('/[0#]E[+-]0/i', $pFormatCode)) {
+            //    Scientific format
+            return false;
+        }
+
+        // Switch on formatcode
+        switch ($pFormatCode) {
+            //    Explicitly defined date formats
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DDMMYYYY:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYSLASH:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYMINUS:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMMINUS:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_MYMINUS:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME1:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME2:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME5:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME6:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME7:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME8:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDDSLASH:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX14:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
+                return true;
+        }
+
+        //    Typically number, currency or accounting (or occasionally fraction) formats
+        if ((substr($pFormatCode, 0, 1) == '_') || (substr($pFormatCode, 0, 2) == '0 ')) {
+            return false;
+        }
+        // Try checking for any of the date formatting characters that don't appear within square braces
+        if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $pFormatCode)) {
+            //    We might also have a format mask containing quoted strings...
+            //        we don't want to test for any of our characters within the quoted blocks
+            if (strpos($pFormatCode, '"') !== false) {
+                $segMatcher = false;
+                foreach (explode('"', $pFormatCode) as $subVal) {
+                    //    Only test in alternate array entries (the non-quoted blocks)
+                    if (($segMatcher = !$segMatcher) &&
+                        (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $subVal))) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            return true;
+        }
+
+        // No date...
+        return false;
+    }
+
+
+    /**
+     * Convert a date/time string to Excel time
+     *
+     * @param    string    $dateValue        Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
+     * @return    float|FALSE        Excel date/time serial value
+     */
+    public static function stringToExcel($dateValue = '')
+    {
+        if (strlen($dateValue) < 2) {
+            return false;
+        }
+        if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue)) {
+            return false;
+        }
+
+        $dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
+
+        if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
+            return false;
+        }
+
+        if (strpos($dateValue, ':') !== false) {
+            $timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
+            if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
+                return false;
+            }
+            $dateValueNew += $timeValue;
+        }
+        return $dateValueNew;
+    }
+
+    /**
+     * Converts a month name (either a long or a short name) to a month number
+     *
+     * @param     string    $month    Month name or abbreviation
+     * @return    integer|string     Month number (1 - 12), or the original string argument if it isn't a valid month name
+     */
+    public static function monthStringToNumber($month)
+    {
+        $monthIndex = 1;
+        foreach (self::$monthNames as $shortMonthName => $longMonthName) {
+            if (($month === $longMonthName) || ($month === $shortMonthName)) {
+                return $monthIndex;
+            }
+            ++$monthIndex;
+        }
+        return $month;
+    }
+
+    /**
+     * Strips an ordinal froma numeric value
+     *
+     * @param     string    $day      Day number with an ordinal
+     * @return    integer|string      The integer value with any ordinal stripped, or the original string argument if it isn't a valid numeric
+     */
+    public static function dayStringToNumber($day)
+    {
+        $strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
+        if (is_numeric($strippedDayValue)) {
+            return (integer) $strippedDayValue;
+        }
+        return $day;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Drawing.php b/lib/PHPExcel/Shared/Drawing.php
new file mode 100644
index 000000000..3e027b4ad
--- /dev/null
+++ b/lib/PHPExcel/Shared/Drawing.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Shared_Drawing
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Shared_Drawing
+{
+    /**
+     * Convert pixels to EMU
+     *
+     * @param     int $pValue    Value in pixels
+     * @return     int            Value in EMU
+     */
+    public static function pixelsToEMU($pValue = 0)
+    {
+        return round($pValue * 9525);
+    }
+
+    /**
+     * Convert EMU to pixels
+     *
+     * @param     int $pValue    Value in EMU
+     * @return     int            Value in pixels
+     */
+    public static function EMUToPixels($pValue = 0)
+    {
+        if ($pValue != 0) {
+            return round($pValue / 9525);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Convert pixels to column width. Exact algorithm not known.
+     * By inspection of a real Excel file using Calibri 11, one finds 1000px ~ 142.85546875
+     * This gives a conversion factor of 7. Also, we assume that pixels and font size are proportional.
+     *
+     * @param     int $pValue    Value in pixels
+     * @param     PHPExcel_Style_Font $pDefaultFont    Default font of the workbook
+     * @return     int            Value in cell dimension
+     */
+    public static function pixelsToCellDimension($pValue = 0, PHPExcel_Style_Font $pDefaultFont)
+    {
+        // Font name and size
+        $name = $pDefaultFont->getName();
+        $size = $pDefaultFont->getSize();
+
+        if (isset(PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size])) {
+            // Exact width can be determined
+            $colWidth = $pValue * PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['width'] / PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['px'];
+        } else {
+            // We don't have data for this particular font and size, use approximation by
+            // extrapolating from Calibri 11
+            $colWidth = $pValue * 11 * PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['width'] / PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['px'] / $size;
+        }
+
+        return $colWidth;
+    }
+
+    /**
+     * Convert column width from (intrinsic) Excel units to pixels
+     *
+     * @param     float    $pValue        Value in cell dimension
+     * @param     PHPExcel_Style_Font $pDefaultFont    Default font of the workbook
+     * @return     int        Value in pixels
+     */
+    public static function cellDimensionToPixels($pValue = 0, PHPExcel_Style_Font $pDefaultFont)
+    {
+        // Font name and size
+        $name = $pDefaultFont->getName();
+        $size = $pDefaultFont->getSize();
+
+        if (isset(PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size])) {
+            // Exact width can be determined
+            $colWidth = $pValue * PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['px'] / PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['width'];
+        } else {
+            // We don't have data for this particular font and size, use approximation by
+            // extrapolating from Calibri 11
+            $colWidth = $pValue * $size * PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['px'] / PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['width'] / 11;
+        }
+
+        // Round pixels to closest integer
+        $colWidth = (int) round($colWidth);
+
+        return $colWidth;
+    }
+
+    /**
+     * Convert pixels to points
+     *
+     * @param     int $pValue    Value in pixels
+     * @return     int            Value in points
+     */
+    public static function pixelsToPoints($pValue = 0)
+    {
+        return $pValue * 0.67777777;
+    }
+
+    /**
+     * Convert points to pixels
+     *
+     * @param     int $pValue    Value in points
+     * @return     int            Value in pixels
+     */
+    public static function pointsToPixels($pValue = 0)
+    {
+        if ($pValue != 0) {
+            return (int) ceil($pValue * 1.333333333);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Convert degrees to angle
+     *
+     * @param     int $pValue    Degrees
+     * @return     int            Angle
+     */
+    public static function degreesToAngle($pValue = 0)
+    {
+        return (int)round($pValue * 60000);
+    }
+
+    /**
+     * Convert angle to degrees
+     *
+     * @param     int $pValue    Angle
+     * @return     int            Degrees
+     */
+    public static function angleToDegrees($pValue = 0)
+    {
+        if ($pValue != 0) {
+            return round($pValue / 60000);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Create a new image from file. By alexander at alexauto dot nl
+     *
+     * @link http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
+     * @param string $filename Path to Windows DIB (BMP) image
+     * @return resource
+     */
+    public static function imagecreatefrombmp($p_sFile)
+    {
+        //    Load the image into a string
+        $file = fopen($p_sFile, "rb");
+        $read = fread($file, 10);
+        while (!feof($file) && ($read<>"")) {
+            $read .= fread($file, 1024);
+        }
+
+        $temp = unpack("H*", $read);
+        $hex = $temp[1];
+        $header = substr($hex, 0, 108);
+
+        //    Process the header
+        //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
+        if (substr($header, 0, 4)=="424d") {
+            //    Cut it in parts of 2 bytes
+            $header_parts = str_split($header, 2);
+
+            //    Get the width        4 bytes
+            $width = hexdec($header_parts[19].$header_parts[18]);
+
+            //    Get the height        4 bytes
+            $height = hexdec($header_parts[23].$header_parts[22]);
+
+            //    Unset the header params
+            unset($header_parts);
+        }
+
+        //    Define starting X and Y
+        $x = 0;
+        $y = 1;
+
+        //    Create newimage
+        $image = imagecreatetruecolor($width, $height);
+
+        //    Grab the body from the image
+        $body = substr($hex, 108);
+
+        //    Calculate if padding at the end-line is needed
+        //    Divided by two to keep overview.
+        //    1 byte = 2 HEX-chars
+        $body_size = (strlen($body)/2);
+        $header_size = ($width*$height);
+
+        //    Use end-line padding? Only when needed
+        $usePadding = ($body_size>($header_size*3)+4);
+
+        //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
+        //    Calculate the next DWORD-position in the body
+        for ($i = 0; $i < $body_size; $i += 3) {
+            //    Calculate line-ending and padding
+            if ($x >= $width) {
+                // If padding needed, ignore image-padding
+                // Shift i to the ending of the current 32-bit-block
+                if ($usePadding) {
+                    $i += $width%4;
+                }
+
+                //    Reset horizontal position
+                $x = 0;
+
+                //    Raise the height-position (bottom-up)
+                $y++;
+
+                //    Reached the image-height? Break the for-loop
+                if ($y > $height) {
+                    break;
+                }
+            }
+
+            // Calculation of the RGB-pixel (defined as BGR in image-data)
+            // Define $i_pos as absolute position in the body
+            $i_pos    = $i * 2;
+            $r        = hexdec($body[$i_pos+4].$body[$i_pos+5]);
+            $g        = hexdec($body[$i_pos+2].$body[$i_pos+3]);
+            $b        = hexdec($body[$i_pos].$body[$i_pos+1]);
+
+            // Calculate and draw the pixel
+            $color    = imagecolorallocate($image, $r, $g, $b);
+            imagesetpixel($image, $x, $height-$y, $color);
+
+            // Raise the horizontal position
+            $x++;
+        }
+
+        // Unset the body / free the memory
+        unset($body);
+
+        //    Return image-object
+        return $image;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher.php b/lib/PHPExcel/Shared/Escher.php
new file mode 100644
index 000000000..1aedb9d2a
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher
+{
+    /**
+     * Drawing Group Container
+     *
+     * @var PHPExcel_Shared_Escher_DggContainer
+     */
+    private $dggContainer;
+
+    /**
+     * Drawing Container
+     *
+     * @var PHPExcel_Shared_Escher_DgContainer
+     */
+    private $dgContainer;
+
+    /**
+     * Get Drawing Group Container
+     *
+     * @return PHPExcel_Shared_Escher_DgContainer
+     */
+    public function getDggContainer()
+    {
+        return $this->dggContainer;
+    }
+
+    /**
+     * Set Drawing Group Container
+     *
+     * @param PHPExcel_Shared_Escher_DggContainer $dggContainer
+     */
+    public function setDggContainer($dggContainer)
+    {
+        return $this->dggContainer = $dggContainer;
+    }
+
+    /**
+     * Get Drawing Container
+     *
+     * @return PHPExcel_Shared_Escher_DgContainer
+     */
+    public function getDgContainer()
+    {
+        return $this->dgContainer;
+    }
+
+    /**
+     * Set Drawing Container
+     *
+     * @param PHPExcel_Shared_Escher_DgContainer $dgContainer
+     */
+    public function setDgContainer($dgContainer)
+    {
+        return $this->dgContainer = $dgContainer;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DgContainer.php b/lib/PHPExcel/Shared/Escher/DgContainer.php
new file mode 100644
index 000000000..739cd9024
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DgContainer.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DgContainer
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DgContainer
+{
+    /**
+     * Drawing index, 1-based.
+     *
+     * @var int
+     */
+    private $dgId;
+
+    /**
+     * Last shape index in this drawing
+     *
+     * @var int
+     */
+    private $lastSpId;
+
+    private $spgrContainer = null;
+
+    public function getDgId()
+    {
+        return $this->dgId;
+    }
+
+    public function setDgId($value)
+    {
+        $this->dgId = $value;
+    }
+
+    public function getLastSpId()
+    {
+        return $this->lastSpId;
+    }
+
+    public function setLastSpId($value)
+    {
+        $this->lastSpId = $value;
+    }
+
+    public function getSpgrContainer()
+    {
+        return $this->spgrContainer;
+    }
+
+    public function setSpgrContainer($spgrContainer)
+    {
+        return $this->spgrContainer = $spgrContainer;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/lib/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
new file mode 100644
index 000000000..49e7d6856
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DgContainer_SpgrContainer
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DgContainer_SpgrContainer
+{
+    /**
+     * Parent Shape Group Container
+     *
+     * @var PHPExcel_Shared_Escher_DgContainer_SpgrContainer
+     */
+    private $parent;
+
+    /**
+     * Shape Container collection
+     *
+     * @var array
+     */
+    private $children = array();
+
+    /**
+     * Set parent Shape Group Container
+     *
+     * @param PHPExcel_Shared_Escher_DgContainer_SpgrContainer $parent
+     */
+    public function setParent($parent)
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get the parent Shape Group Container if any
+     *
+     * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer|null
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Add a child. This will be either spgrContainer or spContainer
+     *
+     * @param mixed $child
+     */
+    public function addChild($child)
+    {
+        $this->children[] = $child;
+        $child->setParent($this);
+    }
+
+    /**
+     * Get collection of Shape Containers
+     */
+    public function getChildren()
+    {
+        return $this->children;
+    }
+
+    /**
+     * Recursively get all spContainers within this spgrContainer
+     *
+     * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer[]
+     */
+    public function getAllSpContainers()
+    {
+        $allSpContainers = array();
+
+        foreach ($this->children as $child) {
+            if ($child instanceof PHPExcel_Shared_Escher_DgContainer_SpgrContainer) {
+                $allSpContainers = array_merge($allSpContainers, $child->getAllSpContainers());
+            } else {
+                $allSpContainers[] = $child;
+            }
+        }
+
+        return $allSpContainers;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/lib/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
new file mode 100644
index 000000000..a1f1a4609
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
@@ -0,0 +1,388 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
+{
+    /**
+     * Parent Shape Group Container
+     *
+     * @var PHPExcel_Shared_Escher_DgContainer_SpgrContainer
+     */
+    private $parent;
+
+    /**
+     * Is this a group shape?
+     *
+     * @var boolean
+     */
+    private $spgr = false;
+
+    /**
+     * Shape type
+     *
+     * @var int
+     */
+    private $spType;
+
+    /**
+     * Shape flag
+     *
+     * @var int
+     */
+    private $spFlag;
+
+    /**
+     * Shape index (usually group shape has index 0, and the rest: 1,2,3...)
+     *
+     * @var boolean
+     */
+    private $spId;
+
+    /**
+     * Array of options
+     *
+     * @var array
+     */
+    private $OPT;
+
+    /**
+     * Cell coordinates of upper-left corner of shape, e.g. 'A1'
+     *
+     * @var string
+     */
+    private $startCoordinates;
+
+    /**
+     * Horizontal offset of upper-left corner of shape measured in 1/1024 of column width
+     *
+     * @var int
+     */
+    private $startOffsetX;
+
+    /**
+     * Vertical offset of upper-left corner of shape measured in 1/256 of row height
+     *
+     * @var int
+     */
+    private $startOffsetY;
+
+    /**
+     * Cell coordinates of bottom-right corner of shape, e.g. 'B2'
+     *
+     * @var string
+     */
+    private $endCoordinates;
+
+    /**
+     * Horizontal offset of bottom-right corner of shape measured in 1/1024 of column width
+     *
+     * @var int
+     */
+    private $endOffsetX;
+
+    /**
+     * Vertical offset of bottom-right corner of shape measured in 1/256 of row height
+     *
+     * @var int
+     */
+    private $endOffsetY;
+
+    /**
+     * Set parent Shape Group Container
+     *
+     * @param PHPExcel_Shared_Escher_DgContainer_SpgrContainer $parent
+     */
+    public function setParent($parent)
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get the parent Shape Group Container
+     *
+     * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set whether this is a group shape
+     *
+     * @param boolean $value
+     */
+    public function setSpgr($value = false)
+    {
+        $this->spgr = $value;
+    }
+
+    /**
+     * Get whether this is a group shape
+     *
+     * @return boolean
+     */
+    public function getSpgr()
+    {
+        return $this->spgr;
+    }
+
+    /**
+     * Set the shape type
+     *
+     * @param int $value
+     */
+    public function setSpType($value)
+    {
+        $this->spType = $value;
+    }
+
+    /**
+     * Get the shape type
+     *
+     * @return int
+     */
+    public function getSpType()
+    {
+        return $this->spType;
+    }
+
+    /**
+     * Set the shape flag
+     *
+     * @param int $value
+     */
+    public function setSpFlag($value)
+    {
+        $this->spFlag = $value;
+    }
+
+    /**
+     * Get the shape flag
+     *
+     * @return int
+     */
+    public function getSpFlag()
+    {
+        return $this->spFlag;
+    }
+
+    /**
+     * Set the shape index
+     *
+     * @param int $value
+     */
+    public function setSpId($value)
+    {
+        $this->spId = $value;
+    }
+
+    /**
+     * Get the shape index
+     *
+     * @return int
+     */
+    public function getSpId()
+    {
+        return $this->spId;
+    }
+
+    /**
+     * Set an option for the Shape Group Container
+     *
+     * @param int $property The number specifies the option
+     * @param mixed $value
+     */
+    public function setOPT($property, $value)
+    {
+        $this->OPT[$property] = $value;
+    }
+
+    /**
+     * Get an option for the Shape Group Container
+     *
+     * @param int $property The number specifies the option
+     * @return mixed
+     */
+    public function getOPT($property)
+    {
+        if (isset($this->OPT[$property])) {
+            return $this->OPT[$property];
+        }
+        return null;
+    }
+
+    /**
+     * Get the collection of options
+     *
+     * @return array
+     */
+    public function getOPTCollection()
+    {
+        return $this->OPT;
+    }
+
+    /**
+     * Set cell coordinates of upper-left corner of shape
+     *
+     * @param string $value
+     */
+    public function setStartCoordinates($value = 'A1')
+    {
+        $this->startCoordinates = $value;
+    }
+
+    /**
+     * Get cell coordinates of upper-left corner of shape
+     *
+     * @return string
+     */
+    public function getStartCoordinates()
+    {
+        return $this->startCoordinates;
+    }
+
+    /**
+     * Set offset in x-direction of upper-left corner of shape measured in 1/1024 of column width
+     *
+     * @param int $startOffsetX
+     */
+    public function setStartOffsetX($startOffsetX = 0)
+    {
+        $this->startOffsetX = $startOffsetX;
+    }
+
+    /**
+     * Get offset in x-direction of upper-left corner of shape measured in 1/1024 of column width
+     *
+     * @return int
+     */
+    public function getStartOffsetX()
+    {
+        return $this->startOffsetX;
+    }
+
+    /**
+     * Set offset in y-direction of upper-left corner of shape measured in 1/256 of row height
+     *
+     * @param int $startOffsetY
+     */
+    public function setStartOffsetY($startOffsetY = 0)
+    {
+        $this->startOffsetY = $startOffsetY;
+    }
+
+    /**
+     * Get offset in y-direction of upper-left corner of shape measured in 1/256 of row height
+     *
+     * @return int
+     */
+    public function getStartOffsetY()
+    {
+        return $this->startOffsetY;
+    }
+
+    /**
+     * Set cell coordinates of bottom-right corner of shape
+     *
+     * @param string $value
+     */
+    public function setEndCoordinates($value = 'A1')
+    {
+        $this->endCoordinates = $value;
+    }
+
+    /**
+     * Get cell coordinates of bottom-right corner of shape
+     *
+     * @return string
+     */
+    public function getEndCoordinates()
+    {
+        return $this->endCoordinates;
+    }
+
+    /**
+     * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
+     *
+     * @param int $startOffsetX
+     */
+    public function setEndOffsetX($endOffsetX = 0)
+    {
+        $this->endOffsetX = $endOffsetX;
+    }
+
+    /**
+     * Get offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
+     *
+     * @return int
+     */
+    public function getEndOffsetX()
+    {
+        return $this->endOffsetX;
+    }
+
+    /**
+     * Set offset in y-direction of bottom-right corner of shape measured in 1/256 of row height
+     *
+     * @param int $endOffsetY
+     */
+    public function setEndOffsetY($endOffsetY = 0)
+    {
+        $this->endOffsetY = $endOffsetY;
+    }
+
+    /**
+     * Get offset in y-direction of bottom-right corner of shape measured in 1/256 of row height
+     *
+     * @return int
+     */
+    public function getEndOffsetY()
+    {
+        return $this->endOffsetY;
+    }
+
+    /**
+     * Get the nesting level of this spContainer. This is the number of spgrContainers between this spContainer and
+     * the dgContainer. A value of 1 = immediately within first spgrContainer
+     * Higher nesting level occurs if and only if spContainer is part of a shape group
+     *
+     * @return int Nesting level
+     */
+    public function getNestingLevel()
+    {
+        $nestingLevel = 0;
+
+        $parent = $this->getParent();
+        while ($parent instanceof PHPExcel_Shared_Escher_DgContainer_SpgrContainer) {
+            ++$nestingLevel;
+            $parent = $parent->getParent();
+        }
+
+        return $nestingLevel;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DggContainer.php b/lib/PHPExcel/Shared/Escher/DggContainer.php
new file mode 100644
index 000000000..b116b1bd4
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DggContainer.php
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DggContainer
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DggContainer
+{
+    /**
+     * Maximum shape index of all shapes in all drawings increased by one
+     *
+     * @var int
+     */
+    private $spIdMax;
+
+    /**
+     * Total number of drawings saved
+     *
+     * @var int
+     */
+    private $cDgSaved;
+
+    /**
+     * Total number of shapes saved (including group shapes)
+     *
+     * @var int
+     */
+    private $cSpSaved;
+
+    /**
+     * BLIP Store Container
+     *
+     * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+     */
+    private $bstoreContainer;
+
+    /**
+     * Array of options for the drawing group
+     *
+     * @var array
+     */
+    private $OPT = array();
+
+    /**
+     * Array of identifier clusters containg information about the maximum shape identifiers
+     *
+     * @var array
+     */
+    private $IDCLs = array();
+
+    /**
+     * Get maximum shape index of all shapes in all drawings (plus one)
+     *
+     * @return int
+     */
+    public function getSpIdMax()
+    {
+        return $this->spIdMax;
+    }
+
+    /**
+     * Set maximum shape index of all shapes in all drawings (plus one)
+     *
+     * @param int
+     */
+    public function setSpIdMax($value)
+    {
+        $this->spIdMax = $value;
+    }
+
+    /**
+     * Get total number of drawings saved
+     *
+     * @return int
+     */
+    public function getCDgSaved()
+    {
+        return $this->cDgSaved;
+    }
+
+    /**
+     * Set total number of drawings saved
+     *
+     * @param int
+     */
+    public function setCDgSaved($value)
+    {
+        $this->cDgSaved = $value;
+    }
+
+    /**
+     * Get total number of shapes saved (including group shapes)
+     *
+     * @return int
+     */
+    public function getCSpSaved()
+    {
+        return $this->cSpSaved;
+    }
+
+    /**
+     * Set total number of shapes saved (including group shapes)
+     *
+     * @param int
+     */
+    public function setCSpSaved($value)
+    {
+        $this->cSpSaved = $value;
+    }
+
+    /**
+     * Get BLIP Store Container
+     *
+     * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+     */
+    public function getBstoreContainer()
+    {
+        return $this->bstoreContainer;
+    }
+
+    /**
+     * Set BLIP Store Container
+     *
+     * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer $bstoreContainer
+     */
+    public function setBstoreContainer($bstoreContainer)
+    {
+        $this->bstoreContainer = $bstoreContainer;
+    }
+
+    /**
+     * Set an option for the drawing group
+     *
+     * @param int $property The number specifies the option
+     * @param mixed $value
+     */
+    public function setOPT($property, $value)
+    {
+        $this->OPT[$property] = $value;
+    }
+
+    /**
+     * Get an option for the drawing group
+     *
+     * @param int $property The number specifies the option
+     * @return mixed
+     */
+    public function getOPT($property)
+    {
+        if (isset($this->OPT[$property])) {
+            return $this->OPT[$property];
+        }
+        return null;
+    }
+
+    /**
+     * Get identifier clusters
+     *
+     * @return array
+     */
+    public function getIDCLs()
+    {
+        return $this->IDCLs;
+    }
+
+    /**
+     * Set identifier clusters. array(<drawingId> => <max shape id>, ...)
+     *
+     * @param array $pValue
+     */
+    public function setIDCLs($pValue)
+    {
+        $this->IDCLs = $pValue;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
new file mode 100644
index 000000000..1af2432bd
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+{
+    /**
+     * BLIP Store Entries. Each of them holds one BLIP (Big Large Image or Picture)
+     *
+     * @var array
+     */
+    private $BSECollection = array();
+
+    /**
+     * Add a BLIP Store Entry
+     *
+     * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $BSE
+     */
+    public function addBSE($BSE)
+    {
+        $this->BSECollection[] = $BSE;
+        $BSE->setParent($this);
+    }
+
+    /**
+     * Get the collection of BLIP Store Entries
+     *
+     * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE[]
+     */
+    public function getBSECollection()
+    {
+        return $this->BSECollection;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
new file mode 100644
index 000000000..d17e91e16
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
+{
+    const BLIPTYPE_ERROR    = 0x00;
+    const BLIPTYPE_UNKNOWN  = 0x01;
+    const BLIPTYPE_EMF      = 0x02;
+    const BLIPTYPE_WMF      = 0x03;
+    const BLIPTYPE_PICT     = 0x04;
+    const BLIPTYPE_JPEG     = 0x05;
+    const BLIPTYPE_PNG      = 0x06;
+    const BLIPTYPE_DIB      = 0x07;
+    const BLIPTYPE_TIFF     = 0x11;
+    const BLIPTYPE_CMYKJPEG = 0x12;
+
+    /**
+     * The parent BLIP Store Entry Container
+     *
+     * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+     */
+    private $parent;
+
+    /**
+     * The BLIP (Big Large Image or Picture)
+     *
+     * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
+     */
+    private $blip;
+
+    /**
+     * The BLIP type
+     *
+     * @var int
+     */
+    private $blipType;
+
+    /**
+     * Set parent BLIP Store Entry Container
+     *
+     * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer $parent
+     */
+    public function setParent($parent)
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get the BLIP
+     *
+     * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
+     */
+    public function getBlip()
+    {
+        return $this->blip;
+    }
+
+    /**
+     * Set the BLIP
+     *
+     * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip $blip
+     */
+    public function setBlip($blip)
+    {
+        $this->blip = $blip;
+        $blip->setParent($this);
+    }
+
+    /**
+     * Get the BLIP type
+     *
+     * @return int
+     */
+    public function getBlipType()
+    {
+        return $this->blipType;
+    }
+
+    /**
+     * Set the BLIP type
+     *
+     * @param int
+     */
+    public function setBlipType($blipType)
+    {
+        $this->blipType = $blipType;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
new file mode 100644
index 000000000..3bcbbbe28
--- /dev/null
+++ b/lib/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Escher
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
+{
+    /**
+     * The parent BSE
+     *
+     * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
+     */
+    private $parent;
+
+    /**
+     * Raw image data
+     *
+     * @var string
+     */
+    private $data;
+
+    /**
+     * Get the raw image data
+     *
+     * @return string
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Set the raw image data
+     *
+     * @param string
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Set parent BSE
+     *
+     * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $parent
+     */
+    public function setParent($parent)
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get parent BSE
+     *
+     * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $parent
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+}
diff --git a/lib/PHPExcel/Shared/Excel5.php b/lib/PHPExcel/Shared/Excel5.php
new file mode 100644
index 000000000..c3ff209fa
--- /dev/null
+++ b/lib/PHPExcel/Shared/Excel5.php
@@ -0,0 +1,298 @@
+<?php
+
+/**
+ * PHPExcel_Shared_Excel5
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_Excel5
+{
+    /**
+     * Get the width of a column in pixels. We use the relationship y = ceil(7x) where
+     * x is the width in intrinsic Excel units (measuring width in number of normal characters)
+     * This holds for Arial 10
+     *
+     * @param PHPExcel_Worksheet $sheet The sheet
+     * @param string $col The column
+     * @return integer The width in pixels
+    */
+    public static function sizeCol($sheet, $col = 'A')
+    {
+        // default font of the workbook
+        $font = $sheet->getParent()->getDefaultStyle()->getFont();
+
+        $columnDimensions = $sheet->getColumnDimensions();
+
+        // first find the true column width in pixels (uncollapsed and unhidden)
+        if (isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1) {
+            // then we have column dimension with explicit width
+            $columnDimension = $columnDimensions[$col];
+            $width = $columnDimension->getWidth();
+            $pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
+        } elseif ($sheet->getDefaultColumnDimension()->getWidth() != -1) {
+            // then we have default column dimension with explicit width
+            $defaultColumnDimension = $sheet->getDefaultColumnDimension();
+            $width = $defaultColumnDimension->getWidth();
+            $pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
+        } else {
+            // we don't even have any default column dimension. Width depends on default font
+            $pixelWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($font, true);
+        }
+
+        // now find the effective column width in pixels
+        if (isset($columnDimensions[$col]) and !$columnDimensions[$col]->getVisible()) {
+            $effectivePixelWidth = 0;
+        } else {
+            $effectivePixelWidth = $pixelWidth;
+        }
+
+        return $effectivePixelWidth;
+    }
+
+    /**
+     * Convert the height of a cell from user's units to pixels. By interpolation
+     * the relationship is: y = 4/3x. If the height hasn't been set by the user we
+     * use the default value. If the row is hidden we use a value of zero.
+     *
+     * @param PHPExcel_Worksheet $sheet The sheet
+     * @param integer $row The row index (1-based)
+     * @return integer The width in pixels
+     */
+    public static function sizeRow($sheet, $row = 1)
+    {
+        // default font of the workbook
+        $font = $sheet->getParent()->getDefaultStyle()->getFont();
+
+        $rowDimensions = $sheet->getRowDimensions();
+
+        // first find the true row height in pixels (uncollapsed and unhidden)
+        if (isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
+            // then we have a row dimension
+            $rowDimension = $rowDimensions[$row];
+            $rowHeight = $rowDimension->getRowHeight();
+            $pixelRowHeight = (int) ceil(4 * $rowHeight / 3); // here we assume Arial 10
+        } elseif ($sheet->getDefaultRowDimension()->getRowHeight() != -1) {
+            // then we have a default row dimension with explicit height
+            $defaultRowDimension = $sheet->getDefaultRowDimension();
+            $rowHeight = $defaultRowDimension->getRowHeight();
+            $pixelRowHeight = PHPExcel_Shared_Drawing::pointsToPixels($rowHeight);
+        } else {
+            // we don't even have any default row dimension. Height depends on default font
+            $pointRowHeight = PHPExcel_Shared_Font::getDefaultRowHeightByFont($font);
+            $pixelRowHeight = PHPExcel_Shared_Font::fontSizeToPixels($pointRowHeight);
+        }
+
+        // now find the effective row height in pixels
+        if (isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible()) {
+            $effectivePixelRowHeight = 0;
+        } else {
+            $effectivePixelRowHeight = $pixelRowHeight;
+        }
+
+        return $effectivePixelRowHeight;
+    }
+
+    /**
+     * Get the horizontal distance in pixels between two anchors
+     * The distanceX is found as sum of all the spanning columns widths minus correction for the two offsets
+     *
+     * @param PHPExcel_Worksheet $sheet
+     * @param string $startColumn
+     * @param integer $startOffsetX Offset within start cell measured in 1/1024 of the cell width
+     * @param string $endColumn
+     * @param integer $endOffsetX Offset within end cell measured in 1/1024 of the cell width
+     * @return integer Horizontal measured in pixels
+     */
+    public static function getDistanceX(PHPExcel_Worksheet $sheet, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0)
+    {
+        $distanceX = 0;
+
+        // add the widths of the spanning columns
+        $startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1; // 1-based
+        $endColumnIndex = PHPExcel_Cell::columnIndexFromString($endColumn) - 1; // 1-based
+        for ($i = $startColumnIndex; $i <= $endColumnIndex; ++$i) {
+            $distanceX += self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($i));
+        }
+
+        // correct for offsetX in startcell
+        $distanceX -= (int) floor(self::sizeCol($sheet, $startColumn) * $startOffsetX / 1024);
+
+        // correct for offsetX in endcell
+        $distanceX -= (int) floor(self::sizeCol($sheet, $endColumn) * (1 - $endOffsetX / 1024));
+
+        return $distanceX;
+    }
+
+    /**
+     * Get the vertical distance in pixels between two anchors
+     * The distanceY is found as sum of all the spanning rows minus two offsets
+     *
+     * @param PHPExcel_Worksheet $sheet
+     * @param integer $startRow (1-based)
+     * @param integer $startOffsetY Offset within start cell measured in 1/256 of the cell height
+     * @param integer $endRow (1-based)
+     * @param integer $endOffsetY Offset within end cell measured in 1/256 of the cell height
+     * @return integer Vertical distance measured in pixels
+     */
+    public static function getDistanceY(PHPExcel_Worksheet $sheet, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0)
+    {
+        $distanceY = 0;
+
+        // add the widths of the spanning rows
+        for ($row = $startRow; $row <= $endRow; ++$row) {
+            $distanceY += self::sizeRow($sheet, $row);
+        }
+
+        // correct for offsetX in startcell
+        $distanceY -= (int) floor(self::sizeRow($sheet, $startRow) * $startOffsetY / 256);
+
+        // correct for offsetX in endcell
+        $distanceY -= (int) floor(self::sizeRow($sheet, $endRow) * (1 - $endOffsetY / 256));
+
+        return $distanceY;
+    }
+
+    /**
+     * Convert 1-cell anchor coordinates to 2-cell anchor coordinates
+     * This function is ported from PEAR Spreadsheet_Writer_Excel with small modifications
+     *
+     * Calculate the vertices that define the position of the image as required by
+     * the OBJ record.
+     *
+     *         +------------+------------+
+     *         |     A      |      B     |
+     *   +-----+------------+------------+
+     *   |     |(x1,y1)     |            |
+     *   |  1  |(A1)._______|______      |
+     *   |     |    |              |     |
+     *   |     |    |              |     |
+     *   +-----+----|    BITMAP    |-----+
+     *   |     |    |              |     |
+     *   |  2  |    |______________.     |
+     *   |     |            |        (B2)|
+     *   |     |            |     (x2,y2)|
+     *   +---- +------------+------------+
+     *
+     * Example of a bitmap that covers some of the area from cell A1 to cell B2.
+     *
+     * Based on the width and height of the bitmap we need to calculate 8 vars:
+     *     $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
+     * The width and height of the cells are also variable and have to be taken into
+     * account.
+     * The values of $col_start and $row_start are passed in from the calling
+     * function. The values of $col_end and $row_end are calculated by subtracting
+     * the width and height of the bitmap from the width and height of the
+     * underlying cells.
+     * The vertices are expressed as a percentage of the underlying cell width as
+     * follows (rhs values are in pixels):
+     *
+     *       x1 = X / W *1024
+     *       y1 = Y / H *256
+     *       x2 = (X-1) / W *1024
+     *       y2 = (Y-1) / H *256
+     *
+     *       Where:  X is distance from the left side of the underlying cell
+     *               Y is distance from the top of the underlying cell
+     *               W is the width of the cell
+     *               H is the height of the cell
+     *
+     * @param PHPExcel_Worksheet $sheet
+     * @param string $coordinates E.g. 'A1'
+     * @param integer $offsetX Horizontal offset in pixels
+     * @param integer $offsetY Vertical offset in pixels
+     * @param integer $width Width in pixels
+     * @param integer $height Height in pixels
+     * @return array
+     */
+    public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height)
+    {
+        list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinates);
+        $col_start = PHPExcel_Cell::columnIndexFromString($column) - 1;
+        $row_start = $row - 1;
+
+        $x1 = $offsetX;
+        $y1 = $offsetY;
+
+        // Initialise end cell to the same as the start cell
+        $col_end    = $col_start;  // Col containing lower right corner of object
+        $row_end    = $row_start;  // Row containing bottom right corner of object
+
+        // Zero the specified offset if greater than the cell dimensions
+        if ($x1 >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
+            $x1 = 0;
+        }
+        if ($y1 >= self::sizeRow($sheet, $row_start + 1)) {
+            $y1 = 0;
+        }
+
+        $width      = $width  + $x1 -1;
+        $height     = $height + $y1 -1;
+
+        // Subtract the underlying cell widths to find the end cell of the image
+        while ($width >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
+            $width -= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
+            ++$col_end;
+        }
+
+        // Subtract the underlying cell heights to find the end cell of the image
+        while ($height >= self::sizeRow($sheet, $row_end + 1)) {
+            $height -= self::sizeRow($sheet, $row_end + 1);
+            ++$row_end;
+        }
+
+        // Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
+        // with zero height or width.
+        if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
+            return;
+        }
+        if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
+            return;
+        }
+        if (self::sizeRow($sheet, $row_start + 1) == 0) {
+            return;
+        }
+        if (self::sizeRow($sheet, $row_end + 1)   == 0) {
+            return;
+        }
+
+        // Convert the pixel values to the percentage value expected by Excel
+        $x1 = $x1     / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
+        $y1 = $y1     / self::sizeRow($sheet, $row_start + 1)   *  256;
+        $x2 = ($width + 1)  / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))     * 1024; // Distance to right side of object
+        $y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1)     *  256; // Distance to bottom of object
+
+        $startCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_start) . ($row_start + 1);
+        $endCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_end) . ($row_end + 1);
+
+        $twoAnchor = array(
+            'startCoordinates' => $startCoordinates,
+            'startOffsetX' => $x1,
+            'startOffsetY' => $y1,
+            'endCoordinates' => $endCoordinates,
+            'endOffsetX' => $x2,
+            'endOffsetY' => $y2,
+        );
+
+        return  $twoAnchor;
+    }
+}
diff --git a/lib/PHPExcel/Shared/File.php b/lib/PHPExcel/Shared/File.php
new file mode 100644
index 000000000..a62df759f
--- /dev/null
+++ b/lib/PHPExcel/Shared/File.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * PHPExcel_Shared_File
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_File
+{
+    /*
+     * Use Temp or File Upload Temp for temporary files
+     *
+     * @protected
+     * @var    boolean
+     */
+    protected static $useUploadTempDirectory = false;
+
+
+    /**
+     * Set the flag indicating whether the File Upload Temp directory should be used for temporary files
+     *
+     * @param     boolean    $useUploadTempDir        Use File Upload Temporary directory (true or false)
+     */
+    public static function setUseUploadTempDirectory($useUploadTempDir = false)
+    {
+        self::$useUploadTempDirectory = (boolean) $useUploadTempDir;
+    }
+
+
+    /**
+     * Get the flag indicating whether the File Upload Temp directory should be used for temporary files
+     *
+     * @return     boolean    Use File Upload Temporary directory (true or false)
+     */
+    public static function getUseUploadTempDirectory()
+    {
+        return self::$useUploadTempDirectory;
+    }
+
+
+    /**
+      * Verify if a file exists
+      *
+      * @param     string    $pFilename    Filename
+      * @return bool
+      */
+    public static function file_exists($pFilename)
+    {
+        // Sick construction, but it seems that
+        // file_exists returns strange values when
+        // doing the original file_exists on ZIP archives...
+        if (strtolower(substr($pFilename, 0, 3)) == 'zip') {
+            // Open ZIP file and verify if the file exists
+            $zipFile     = substr($pFilename, 6, strpos($pFilename, '#') - 6);
+            $archiveFile = substr($pFilename, strpos($pFilename, '#') + 1);
+
+            $zip = new ZipArchive();
+            if ($zip->open($zipFile) === true) {
+                $returnValue = ($zip->getFromName($archiveFile) !== false);
+                $zip->close();
+                return $returnValue;
+            } else {
+                return false;
+            }
+        } else {
+            // Regular file_exists
+            return file_exists($pFilename);
+        }
+    }
+
+    /**
+     * Returns canonicalized absolute pathname, also for ZIP archives
+     *
+     * @param string $pFilename
+     * @return string
+     */
+    public static function realpath($pFilename)
+    {
+        // Returnvalue
+        $returnValue = '';
+
+        // Try using realpath()
+        if (file_exists($pFilename)) {
+            $returnValue = realpath($pFilename);
+        }
+
+        // Found something?
+        if ($returnValue == '' || ($returnValue === null)) {
+            $pathArray = explode('/', $pFilename);
+            while (in_array('..', $pathArray) && $pathArray[0] != '..') {
+                for ($i = 0; $i < count($pathArray); ++$i) {
+                    if ($pathArray[$i] == '..' && $i > 0) {
+                        unset($pathArray[$i]);
+                        unset($pathArray[$i - 1]);
+                        break;
+                    }
+                }
+            }
+            $returnValue = implode('/', $pathArray);
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+    /**
+     * Get the systems temporary directory.
+     *
+     * @return string
+     */
+    public static function sys_get_temp_dir()
+    {
+        if (self::$useUploadTempDirectory) {
+            //  use upload-directory when defined to allow running on environments having very restricted
+            //      open_basedir configs
+            if (ini_get('upload_tmp_dir') !== false) {
+                if ($temp = ini_get('upload_tmp_dir')) {
+                    if (file_exists($temp)) {
+                        return realpath($temp);
+                    }
+                }
+            }
+        }
+
+        // sys_get_temp_dir is only available since PHP 5.2.1
+        // http://php.net/manual/en/function.sys-get-temp-dir.php#94119
+        if (!function_exists('sys_get_temp_dir')) {
+            if ($temp = getenv('TMP')) {
+                if ((!empty($temp)) && (file_exists($temp))) {
+                    return realpath($temp);
+                }
+            }
+            if ($temp = getenv('TEMP')) {
+                if ((!empty($temp)) && (file_exists($temp))) {
+                    return realpath($temp);
+                }
+            }
+            if ($temp = getenv('TMPDIR')) {
+                if ((!empty($temp)) && (file_exists($temp))) {
+                    return realpath($temp);
+                }
+            }
+
+            // trick for creating a file in system's temporary dir
+            // without knowing the path of the system's temporary dir
+            $temp = tempnam(__FILE__, '');
+            if (file_exists($temp)) {
+                unlink($temp);
+                return realpath(dirname($temp));
+            }
+
+            return null;
+        }
+
+        // use ordinary built-in PHP function
+        //    There should be no problem with the 5.2.4 Suhosin realpath() bug, because this line should only
+        //        be called if we're running 5.2.1 or earlier
+        return realpath(sys_get_temp_dir());
+    }
+}
diff --git a/lib/PHPExcel/Shared/Font.php b/lib/PHPExcel/Shared/Font.php
new file mode 100644
index 000000000..7efb3c96b
--- /dev/null
+++ b/lib/PHPExcel/Shared/Font.php
@@ -0,0 +1,741 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Shared_Font
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Shared_Font
+{
+    /* Methods for resolving autosize value */
+    const AUTOSIZE_METHOD_APPROX    = 'approx';
+    const AUTOSIZE_METHOD_EXACT     = 'exact';
+
+    private static $autoSizeMethods = array(
+        self::AUTOSIZE_METHOD_APPROX,
+        self::AUTOSIZE_METHOD_EXACT,
+    );
+
+    /** Character set codes used by BIFF5-8 in Font records */
+    const CHARSET_ANSI_LATIN                = 0x00;
+    const CHARSET_SYSTEM_DEFAULT            = 0x01;
+    const CHARSET_SYMBOL                    = 0x02;
+    const CHARSET_APPLE_ROMAN               = 0x4D;
+    const CHARSET_ANSI_JAPANESE_SHIFTJIS    = 0x80;
+    const CHARSET_ANSI_KOREAN_HANGUL        = 0x81;
+    const CHARSET_ANSI_KOREAN_JOHAB         = 0x82;
+    const CHARSET_ANSI_CHINESE_SIMIPLIFIED  = 0x86;        //    gb2312
+    const CHARSET_ANSI_CHINESE_TRADITIONAL  = 0x88;        //    big5
+    const CHARSET_ANSI_GREEK                = 0xA1;
+    const CHARSET_ANSI_TURKISH              = 0xA2;
+    const CHARSET_ANSI_VIETNAMESE           = 0xA3;
+    const CHARSET_ANSI_HEBREW               = 0xB1;
+    const CHARSET_ANSI_ARABIC               = 0xB2;
+    const CHARSET_ANSI_BALTIC               = 0xBA;
+    const CHARSET_ANSI_CYRILLIC             = 0xCC;
+    const CHARSET_ANSI_THAI                 = 0xDD;
+    const CHARSET_ANSI_LATIN_II             = 0xEE;
+    const CHARSET_OEM_LATIN_I               = 0xFF;
+
+    //  XXX: Constants created!
+    /** Font filenames */
+    const ARIAL                             = 'arial.ttf';
+    const ARIAL_BOLD                        = 'arialbd.ttf';
+    const ARIAL_ITALIC                      = 'ariali.ttf';
+    const ARIAL_BOLD_ITALIC                 = 'arialbi.ttf';
+
+    const CALIBRI                           = 'CALIBRI.TTF';
+    const CALIBRI_BOLD                      = 'CALIBRIB.TTF';
+    const CALIBRI_ITALIC                    = 'CALIBRII.TTF';
+    const CALIBRI_BOLD_ITALIC               = 'CALIBRIZ.TTF';
+
+    const COMIC_SANS_MS                     = 'comic.ttf';
+    const COMIC_SANS_MS_BOLD                = 'comicbd.ttf';
+
+    const COURIER_NEW                       = 'cour.ttf';
+    const COURIER_NEW_BOLD                  = 'courbd.ttf';
+    const COURIER_NEW_ITALIC                = 'couri.ttf';
+    const COURIER_NEW_BOLD_ITALIC           = 'courbi.ttf';
+
+    const GEORGIA                           = 'georgia.ttf';
+    const GEORGIA_BOLD                      = 'georgiab.ttf';
+    const GEORGIA_ITALIC                    = 'georgiai.ttf';
+    const GEORGIA_BOLD_ITALIC               = 'georgiaz.ttf';
+
+    const IMPACT                            = 'impact.ttf';
+
+    const LIBERATION_SANS                   = 'LiberationSans-Regular.ttf';
+    const LIBERATION_SANS_BOLD              = 'LiberationSans-Bold.ttf';
+    const LIBERATION_SANS_ITALIC            = 'LiberationSans-Italic.ttf';
+    const LIBERATION_SANS_BOLD_ITALIC       = 'LiberationSans-BoldItalic.ttf';
+
+    const LUCIDA_CONSOLE                    = 'lucon.ttf';
+    const LUCIDA_SANS_UNICODE               = 'l_10646.ttf';
+
+    const MICROSOFT_SANS_SERIF              = 'micross.ttf';
+
+    const PALATINO_LINOTYPE                 = 'pala.ttf';
+    const PALATINO_LINOTYPE_BOLD            = 'palab.ttf';
+    const PALATINO_LINOTYPE_ITALIC          = 'palai.ttf';
+    const PALATINO_LINOTYPE_BOLD_ITALIC     = 'palabi.ttf';
+
+    const SYMBOL                            = 'symbol.ttf';
+
+    const TAHOMA                            = 'tahoma.ttf';
+    const TAHOMA_BOLD                       = 'tahomabd.ttf';
+
+    const TIMES_NEW_ROMAN                   = 'times.ttf';
+    const TIMES_NEW_ROMAN_BOLD              = 'timesbd.ttf';
+    const TIMES_NEW_ROMAN_ITALIC            = 'timesi.ttf';
+    const TIMES_NEW_ROMAN_BOLD_ITALIC       = 'timesbi.ttf';
+
+    const TREBUCHET_MS                      = 'trebuc.ttf';
+    const TREBUCHET_MS_BOLD                 = 'trebucbd.ttf';
+    const TREBUCHET_MS_ITALIC               = 'trebucit.ttf';
+    const TREBUCHET_MS_BOLD_ITALIC          = 'trebucbi.ttf';
+
+    const VERDANA                           = 'verdana.ttf';
+    const VERDANA_BOLD                      = 'verdanab.ttf';
+    const VERDANA_ITALIC                    = 'verdanai.ttf';
+    const VERDANA_BOLD_ITALIC               = 'verdanaz.ttf';
+
+    /**
+     * AutoSize method
+     *
+     * @var string
+     */
+    private static $autoSizeMethod = self::AUTOSIZE_METHOD_APPROX;
+
+    /**
+     * Path to folder containing TrueType font .ttf files
+     *
+     * @var string
+     */
+    private static $trueTypeFontPath = null;
+
+    /**
+     * How wide is a default column for a given default font and size?
+     * Empirical data found by inspecting real Excel files and reading off the pixel width
+     * in Microsoft Office Excel 2007.
+     *
+     * @var array
+     */
+    public static $defaultColumnWidths = array(
+        'Arial' => array(
+             1 => array('px' => 24, 'width' => 12.00000000),
+             2 => array('px' => 24, 'width' => 12.00000000),
+             3 => array('px' => 32, 'width' => 10.66406250),
+             4 => array('px' => 32, 'width' => 10.66406250),
+             5 => array('px' => 40, 'width' => 10.00000000),
+             6 => array('px' => 48, 'width' =>  9.59765625),
+             7 => array('px' => 48, 'width' =>  9.59765625),
+             8 => array('px' => 56, 'width' =>  9.33203125),
+             9 => array('px' => 64, 'width' =>  9.14062500),
+            10 => array('px' => 64, 'width' =>  9.14062500),
+        ),
+        'Calibri' => array(
+             1 => array('px' => 24, 'width' => 12.00000000),
+             2 => array('px' => 24, 'width' => 12.00000000),
+             3 => array('px' => 32, 'width' => 10.66406250),
+             4 => array('px' => 32, 'width' => 10.66406250),
+             5 => array('px' => 40, 'width' => 10.00000000),
+             6 => array('px' => 48, 'width' =>  9.59765625),
+             7 => array('px' => 48, 'width' =>  9.59765625),
+             8 => array('px' => 56, 'width' =>  9.33203125),
+             9 => array('px' => 56, 'width' =>  9.33203125),
+            10 => array('px' => 64, 'width' =>  9.14062500),
+            11 => array('px' => 64, 'width' =>  9.14062500),
+        ),
+        'Verdana' => array(
+             1 => array('px' => 24, 'width' => 12.00000000),
+             2 => array('px' => 24, 'width' => 12.00000000),
+             3 => array('px' => 32, 'width' => 10.66406250),
+             4 => array('px' => 32, 'width' => 10.66406250),
+             5 => array('px' => 40, 'width' => 10.00000000),
+             6 => array('px' => 48, 'width' =>  9.59765625),
+             7 => array('px' => 48, 'width' =>  9.59765625),
+             8 => array('px' => 64, 'width' =>  9.14062500),
+             9 => array('px' => 72, 'width' =>  9.00000000),
+            10 => array('px' => 72, 'width' =>  9.00000000),
+        ),
+    );
+
+    /**
+     * Set autoSize method
+     *
+     * @param string $pValue
+     * @return     boolean                    Success or failure
+     */
+    public static function setAutoSizeMethod($pValue = self::AUTOSIZE_METHOD_APPROX)
+    {
+        if (!in_array($pValue, self::$autoSizeMethods)) {
+            return false;
+        }
+        self::$autoSizeMethod = $pValue;
+
+        return true;
+    }
+
+    /**
+     * Get autoSize method
+     *
+     * @return string
+     */
+    public static function getAutoSizeMethod()
+    {
+        return self::$autoSizeMethod;
+    }
+
+    /**
+     * Set the path to the folder containing .ttf files. There should be a trailing slash.
+     * Typical locations on variout some platforms:
+     *    <ul>
+     *        <li>C:/Windows/Fonts/</li>
+     *        <li>/usr/share/fonts/truetype/</li>
+     *        <li>~/.fonts/</li>
+     *    </ul>
+     *
+     * @param string $pValue
+     */
+    public static function setTrueTypeFontPath($pValue = '')
+    {
+        self::$trueTypeFontPath = $pValue;
+    }
+
+    /**
+     * Get the path to the folder containing .ttf files.
+     *
+     * @return string
+     */
+    public static function getTrueTypeFontPath()
+    {
+        return self::$trueTypeFontPath;
+    }
+
+    /**
+     * Calculate an (approximate) OpenXML column width, based on font size and text contained
+     *
+     * @param     PHPExcel_Style_Font            $font            Font object
+     * @param     PHPExcel_RichText|string    $cellText        Text to calculate width
+     * @param     integer                        $rotation        Rotation angle
+     * @param     PHPExcel_Style_Font|NULL    $defaultFont    Font object
+     * @return     integer        Column width
+     */
+    public static function calculateColumnWidth(PHPExcel_Style_Font $font, $cellText = '', $rotation = 0, PHPExcel_Style_Font $defaultFont = null)
+    {
+        // If it is rich text, use plain text
+        if ($cellText instanceof PHPExcel_RichText) {
+            $cellText = $cellText->getPlainText();
+        }
+
+        // Special case if there are one or more newline characters ("\n")
+        if (strpos($cellText, "\n") !== false) {
+            $lineTexts = explode("\n", $cellText);
+            $lineWidths = array();
+            foreach ($lineTexts as $lineText) {
+                $lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont);
+            }
+            return max($lineWidths); // width of longest line in cell
+        }
+
+        // Try to get the exact text width in pixels
+        $approximate = self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX;
+        if (!$approximate) {
+            $columnWidthAdjust = ceil(self::getTextWidthPixelsExact('n', $font, 0) * 1.07);
+            try {
+                // Width of text in pixels excl. padding
+                // and addition because Excel adds some padding, just use approx width of 'n' glyph
+                $columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + $columnWidthAdjust;
+            } catch (PHPExcel_Exception $e) {
+                $approximate = true;
+            }
+        }
+
+        if ($approximate) {
+            $columnWidthAdjust = self::getTextWidthPixelsApprox('n', $font, 0);
+            // Width of text in pixels excl. padding, approximation
+            // and addition because Excel adds some padding, just use approx width of 'n' glyph
+            $columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation) + $columnWidthAdjust;
+        }
+
+        // Convert from pixel width to column width
+        $columnWidth = PHPExcel_Shared_Drawing::pixelsToCellDimension($columnWidth, $defaultFont);
+
+        // Return
+        return round($columnWidth, 6);
+    }
+
+    /**
+     * Get GD text width in pixels for a string of text in a certain font at a certain rotation angle
+     *
+     * @param string $text
+     * @param PHPExcel_Style_Font
+     * @param int $rotation
+     * @return int
+     * @throws PHPExcel_Exception
+     */
+    public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0)
+    {
+        if (!function_exists('imagettfbbox')) {
+            throw new PHPExcel_Exception('GD library needs to be enabled');
+        }
+
+        // font size should really be supplied in pixels in GD2,
+        // but since GD2 seems to assume 72dpi, pixels and points are the same
+        $fontFile = self::getTrueTypeFontFileFromFont($font);
+        $textBox = imagettfbbox($font->getSize(), $rotation, $fontFile, $text);
+
+        // Get corners positions
+        $lowerLeftCornerX  = $textBox[0];
+//        $lowerLeftCornerY  = $textBox[1];
+        $lowerRightCornerX = $textBox[2];
+//        $lowerRightCornerY = $textBox[3];
+        $upperRightCornerX = $textBox[4];
+//        $upperRightCornerY = $textBox[5];
+        $upperLeftCornerX  = $textBox[6];
+//        $upperLeftCornerY  = $textBox[7];
+
+        // Consider the rotation when calculating the width
+        $textWidth = max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX);
+
+        return $textWidth;
+    }
+
+    /**
+     * Get approximate width in pixels for a string of text in a certain font at a certain rotation angle
+     *
+     * @param string $columnText
+     * @param PHPExcel_Style_Font $font
+     * @param int $rotation
+     * @return int Text width in pixels (no padding added)
+     */
+    public static function getTextWidthPixelsApprox($columnText, PHPExcel_Style_Font $font = null, $rotation = 0)
+    {
+        $fontName = $font->getName();
+        $fontSize = $font->getSize();
+
+        // Calculate column width in pixels. We assume fixed glyph width. Result varies with font name and size.
+        switch ($fontName) {
+            case 'Calibri':
+                // value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
+                $columnWidth = (int) (8.26 * PHPExcel_Shared_String::CountCharacters($columnText));
+                $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
+                break;
+
+            case 'Arial':
+                // value 7 was found via interpolation by inspecting real Excel files with Arial 10 font.
+//                $columnWidth = (int) (7 * PHPExcel_Shared_String::CountCharacters($columnText));
+                // value 8 was set because of experience in different exports at Arial 10 font.
+                $columnWidth = (int) (8 * PHPExcel_Shared_String::CountCharacters($columnText));
+                $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
+                break;
+
+            case 'Verdana':
+                // value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
+                $columnWidth = (int) (8 * PHPExcel_Shared_String::CountCharacters($columnText));
+                $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
+                break;
+
+            default:
+                // just assume Calibri
+                $columnWidth = (int) (8.26 * PHPExcel_Shared_String::CountCharacters($columnText));
+                $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
+                break;
+        }
+
+        // Calculate approximate rotated column width
+        if ($rotation !== 0) {
+            if ($rotation == -165) {
+                // stacked text
+                $columnWidth = 4; // approximation
+            } else {
+                // rotated text
+                $columnWidth = $columnWidth * cos(deg2rad($rotation))
+                                + $fontSize * abs(sin(deg2rad($rotation))) / 5; // approximation
+            }
+        }
+
+        // pixel width is an integer
+        return (int) $columnWidth;
+    }
+
+    /**
+     * Calculate an (approximate) pixel size, based on a font points size
+     *
+     * @param     int        $fontSizeInPoints    Font size (in points)
+     * @return     int        Font size (in pixels)
+     */
+    public static function fontSizeToPixels($fontSizeInPoints = 11)
+    {
+        return (int) ((4 / 3) * $fontSizeInPoints);
+    }
+
+    /**
+     * Calculate an (approximate) pixel size, based on inch size
+     *
+     * @param     int        $sizeInInch    Font size (in inch)
+     * @return     int        Size (in pixels)
+     */
+    public static function inchSizeToPixels($sizeInInch = 1)
+    {
+        return ($sizeInInch * 96);
+    }
+
+    /**
+     * Calculate an (approximate) pixel size, based on centimeter size
+     *
+     * @param     int        $sizeInCm    Font size (in centimeters)
+     * @return     int        Size (in pixels)
+     */
+    public static function centimeterSizeToPixels($sizeInCm = 1)
+    {
+        return ($sizeInCm * 37.795275591);
+    }
+
+    /**
+     * Returns the font path given the font
+     *
+     * @param PHPExcel_Style_Font
+     * @return string Path to TrueType font file
+     */
+    public static function getTrueTypeFontFileFromFont($font)
+    {
+        if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
+            throw new PHPExcel_Exception('Valid directory to TrueType Font files not specified');
+        }
+
+        $name        = $font->getName();
+        $bold        = $font->getBold();
+        $italic      = $font->getItalic();
+
+        // Check if we can map font to true type font file
+        switch ($name) {
+            case 'Arial':
+                $fontFile = (
+                    $bold ? ($italic ? self::ARIAL_BOLD_ITALIC : self::ARIAL_BOLD)
+                          : ($italic ? self::ARIAL_ITALIC : self::ARIAL)
+                );
+                break;
+            case 'Calibri':
+                $fontFile = (
+                    $bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
+                          : ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
+                );
+                break;
+            case 'Courier New':
+                $fontFile = (
+                    $bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
+                          : ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
+                );
+                break;
+            case 'Comic Sans MS':
+                $fontFile = (
+                    $bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
+                );
+                break;
+            case 'Georgia':
+                $fontFile = (
+                    $bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
+                          : ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
+                );
+                break;
+            case 'Impact':
+                $fontFile = self::IMPACT;
+                break;
+            case 'Liberation Sans':
+                $fontFile = (
+                    $bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
+                          : ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
+                );
+                break;
+            case 'Lucida Console':
+                $fontFile = self::LUCIDA_CONSOLE;
+                break;
+            case 'Lucida Sans Unicode':
+                $fontFile = self::LUCIDA_SANS_UNICODE;
+                break;
+            case 'Microsoft Sans Serif':
+                $fontFile = self::MICROSOFT_SANS_SERIF;
+                break;
+            case 'Palatino Linotype':
+                $fontFile = (
+                    $bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
+                          : ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
+                );
+                break;
+            case 'Symbol':
+                $fontFile = self::SYMBOL;
+                break;
+            case 'Tahoma':
+                $fontFile = (
+                    $bold ? self::TAHOMA_BOLD : self::TAHOMA
+                );
+                break;
+            case 'Times New Roman':
+                $fontFile = (
+                    $bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
+                          : ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
+                );
+                break;
+            case 'Trebuchet MS':
+                $fontFile = (
+                    $bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
+                          : ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
+                );
+                break;
+            case 'Verdana':
+                $fontFile = (
+                    $bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
+                          : ($italic ? self::VERDANA_ITALIC : self::VERDANA)
+                );
+                break;
+            default:
+                throw new PHPExcel_Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
+                break;
+        }
+
+        $fontFile = self::$trueTypeFontPath . $fontFile;
+
+        // Check if file actually exists
+        if (!file_exists($fontFile)) {
+            throw new PHPExcel_Exception('TrueType Font file not found');
+        }
+
+        return $fontFile;
+    }
+
+    /**
+     * Returns the associated charset for the font name.
+     *
+     * @param string $name Font name
+     * @return int Character set code
+     */
+    public static function getCharsetFromFontName($name)
+    {
+        switch ($name) {
+            // Add more cases. Check FONT records in real Excel files.
+            case 'EucrosiaUPC':
+                return self::CHARSET_ANSI_THAI;
+            case 'Wingdings':
+                return self::CHARSET_SYMBOL;
+            case 'Wingdings 2':
+                return self::CHARSET_SYMBOL;
+            case 'Wingdings 3':
+                return self::CHARSET_SYMBOL;
+            default:
+                return self::CHARSET_ANSI_LATIN;
+        }
+    }
+
+    /**
+     * Get the effective column width for columns without a column dimension or column with width -1
+     * For example, for Calibri 11 this is 9.140625 (64 px)
+     *
+     * @param PHPExcel_Style_Font $font The workbooks default font
+     * @param boolean $pPixels true = return column width in pixels, false = return in OOXML units
+     * @return mixed Column width
+     */
+    public static function getDefaultColumnWidthByFont(PHPExcel_Style_Font $font, $pPixels = false)
+    {
+        if (isset(self::$defaultColumnWidths[$font->getName()][$font->getSize()])) {
+            // Exact width can be determined
+            $columnWidth = $pPixels ?
+                self::$defaultColumnWidths[$font->getName()][$font->getSize()]['px']
+                    : self::$defaultColumnWidths[$font->getName()][$font->getSize()]['width'];
+
+        } else {
+            // We don't have data for this particular font and size, use approximation by
+            // extrapolating from Calibri 11
+            $columnWidth = $pPixels ?
+                self::$defaultColumnWidths['Calibri'][11]['px']
+                    : self::$defaultColumnWidths['Calibri'][11]['width'];
+            $columnWidth = $columnWidth * $font->getSize() / 11;
+
+            // Round pixels to closest integer
+            if ($pPixels) {
+                $columnWidth = (int) round($columnWidth);
+            }
+        }
+
+        return $columnWidth;
+    }
+
+    /**
+     * Get the effective row height for rows without a row dimension or rows with height -1
+     * For example, for Calibri 11 this is 15 points
+     *
+     * @param PHPExcel_Style_Font $font The workbooks default font
+     * @return float Row height in points
+     */
+    public static function getDefaultRowHeightByFont(PHPExcel_Style_Font $font)
+    {
+        switch ($font->getName()) {
+            case 'Arial':
+                switch ($font->getSize()) {
+                    case 10:
+                        // inspection of Arial 10 workbook says 12.75pt ~17px
+                        $rowHeight = 12.75;
+                        break;
+                    case 9:
+                        // inspection of Arial 9 workbook says 12.00pt ~16px
+                        $rowHeight = 12;
+                        break;
+                    case 8:
+                        // inspection of Arial 8 workbook says 11.25pt ~15px
+                        $rowHeight = 11.25;
+                        break;
+                    case 7:
+                        // inspection of Arial 7 workbook says 9.00pt ~12px
+                        $rowHeight = 9;
+                        break;
+                    case 6:
+                    case 5:
+                        // inspection of Arial 5,6 workbook says 8.25pt ~11px
+                        $rowHeight = 8.25;
+                        break;
+                    case 4:
+                        // inspection of Arial 4 workbook says 6.75pt ~9px
+                        $rowHeight = 6.75;
+                        break;
+                    case 3:
+                        // inspection of Arial 3 workbook says 6.00pt ~8px
+                        $rowHeight = 6;
+                        break;
+                    case 2:
+                    case 1:
+                        // inspection of Arial 1,2 workbook says 5.25pt ~7px
+                        $rowHeight = 5.25;
+                        break;
+                    default:
+                        // use Arial 10 workbook as an approximation, extrapolation
+                        $rowHeight = 12.75 * $font->getSize() / 10;
+                        break;
+                }
+                break;
+
+            case 'Calibri':
+                switch ($font->getSize()) {
+                    case 11:
+                        // inspection of Calibri 11 workbook says 15.00pt ~20px
+                        $rowHeight = 15;
+                        break;
+                    case 10:
+                        // inspection of Calibri 10 workbook says 12.75pt ~17px
+                        $rowHeight = 12.75;
+                        break;
+                    case 9:
+                        // inspection of Calibri 9 workbook says 12.00pt ~16px
+                        $rowHeight = 12;
+                        break;
+                    case 8:
+                        // inspection of Calibri 8 workbook says 11.25pt ~15px
+                        $rowHeight = 11.25;
+                        break;
+                    case 7:
+                        // inspection of Calibri 7 workbook says 9.00pt ~12px
+                        $rowHeight = 9;
+                        break;
+                    case 6:
+                    case 5:
+                        // inspection of Calibri 5,6 workbook says 8.25pt ~11px
+                        $rowHeight = 8.25;
+                        break;
+                    case 4:
+                        // inspection of Calibri 4 workbook says 6.75pt ~9px
+                        $rowHeight = 6.75;
+                        break;
+                    case 3:
+                        // inspection of Calibri 3 workbook says 6.00pt ~8px
+                        $rowHeight = 6.00;
+                        break;
+                    case 2:
+                    case 1:
+                        // inspection of Calibri 1,2 workbook says 5.25pt ~7px
+                        $rowHeight = 5.25;
+                        break;
+                    default:
+                        // use Calibri 11 workbook as an approximation, extrapolation
+                        $rowHeight = 15 * $font->getSize() / 11;
+                        break;
+                }
+                break;
+
+            case 'Verdana':
+                switch ($font->getSize()) {
+                    case 10:
+                        // inspection of Verdana 10 workbook says 12.75pt ~17px
+                        $rowHeight = 12.75;
+                        break;
+                    case 9:
+                        // inspection of Verdana 9 workbook says 11.25pt ~15px
+                        $rowHeight = 11.25;
+                        break;
+                    case 8:
+                        // inspection of Verdana 8 workbook says 10.50pt ~14px
+                        $rowHeight = 10.50;
+                        break;
+                    case 7:
+                        // inspection of Verdana 7 workbook says 9.00pt ~12px
+                        $rowHeight = 9.00;
+                        break;
+                    case 6:
+                    case 5:
+                        // inspection of Verdana 5,6 workbook says 8.25pt ~11px
+                        $rowHeight = 8.25;
+                        break;
+                    case 4:
+                        // inspection of Verdana 4 workbook says 6.75pt ~9px
+                        $rowHeight = 6.75;
+                        break;
+                    case 3:
+                        // inspection of Verdana 3 workbook says 6.00pt ~8px
+                        $rowHeight = 6;
+                        break;
+                    case 2:
+                    case 1:
+                        // inspection of Verdana 1,2 workbook says 5.25pt ~7px
+                        $rowHeight = 5.25;
+                        break;
+                    default:
+                        // use Verdana 10 workbook as an approximation, extrapolation
+                        $rowHeight = 12.75 * $font->getSize() / 10;
+                        break;
+                }
+                break;
+            default:
+                // just use Calibri as an approximation
+                $rowHeight = 15 * $font->getSize() / 11;
+                break;
+        }
+
+        return $rowHeight;
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/lib/PHPExcel/Shared/JAMA/CHANGELOG.TXT
new file mode 100644
index 000000000..1c18a5da3
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/CHANGELOG.TXT
@@ -0,0 +1,16 @@
+Mar 1, 2005 11:15 AST by PM
+
++ For consistency, renamed Math.php to Maths.java, utils to util, 
+  tests to test, docs to doc - 
+
++ Removed conditional logic from top of Matrix class.
+
++ Switched to using hypo function in Maths.php for all php-hypot calls.
+  NOTE TO SELF: Need to make sure that all decompositions have been 
+  switched over to using the bundled hypo.
+
+Feb 25, 2005 at 10:00 AST by PM
+
++ Recommend using simpler Error.php instead of JAMA_Error.php but 
+  can be persuaded otherwise.
+
diff --git a/lib/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/lib/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
new file mode 100644
index 000000000..d68109b31
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    Cholesky decomposition class
+ *
+ *    For a symmetric, positive definite matrix A, the Cholesky decomposition
+ *    is an lower triangular matrix L so that A = L*L'.
+ *
+ *    If the matrix is not symmetric or positive definite, the constructor
+ *    returns a partial decomposition and sets an internal flag that may
+ *    be queried by the isSPD() method.
+ *
+ *    @author Paul Meagher
+ *    @author Michael Bommarito
+ *    @version 1.2
+ */
+class CholeskyDecomposition
+{
+    /**
+     *    Decomposition storage
+     *    @var array
+     *    @access private
+     */
+    private $L = array();
+
+    /**
+     *    Matrix row and column dimension
+     *    @var int
+     *    @access private
+     */
+    private $m;
+
+    /**
+     *    Symmetric positive definite flag
+     *    @var boolean
+     *    @access private
+     */
+    private $isspd = true;
+
+    /**
+     *    CholeskyDecomposition
+     *
+     *    Class constructor - decomposes symmetric positive definite matrix
+     *    @param mixed Matrix square symmetric positive definite matrix
+     */
+    public function __construct($A = null)
+    {
+        if ($A instanceof Matrix) {
+            $this->L = $A->getArray();
+            $this->m = $A->getRowDimension();
+
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = $i; $j < $this->m; ++$j) {
+                    for ($sum = $this->L[$i][$j], $k = $i - 1; $k >= 0; --$k) {
+                        $sum -= $this->L[$i][$k] * $this->L[$j][$k];
+                    }
+                    if ($i == $j) {
+                        if ($sum >= 0) {
+                            $this->L[$i][$i] = sqrt($sum);
+                        } else {
+                            $this->isspd = false;
+                        }
+                    } else {
+                        if ($this->L[$i][$i] != 0) {
+                            $this->L[$j][$i] = $sum / $this->L[$i][$i];
+                        }
+                    }
+                }
+
+                for ($k = $i+1; $k < $this->m; ++$k) {
+                    $this->L[$i][$k] = 0.0;
+                }
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION));
+        }
+    }    //    function __construct()
+
+    /**
+     *    Is the matrix symmetric and positive definite?
+     *
+     *    @return boolean
+     */
+    public function isSPD()
+    {
+        return $this->isspd;
+    }    //    function isSPD()
+
+    /**
+     *    getL
+     *
+     *    Return triangular factor.
+     *    @return Matrix Lower triangular matrix
+     */
+    public function getL()
+    {
+        return new Matrix($this->L);
+    }    //    function getL()
+
+    /**
+     *    Solve A*X = B
+     *
+     *    @param $B Row-equal matrix
+     *    @return Matrix L * L' * X = B
+     */
+    public function solve($B = null)
+    {
+        if ($B instanceof Matrix) {
+            if ($B->getRowDimension() == $this->m) {
+                if ($this->isspd) {
+                    $X  = $B->getArrayCopy();
+                    $nx = $B->getColumnDimension();
+
+                    for ($k = 0; $k < $this->m; ++$k) {
+                        for ($i = $k + 1; $i < $this->m; ++$i) {
+                            for ($j = 0; $j < $nx; ++$j) {
+                                $X[$i][$j] -= $X[$k][$j] * $this->L[$i][$k];
+                            }
+                        }
+                        for ($j = 0; $j < $nx; ++$j) {
+                            $X[$k][$j] /= $this->L[$k][$k];
+                        }
+                    }
+
+                    for ($k = $this->m - 1; $k >= 0; --$k) {
+                        for ($j = 0; $j < $nx; ++$j) {
+                            $X[$k][$j] /= $this->L[$k][$k];
+                        }
+                        for ($i = 0; $i < $k; ++$i) {
+                            for ($j = 0; $j < $nx; ++$j) {
+                                $X[$i][$j] -= $X[$k][$j] * $this->L[$k][$i];
+                            }
+                        }
+                    }
+
+                    return new Matrix($X, $this->m, $nx);
+                } else {
+                    throw new PHPExcel_Calculation_Exception(JAMAError(MatrixSPDException));
+                }
+            } else {
+                throw new PHPExcel_Calculation_Exception(JAMAError(MATRIX_DIMENSION_EXCEPTION));
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION));
+        }
+    }    //    function solve()
+}
diff --git a/lib/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/lib/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
new file mode 100644
index 000000000..d4ae3979f
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
@@ -0,0 +1,864 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    Class to obtain eigenvalues and eigenvectors of a real matrix.
+ *
+ *    If A is symmetric, then A = V*D*V' where the eigenvalue matrix D
+ *    is diagonal and the eigenvector matrix V is orthogonal (i.e.
+ *    A = V.times(D.times(V.transpose())) and V.times(V.transpose())
+ *    equals the identity matrix).
+ *
+ *    If A is not symmetric, then the eigenvalue matrix D is block diagonal
+ *    with the real eigenvalues in 1-by-1 blocks and any complex eigenvalues,
+ *    lambda + i*mu, in 2-by-2 blocks, [lambda, mu; -mu, lambda].  The
+ *    columns of V represent the eigenvectors in the sense that A*V = V*D,
+ *    i.e. A.times(V) equals V.times(D).  The matrix V may be badly
+ *    conditioned, or even singular, so the validity of the equation
+ *    A = V*D*inverse(V) depends upon V.cond().
+ *
+ *    @author  Paul Meagher
+ *    @license PHP v3.0
+ *    @version 1.1
+ */
+class EigenvalueDecomposition
+{
+    /**
+     *    Row and column dimension (square matrix).
+     *    @var int
+     */
+    private $n;
+
+    /**
+     *    Internal symmetry flag.
+     *    @var int
+     */
+    private $issymmetric;
+
+    /**
+     *    Arrays for internal storage of eigenvalues.
+     *    @var array
+     */
+    private $d = array();
+    private $e = array();
+
+    /**
+     *    Array for internal storage of eigenvectors.
+     *    @var array
+     */
+    private $V = array();
+
+    /**
+    *    Array for internal storage of nonsymmetric Hessenberg form.
+    *    @var array
+    */
+    private $H = array();
+
+    /**
+    *    Working storage for nonsymmetric algorithm.
+    *    @var array
+    */
+    private $ort;
+
+    /**
+    *    Used for complex scalar division.
+    *    @var float
+    */
+    private $cdivr;
+    private $cdivi;
+
+    /**
+     *    Symmetric Householder reduction to tridiagonal form.
+     *
+     *    @access private
+     */
+    private function tred2()
+    {
+        //  This is derived from the Algol procedures tred2 by
+        //  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
+        //  Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
+        //  Fortran subroutine in EISPACK.
+        $this->d = $this->V[$this->n-1];
+        // Householder reduction to tridiagonal form.
+        for ($i = $this->n-1; $i > 0; --$i) {
+            $i_ = $i -1;
+            // Scale to avoid under/overflow.
+            $h = $scale = 0.0;
+            $scale += array_sum(array_map(abs, $this->d));
+            if ($scale == 0.0) {
+                $this->e[$i] = $this->d[$i_];
+                $this->d = array_slice($this->V[$i_], 0, $i_);
+                for ($j = 0; $j < $i; ++$j) {
+                    $this->V[$j][$i] = $this->V[$i][$j] = 0.0;
+                }
+            } else {
+                // Generate Householder vector.
+                for ($k = 0; $k < $i; ++$k) {
+                    $this->d[$k] /= $scale;
+                    $h += pow($this->d[$k], 2);
+                }
+                $f = $this->d[$i_];
+                $g = sqrt($h);
+                if ($f > 0) {
+                    $g = -$g;
+                }
+                $this->e[$i] = $scale * $g;
+                $h = $h - $f * $g;
+                $this->d[$i_] = $f - $g;
+                for ($j = 0; $j < $i; ++$j) {
+                    $this->e[$j] = 0.0;
+                }
+                // Apply similarity transformation to remaining columns.
+                for ($j = 0; $j < $i; ++$j) {
+                    $f = $this->d[$j];
+                    $this->V[$j][$i] = $f;
+                    $g = $this->e[$j] + $this->V[$j][$j] * $f;
+                    for ($k = $j+1; $k <= $i_; ++$k) {
+                        $g += $this->V[$k][$j] * $this->d[$k];
+                        $this->e[$k] += $this->V[$k][$j] * $f;
+                    }
+                    $this->e[$j] = $g;
+                }
+                $f = 0.0;
+                for ($j = 0; $j < $i; ++$j) {
+                    $this->e[$j] /= $h;
+                    $f += $this->e[$j] * $this->d[$j];
+                }
+                $hh = $f / (2 * $h);
+                for ($j=0; $j < $i; ++$j) {
+                    $this->e[$j] -= $hh * $this->d[$j];
+                }
+                for ($j = 0; $j < $i; ++$j) {
+                    $f = $this->d[$j];
+                    $g = $this->e[$j];
+                    for ($k = $j; $k <= $i_; ++$k) {
+                        $this->V[$k][$j] -= ($f * $this->e[$k] + $g * $this->d[$k]);
+                    }
+                    $this->d[$j] = $this->V[$i-1][$j];
+                    $this->V[$i][$j] = 0.0;
+                }
+            }
+            $this->d[$i] = $h;
+        }
+
+        // Accumulate transformations.
+        for ($i = 0; $i < $this->n-1; ++$i) {
+            $this->V[$this->n-1][$i] = $this->V[$i][$i];
+            $this->V[$i][$i] = 1.0;
+            $h = $this->d[$i+1];
+            if ($h != 0.0) {
+                for ($k = 0; $k <= $i; ++$k) {
+                    $this->d[$k] = $this->V[$k][$i+1] / $h;
+                }
+                for ($j = 0; $j <= $i; ++$j) {
+                    $g = 0.0;
+                    for ($k = 0; $k <= $i; ++$k) {
+                        $g += $this->V[$k][$i+1] * $this->V[$k][$j];
+                    }
+                    for ($k = 0; $k <= $i; ++$k) {
+                        $this->V[$k][$j] -= $g * $this->d[$k];
+                    }
+                }
+            }
+            for ($k = 0; $k <= $i; ++$k) {
+                $this->V[$k][$i+1] = 0.0;
+            }
+        }
+
+        $this->d = $this->V[$this->n-1];
+        $this->V[$this->n-1] = array_fill(0, $j, 0.0);
+        $this->V[$this->n-1][$this->n-1] = 1.0;
+        $this->e[0] = 0.0;
+    }
+
+    /**
+     *    Symmetric tridiagonal QL algorithm.
+     *
+     *    This is derived from the Algol procedures tql2, by
+     *    Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
+     *    Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
+     *    Fortran subroutine in EISPACK.
+     *
+     *    @access private
+     */
+    private function tql2()
+    {
+        for ($i = 1; $i < $this->n; ++$i) {
+            $this->e[$i-1] = $this->e[$i];
+        }
+        $this->e[$this->n-1] = 0.0;
+        $f = 0.0;
+        $tst1 = 0.0;
+        $eps  = pow(2.0, -52.0);
+
+        for ($l = 0; $l < $this->n; ++$l) {
+            // Find small subdiagonal element
+            $tst1 = max($tst1, abs($this->d[$l]) + abs($this->e[$l]));
+            $m = $l;
+            while ($m < $this->n) {
+                if (abs($this->e[$m]) <= $eps * $tst1) {
+                    break;
+                }
+                ++$m;
+            }
+            // If m == l, $this->d[l] is an eigenvalue,
+            // otherwise, iterate.
+            if ($m > $l) {
+                $iter = 0;
+                do {
+                    // Could check iteration count here.
+                    $iter += 1;
+                    // Compute implicit shift
+                    $g = $this->d[$l];
+                    $p = ($this->d[$l+1] - $g) / (2.0 * $this->e[$l]);
+                    $r = hypo($p, 1.0);
+                    if ($p < 0) {
+                        $r *= -1;
+                    }
+                    $this->d[$l] = $this->e[$l] / ($p + $r);
+                    $this->d[$l+1] = $this->e[$l] * ($p + $r);
+                    $dl1 = $this->d[$l+1];
+                    $h = $g - $this->d[$l];
+                    for ($i = $l + 2; $i < $this->n; ++$i) {
+                        $this->d[$i] -= $h;
+                    }
+                    $f += $h;
+                    // Implicit QL transformation.
+                    $p = $this->d[$m];
+                    $c = 1.0;
+                    $c2 = $c3 = $c;
+                    $el1 = $this->e[$l + 1];
+                    $s = $s2 = 0.0;
+                    for ($i = $m-1; $i >= $l; --$i) {
+                        $c3 = $c2;
+                        $c2 = $c;
+                        $s2 = $s;
+                        $g  = $c * $this->e[$i];
+                        $h  = $c * $p;
+                        $r  = hypo($p, $this->e[$i]);
+                        $this->e[$i+1] = $s * $r;
+                        $s = $this->e[$i] / $r;
+                        $c = $p / $r;
+                        $p = $c * $this->d[$i] - $s * $g;
+                        $this->d[$i+1] = $h + $s * ($c * $g + $s * $this->d[$i]);
+                        // Accumulate transformation.
+                        for ($k = 0; $k < $this->n; ++$k) {
+                            $h = $this->V[$k][$i+1];
+                            $this->V[$k][$i+1] = $s * $this->V[$k][$i] + $c * $h;
+                            $this->V[$k][$i] = $c * $this->V[$k][$i] - $s * $h;
+                        }
+                    }
+                    $p = -$s * $s2 * $c3 * $el1 * $this->e[$l] / $dl1;
+                    $this->e[$l] = $s * $p;
+                    $this->d[$l] = $c * $p;
+                // Check for convergence.
+                } while (abs($this->e[$l]) > $eps * $tst1);
+            }
+            $this->d[$l] = $this->d[$l] + $f;
+            $this->e[$l] = 0.0;
+        }
+
+        // Sort eigenvalues and corresponding vectors.
+        for ($i = 0; $i < $this->n - 1; ++$i) {
+            $k = $i;
+            $p = $this->d[$i];
+            for ($j = $i+1; $j < $this->n; ++$j) {
+                if ($this->d[$j] < $p) {
+                    $k = $j;
+                    $p = $this->d[$j];
+                }
+            }
+            if ($k != $i) {
+                $this->d[$k] = $this->d[$i];
+                $this->d[$i] = $p;
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $p = $this->V[$j][$i];
+                    $this->V[$j][$i] = $this->V[$j][$k];
+                    $this->V[$j][$k] = $p;
+                }
+            }
+        }
+    }
+
+    /**
+     *    Nonsymmetric reduction to Hessenberg form.
+     *
+     *    This is derived from the Algol procedures orthes and ortran,
+     *    by Martin and Wilkinson, Handbook for Auto. Comp.,
+     *    Vol.ii-Linear Algebra, and the corresponding
+     *    Fortran subroutines in EISPACK.
+     *
+     *    @access private
+     */
+    private function orthes()
+    {
+        $low  = 0;
+        $high = $this->n-1;
+
+        for ($m = $low+1; $m <= $high-1; ++$m) {
+            // Scale column.
+            $scale = 0.0;
+            for ($i = $m; $i <= $high; ++$i) {
+                $scale = $scale + abs($this->H[$i][$m-1]);
+            }
+            if ($scale != 0.0) {
+                // Compute Householder transformation.
+                $h = 0.0;
+                for ($i = $high; $i >= $m; --$i) {
+                    $this->ort[$i] = $this->H[$i][$m-1] / $scale;
+                    $h += $this->ort[$i] * $this->ort[$i];
+                }
+                $g = sqrt($h);
+                if ($this->ort[$m] > 0) {
+                    $g *= -1;
+                }
+                $h -= $this->ort[$m] * $g;
+                $this->ort[$m] -= $g;
+                // Apply Householder similarity transformation
+                // H = (I -u * u' / h) * H * (I -u * u') / h)
+                for ($j = $m; $j < $this->n; ++$j) {
+                    $f = 0.0;
+                    for ($i = $high; $i >= $m; --$i) {
+                        $f += $this->ort[$i] * $this->H[$i][$j];
+                    }
+                    $f /= $h;
+                    for ($i = $m; $i <= $high; ++$i) {
+                        $this->H[$i][$j] -= $f * $this->ort[$i];
+                    }
+                }
+                for ($i = 0; $i <= $high; ++$i) {
+                    $f = 0.0;
+                    for ($j = $high; $j >= $m; --$j) {
+                        $f += $this->ort[$j] * $this->H[$i][$j];
+                    }
+                    $f = $f / $h;
+                    for ($j = $m; $j <= $high; ++$j) {
+                        $this->H[$i][$j] -= $f * $this->ort[$j];
+                    }
+                }
+                $this->ort[$m] = $scale * $this->ort[$m];
+                $this->H[$m][$m-1] = $scale * $g;
+            }
+        }
+
+        // Accumulate transformations (Algol's ortran).
+        for ($i = 0; $i < $this->n; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                $this->V[$i][$j] = ($i == $j ? 1.0 : 0.0);
+            }
+        }
+        for ($m = $high-1; $m >= $low+1; --$m) {
+            if ($this->H[$m][$m-1] != 0.0) {
+                for ($i = $m+1; $i <= $high; ++$i) {
+                    $this->ort[$i] = $this->H[$i][$m-1];
+                }
+                for ($j = $m; $j <= $high; ++$j) {
+                    $g = 0.0;
+                    for ($i = $m; $i <= $high; ++$i) {
+                        $g += $this->ort[$i] * $this->V[$i][$j];
+                    }
+                    // Double division avoids possible underflow
+                    $g = ($g / $this->ort[$m]) / $this->H[$m][$m-1];
+                    for ($i = $m; $i <= $high; ++$i) {
+                        $this->V[$i][$j] += $g * $this->ort[$i];
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     *    Performs complex division.
+     *
+     *    @access private
+     */
+    private function cdiv($xr, $xi, $yr, $yi)
+    {
+        if (abs($yr) > abs($yi)) {
+            $r = $yi / $yr;
+            $d = $yr + $r * $yi;
+            $this->cdivr = ($xr + $r * $xi) / $d;
+            $this->cdivi = ($xi - $r * $xr) / $d;
+        } else {
+            $r = $yr / $yi;
+            $d = $yi + $r * $yr;
+            $this->cdivr = ($r * $xr + $xi) / $d;
+            $this->cdivi = ($r * $xi - $xr) / $d;
+        }
+    }
+
+    /**
+     *    Nonsymmetric reduction from Hessenberg to real Schur form.
+     *
+     *    Code is derived from the Algol procedure hqr2,
+     *    by Martin and Wilkinson, Handbook for Auto. Comp.,
+     *    Vol.ii-Linear Algebra, and the corresponding
+     *    Fortran subroutine in EISPACK.
+     *
+     *    @access private
+     */
+    private function hqr2()
+    {
+        //  Initialize
+        $nn = $this->n;
+        $n  = $nn - 1;
+        $low = 0;
+        $high = $nn - 1;
+        $eps = pow(2.0, -52.0);
+        $exshift = 0.0;
+        $p = $q = $r = $s = $z = 0;
+        // Store roots isolated by balanc and compute matrix norm
+        $norm = 0.0;
+
+        for ($i = 0; $i < $nn; ++$i) {
+            if (($i < $low) or ($i > $high)) {
+                $this->d[$i] = $this->H[$i][$i];
+                $this->e[$i] = 0.0;
+            }
+            for ($j = max($i-1, 0); $j < $nn; ++$j) {
+                $norm = $norm + abs($this->H[$i][$j]);
+            }
+        }
+
+        // Outer loop over eigenvalue index
+        $iter = 0;
+        while ($n >= $low) {
+            // Look for single small sub-diagonal element
+            $l = $n;
+            while ($l > $low) {
+                $s = abs($this->H[$l-1][$l-1]) + abs($this->H[$l][$l]);
+                if ($s == 0.0) {
+                    $s = $norm;
+                }
+                if (abs($this->H[$l][$l-1]) < $eps * $s) {
+                    break;
+                }
+                --$l;
+            }
+            // Check for convergence
+            // One root found
+            if ($l == $n) {
+                $this->H[$n][$n] = $this->H[$n][$n] + $exshift;
+                $this->d[$n] = $this->H[$n][$n];
+                $this->e[$n] = 0.0;
+                --$n;
+                $iter = 0;
+            // Two roots found
+            } elseif ($l == $n-1) {
+                $w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
+                $p = ($this->H[$n-1][$n-1] - $this->H[$n][$n]) / 2.0;
+                $q = $p * $p + $w;
+                $z = sqrt(abs($q));
+                $this->H[$n][$n] = $this->H[$n][$n] + $exshift;
+                $this->H[$n-1][$n-1] = $this->H[$n-1][$n-1] + $exshift;
+                $x = $this->H[$n][$n];
+                // Real pair
+                if ($q >= 0) {
+                    if ($p >= 0) {
+                        $z = $p + $z;
+                    } else {
+                        $z = $p - $z;
+                    }
+                    $this->d[$n-1] = $x + $z;
+                    $this->d[$n] = $this->d[$n-1];
+                    if ($z != 0.0) {
+                        $this->d[$n] = $x - $w / $z;
+                    }
+                    $this->e[$n-1] = 0.0;
+                    $this->e[$n] = 0.0;
+                    $x = $this->H[$n][$n-1];
+                    $s = abs($x) + abs($z);
+                    $p = $x / $s;
+                    $q = $z / $s;
+                    $r = sqrt($p * $p + $q * $q);
+                    $p = $p / $r;
+                    $q = $q / $r;
+                    // Row modification
+                    for ($j = $n-1; $j < $nn; ++$j) {
+                        $z = $this->H[$n-1][$j];
+                        $this->H[$n-1][$j] = $q * $z + $p * $this->H[$n][$j];
+                        $this->H[$n][$j] = $q * $this->H[$n][$j] - $p * $z;
+                    }
+                    // Column modification
+                    for ($i = 0; $i <= $n; ++$i) {
+                        $z = $this->H[$i][$n-1];
+                        $this->H[$i][$n-1] = $q * $z + $p * $this->H[$i][$n];
+                        $this->H[$i][$n] = $q * $this->H[$i][$n] - $p * $z;
+                    }
+                    // Accumulate transformations
+                    for ($i = $low; $i <= $high; ++$i) {
+                        $z = $this->V[$i][$n-1];
+                        $this->V[$i][$n-1] = $q * $z + $p * $this->V[$i][$n];
+                        $this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
+                    }
+                // Complex pair
+                } else {
+                    $this->d[$n-1] = $x + $p;
+                    $this->d[$n] = $x + $p;
+                    $this->e[$n-1] = $z;
+                    $this->e[$n] = -$z;
+                }
+                $n = $n - 2;
+                $iter = 0;
+            // No convergence yet
+            } else {
+                // Form shift
+                $x = $this->H[$n][$n];
+                $y = 0.0;
+                $w = 0.0;
+                if ($l < $n) {
+                    $y = $this->H[$n-1][$n-1];
+                    $w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
+                }
+                // Wilkinson's original ad hoc shift
+                if ($iter == 10) {
+                    $exshift += $x;
+                    for ($i = $low; $i <= $n; ++$i) {
+                        $this->H[$i][$i] -= $x;
+                    }
+                    $s = abs($this->H[$n][$n-1]) + abs($this->H[$n-1][$n-2]);
+                    $x = $y = 0.75 * $s;
+                    $w = -0.4375 * $s * $s;
+                }
+                // MATLAB's new ad hoc shift
+                if ($iter == 30) {
+                    $s = ($y - $x) / 2.0;
+                    $s = $s * $s + $w;
+                    if ($s > 0) {
+                        $s = sqrt($s);
+                        if ($y < $x) {
+                            $s = -$s;
+                        }
+                        $s = $x - $w / (($y - $x) / 2.0 + $s);
+                        for ($i = $low; $i <= $n; ++$i) {
+                            $this->H[$i][$i] -= $s;
+                        }
+                        $exshift += $s;
+                        $x = $y = $w = 0.964;
+                    }
+                }
+                // Could check iteration count here.
+                $iter = $iter + 1;
+                // Look for two consecutive small sub-diagonal elements
+                $m = $n - 2;
+                while ($m >= $l) {
+                    $z = $this->H[$m][$m];
+                    $r = $x - $z;
+                    $s = $y - $z;
+                    $p = ($r * $s - $w) / $this->H[$m+1][$m] + $this->H[$m][$m+1];
+                    $q = $this->H[$m+1][$m+1] - $z - $r - $s;
+                    $r = $this->H[$m+2][$m+1];
+                    $s = abs($p) + abs($q) + abs($r);
+                    $p = $p / $s;
+                    $q = $q / $s;
+                    $r = $r / $s;
+                    if ($m == $l) {
+                        break;
+                    }
+                    if (abs($this->H[$m][$m-1]) * (abs($q) + abs($r)) <
+                        $eps * (abs($p) * (abs($this->H[$m-1][$m-1]) + abs($z) + abs($this->H[$m+1][$m+1])))) {
+                        break;
+                    }
+                    --$m;
+                }
+                for ($i = $m + 2; $i <= $n; ++$i) {
+                    $this->H[$i][$i-2] = 0.0;
+                    if ($i > $m+2) {
+                        $this->H[$i][$i-3] = 0.0;
+                    }
+                }
+                // Double QR step involving rows l:n and columns m:n
+                for ($k = $m; $k <= $n-1; ++$k) {
+                    $notlast = ($k != $n-1);
+                    if ($k != $m) {
+                        $p = $this->H[$k][$k-1];
+                        $q = $this->H[$k+1][$k-1];
+                        $r = ($notlast ? $this->H[$k+2][$k-1] : 0.0);
+                        $x = abs($p) + abs($q) + abs($r);
+                        if ($x != 0.0) {
+                            $p = $p / $x;
+                            $q = $q / $x;
+                            $r = $r / $x;
+                        }
+                    }
+                    if ($x == 0.0) {
+                        break;
+                    }
+                    $s = sqrt($p * $p + $q * $q + $r * $r);
+                    if ($p < 0) {
+                        $s = -$s;
+                    }
+                    if ($s != 0) {
+                        if ($k != $m) {
+                            $this->H[$k][$k-1] = -$s * $x;
+                        } elseif ($l != $m) {
+                            $this->H[$k][$k-1] = -$this->H[$k][$k-1];
+                        }
+                        $p = $p + $s;
+                        $x = $p / $s;
+                        $y = $q / $s;
+                        $z = $r / $s;
+                        $q = $q / $p;
+                        $r = $r / $p;
+                        // Row modification
+                        for ($j = $k; $j < $nn; ++$j) {
+                            $p = $this->H[$k][$j] + $q * $this->H[$k+1][$j];
+                            if ($notlast) {
+                                $p = $p + $r * $this->H[$k+2][$j];
+                                $this->H[$k+2][$j] = $this->H[$k+2][$j] - $p * $z;
+                            }
+                            $this->H[$k][$j] = $this->H[$k][$j] - $p * $x;
+                            $this->H[$k+1][$j] = $this->H[$k+1][$j] - $p * $y;
+                        }
+                        // Column modification
+                        for ($i = 0; $i <= min($n, $k+3); ++$i) {
+                            $p = $x * $this->H[$i][$k] + $y * $this->H[$i][$k+1];
+                            if ($notlast) {
+                                $p = $p + $z * $this->H[$i][$k+2];
+                                $this->H[$i][$k+2] = $this->H[$i][$k+2] - $p * $r;
+                            }
+                            $this->H[$i][$k] = $this->H[$i][$k] - $p;
+                            $this->H[$i][$k+1] = $this->H[$i][$k+1] - $p * $q;
+                        }
+                        // Accumulate transformations
+                        for ($i = $low; $i <= $high; ++$i) {
+                            $p = $x * $this->V[$i][$k] + $y * $this->V[$i][$k+1];
+                            if ($notlast) {
+                                $p = $p + $z * $this->V[$i][$k+2];
+                                $this->V[$i][$k+2] = $this->V[$i][$k+2] - $p * $r;
+                            }
+                            $this->V[$i][$k] = $this->V[$i][$k] - $p;
+                            $this->V[$i][$k+1] = $this->V[$i][$k+1] - $p * $q;
+                        }
+                    }  // ($s != 0)
+                }  // k loop
+            }  // check convergence
+        }  // while ($n >= $low)
+
+        // Backsubstitute to find vectors of upper triangular form
+        if ($norm == 0.0) {
+            return;
+        }
+
+        for ($n = $nn-1; $n >= 0; --$n) {
+            $p = $this->d[$n];
+            $q = $this->e[$n];
+            // Real vector
+            if ($q == 0) {
+                $l = $n;
+                $this->H[$n][$n] = 1.0;
+                for ($i = $n-1; $i >= 0; --$i) {
+                    $w = $this->H[$i][$i] - $p;
+                    $r = 0.0;
+                    for ($j = $l; $j <= $n; ++$j) {
+                        $r = $r + $this->H[$i][$j] * $this->H[$j][$n];
+                    }
+                    if ($this->e[$i] < 0.0) {
+                        $z = $w;
+                        $s = $r;
+                    } else {
+                        $l = $i;
+                        if ($this->e[$i] == 0.0) {
+                            if ($w != 0.0) {
+                                $this->H[$i][$n] = -$r / $w;
+                            } else {
+                                $this->H[$i][$n] = -$r / ($eps * $norm);
+                            }
+                        // Solve real equations
+                        } else {
+                            $x = $this->H[$i][$i+1];
+                            $y = $this->H[$i+1][$i];
+                            $q = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i];
+                            $t = ($x * $s - $z * $r) / $q;
+                            $this->H[$i][$n] = $t;
+                            if (abs($x) > abs($z)) {
+                                $this->H[$i+1][$n] = (-$r - $w * $t) / $x;
+                            } else {
+                                $this->H[$i+1][$n] = (-$s - $y * $t) / $z;
+                            }
+                        }
+                        // Overflow control
+                        $t = abs($this->H[$i][$n]);
+                        if (($eps * $t) * $t > 1) {
+                            for ($j = $i; $j <= $n; ++$j) {
+                                $this->H[$j][$n] = $this->H[$j][$n] / $t;
+                            }
+                        }
+                    }
+                }
+            // Complex vector
+            } elseif ($q < 0) {
+                $l = $n-1;
+                // Last vector component imaginary so matrix is triangular
+                if (abs($this->H[$n][$n-1]) > abs($this->H[$n-1][$n])) {
+                    $this->H[$n-1][$n-1] = $q / $this->H[$n][$n-1];
+                    $this->H[$n-1][$n] = -($this->H[$n][$n] - $p) / $this->H[$n][$n-1];
+                } else {
+                    $this->cdiv(0.0, -$this->H[$n-1][$n], $this->H[$n-1][$n-1] - $p, $q);
+                    $this->H[$n-1][$n-1] = $this->cdivr;
+                    $this->H[$n-1][$n]   = $this->cdivi;
+                }
+                $this->H[$n][$n-1] = 0.0;
+                $this->H[$n][$n] = 1.0;
+                for ($i = $n-2; $i >= 0; --$i) {
+                    // double ra,sa,vr,vi;
+                    $ra = 0.0;
+                    $sa = 0.0;
+                    for ($j = $l; $j <= $n; ++$j) {
+                        $ra = $ra + $this->H[$i][$j] * $this->H[$j][$n-1];
+                        $sa = $sa + $this->H[$i][$j] * $this->H[$j][$n];
+                    }
+                    $w = $this->H[$i][$i] - $p;
+                    if ($this->e[$i] < 0.0) {
+                        $z = $w;
+                        $r = $ra;
+                        $s = $sa;
+                    } else {
+                        $l = $i;
+                        if ($this->e[$i] == 0) {
+                            $this->cdiv(-$ra, -$sa, $w, $q);
+                            $this->H[$i][$n-1] = $this->cdivr;
+                            $this->H[$i][$n]   = $this->cdivi;
+                        } else {
+                            // Solve complex equations
+                            $x = $this->H[$i][$i+1];
+                            $y = $this->H[$i+1][$i];
+                            $vr = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i] - $q * $q;
+                            $vi = ($this->d[$i] - $p) * 2.0 * $q;
+                            if ($vr == 0.0 & $vi == 0.0) {
+                                $vr = $eps * $norm * (abs($w) + abs($q) + abs($x) + abs($y) + abs($z));
+                            }
+                            $this->cdiv($x * $r - $z * $ra + $q * $sa, $x * $s - $z * $sa - $q * $ra, $vr, $vi);
+                            $this->H[$i][$n-1] = $this->cdivr;
+                            $this->H[$i][$n]   = $this->cdivi;
+                            if (abs($x) > (abs($z) + abs($q))) {
+                                $this->H[$i+1][$n-1] = (-$ra - $w * $this->H[$i][$n-1] + $q * $this->H[$i][$n]) / $x;
+                                $this->H[$i+1][$n] = (-$sa - $w * $this->H[$i][$n] - $q * $this->H[$i][$n-1]) / $x;
+                            } else {
+                                $this->cdiv(-$r - $y * $this->H[$i][$n-1], -$s - $y * $this->H[$i][$n], $z, $q);
+                                $this->H[$i+1][$n-1] = $this->cdivr;
+                                $this->H[$i+1][$n]   = $this->cdivi;
+                            }
+                        }
+                        // Overflow control
+                        $t = max(abs($this->H[$i][$n-1]), abs($this->H[$i][$n]));
+                        if (($eps * $t) * $t > 1) {
+                            for ($j = $i; $j <= $n; ++$j) {
+                                $this->H[$j][$n-1] = $this->H[$j][$n-1] / $t;
+                                $this->H[$j][$n]   = $this->H[$j][$n] / $t;
+                            }
+                        }
+                    } // end else
+                } // end for
+            } // end else for complex case
+        } // end for
+
+        // Vectors of isolated roots
+        for ($i = 0; $i < $nn; ++$i) {
+            if ($i < $low | $i > $high) {
+                for ($j = $i; $j < $nn; ++$j) {
+                    $this->V[$i][$j] = $this->H[$i][$j];
+                }
+            }
+        }
+
+        // Back transformation to get eigenvectors of original matrix
+        for ($j = $nn-1; $j >= $low; --$j) {
+            for ($i = $low; $i <= $high; ++$i) {
+                $z = 0.0;
+                for ($k = $low; $k <= min($j, $high); ++$k) {
+                    $z = $z + $this->V[$i][$k] * $this->H[$k][$j];
+                }
+                $this->V[$i][$j] = $z;
+            }
+        }
+    } // end hqr2
+
+    /**
+     *    Constructor: Check for symmetry, then construct the eigenvalue decomposition
+     *
+     *    @access public
+     *    @param A  Square matrix
+     *    @return Structure to access D and V.
+     */
+    public function __construct($Arg)
+    {
+        $this->A = $Arg->getArray();
+        $this->n = $Arg->getColumnDimension();
+
+        $issymmetric = true;
+        for ($j = 0; ($j < $this->n) & $issymmetric; ++$j) {
+            for ($i = 0; ($i < $this->n) & $issymmetric; ++$i) {
+                $issymmetric = ($this->A[$i][$j] == $this->A[$j][$i]);
+            }
+        }
+
+        if ($issymmetric) {
+            $this->V = $this->A;
+            // Tridiagonalize.
+            $this->tred2();
+            // Diagonalize.
+            $this->tql2();
+        } else {
+            $this->H = $this->A;
+            $this->ort = array();
+            // Reduce to Hessenberg form.
+            $this->orthes();
+            // Reduce Hessenberg to real Schur form.
+            $this->hqr2();
+        }
+    }
+
+    /**
+     *    Return the eigenvector matrix
+     *
+     *    @access public
+     *    @return V
+     */
+    public function getV()
+    {
+        return new Matrix($this->V, $this->n, $this->n);
+    }
+
+    /**
+     *    Return the real parts of the eigenvalues
+     *
+     *    @access public
+     *    @return real(diag(D))
+     */
+    public function getRealEigenvalues()
+    {
+        return $this->d;
+    }
+
+    /**
+     *    Return the imaginary parts of the eigenvalues
+     *
+     *    @access public
+     *    @return imag(diag(D))
+     */
+    public function getImagEigenvalues()
+    {
+        return $this->e;
+    }
+
+    /**
+     *    Return the block diagonal eigenvalue matrix
+     *
+     *    @access public
+     *    @return D
+     */
+    public function getD()
+    {
+        for ($i = 0; $i < $this->n; ++$i) {
+            $D[$i] = array_fill(0, $this->n, 0.0);
+            $D[$i][$i] = $this->d[$i];
+            if ($this->e[$i] == 0) {
+                continue;
+            }
+            $o = ($this->e[$i] > 0) ? $i + 1 : $i - 1;
+            $D[$i][$o] = $this->e[$i];
+        }
+        return new Matrix($D);
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/LUDecomposition.php b/lib/PHPExcel/Shared/JAMA/LUDecomposition.php
new file mode 100644
index 000000000..2505d9226
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/LUDecomposition.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
+ *    unit lower triangular matrix L, an n-by-n upper triangular matrix U,
+ *    and a permutation vector piv of length m so that A(piv,:) = L*U.
+ *    If m < n, then L is m-by-m and U is m-by-n.
+ *
+ *    The LU decompostion with pivoting always exists, even if the matrix is
+ *    singular, so the constructor will never fail. The primary use of the
+ *    LU decomposition is in the solution of square systems of simultaneous
+ *    linear equations. This will fail if isNonsingular() returns false.
+ *
+ *    @author Paul Meagher
+ *    @author Bartosz Matosiuk
+ *    @author Michael Bommarito
+ *    @version 1.1
+ *    @license PHP v3.0
+ */
+class PHPExcel_Shared_JAMA_LUDecomposition
+{
+    const MATRIX_SINGULAR_EXCEPTION    = "Can only perform operation on singular matrix.";
+    const MATRIX_SQUARE_EXCEPTION      = "Mismatched Row dimension";
+
+    /**
+     *    Decomposition storage
+     *    @var array
+     */
+    private $LU = array();
+
+    /**
+     *    Row dimension.
+     *    @var int
+     */
+    private $m;
+
+    /**
+     *    Column dimension.
+     *    @var int
+     */
+    private $n;
+
+    /**
+     *    Pivot sign.
+     *    @var int
+     */
+    private $pivsign;
+
+    /**
+     *    Internal storage of pivot vector.
+     *    @var array
+     */
+    private $piv = array();
+
+    /**
+     *    LU Decomposition constructor.
+     *
+     *    @param $A Rectangular matrix
+     *    @return Structure to access L, U and piv.
+     */
+    public function __construct($A)
+    {
+        if ($A instanceof PHPExcel_Shared_JAMA_Matrix) {
+            // Use a "left-looking", dot-product, Crout/Doolittle algorithm.
+            $this->LU = $A->getArray();
+            $this->m  = $A->getRowDimension();
+            $this->n  = $A->getColumnDimension();
+            for ($i = 0; $i < $this->m; ++$i) {
+                $this->piv[$i] = $i;
+            }
+            $this->pivsign = 1;
+            $LUrowi = $LUcolj = array();
+
+            // Outer loop.
+            for ($j = 0; $j < $this->n; ++$j) {
+                // Make a copy of the j-th column to localize references.
+                for ($i = 0; $i < $this->m; ++$i) {
+                    $LUcolj[$i] = &$this->LU[$i][$j];
+                }
+                // Apply previous transformations.
+                for ($i = 0; $i < $this->m; ++$i) {
+                    $LUrowi = $this->LU[$i];
+                    // Most of the time is spent in the following dot product.
+                    $kmax = min($i, $j);
+                    $s = 0.0;
+                    for ($k = 0; $k < $kmax; ++$k) {
+                        $s += $LUrowi[$k] * $LUcolj[$k];
+                    }
+                    $LUrowi[$j] = $LUcolj[$i] -= $s;
+                }
+                // Find pivot and exchange if necessary.
+                $p = $j;
+                for ($i = $j+1; $i < $this->m; ++$i) {
+                    if (abs($LUcolj[$i]) > abs($LUcolj[$p])) {
+                        $p = $i;
+                    }
+                }
+                if ($p != $j) {
+                    for ($k = 0; $k < $this->n; ++$k) {
+                        $t = $this->LU[$p][$k];
+                        $this->LU[$p][$k] = $this->LU[$j][$k];
+                        $this->LU[$j][$k] = $t;
+                    }
+                    $k = $this->piv[$p];
+                    $this->piv[$p] = $this->piv[$j];
+                    $this->piv[$j] = $k;
+                    $this->pivsign = $this->pivsign * -1;
+                }
+                // Compute multipliers.
+                if (($j < $this->m) && ($this->LU[$j][$j] != 0.0)) {
+                    for ($i = $j+1; $i < $this->m; ++$i) {
+                        $this->LU[$i][$j] /= $this->LU[$j][$j];
+                    }
+                }
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ARGUMENT_TYPE_EXCEPTION);
+        }
+    }    //    function __construct()
+
+    /**
+     *    Get lower triangular factor.
+     *
+     *    @return array Lower triangular factor
+     */
+    public function getL()
+    {
+        for ($i = 0; $i < $this->m; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                if ($i > $j) {
+                    $L[$i][$j] = $this->LU[$i][$j];
+                } elseif ($i == $j) {
+                    $L[$i][$j] = 1.0;
+                } else {
+                    $L[$i][$j] = 0.0;
+                }
+            }
+        }
+        return new PHPExcel_Shared_JAMA_Matrix($L);
+    }    //    function getL()
+
+    /**
+     *    Get upper triangular factor.
+     *
+     *    @return array Upper triangular factor
+     */
+    public function getU()
+    {
+        for ($i = 0; $i < $this->n; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                if ($i <= $j) {
+                    $U[$i][$j] = $this->LU[$i][$j];
+                } else {
+                    $U[$i][$j] = 0.0;
+                }
+            }
+        }
+        return new PHPExcel_Shared_JAMA_Matrix($U);
+    }    //    function getU()
+
+    /**
+     *    Return pivot permutation vector.
+     *
+     *    @return array Pivot vector
+     */
+    public function getPivot()
+    {
+        return $this->piv;
+    }    //    function getPivot()
+
+    /**
+     *    Alias for getPivot
+     *
+     *    @see getPivot
+     */
+    public function getDoublePivot()
+    {
+        return $this->getPivot();
+    }    //    function getDoublePivot()
+
+    /**
+     *    Is the matrix nonsingular?
+     *
+     *    @return true if U, and hence A, is nonsingular.
+     */
+    public function isNonsingular()
+    {
+        for ($j = 0; $j < $this->n; ++$j) {
+            if ($this->LU[$j][$j] == 0) {
+                return false;
+            }
+        }
+        return true;
+    }    //    function isNonsingular()
+
+    /**
+     *    Count determinants
+     *
+     *    @return array d matrix deterninat
+     */
+    public function det()
+    {
+        if ($this->m == $this->n) {
+            $d = $this->pivsign;
+            for ($j = 0; $j < $this->n; ++$j) {
+                $d *= $this->LU[$j][$j];
+            }
+            return $d;
+        } else {
+            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MATRIX_DIMENSION_EXCEPTION);
+        }
+    }    //    function det()
+
+    /**
+     *    Solve A*X = B
+     *
+     *    @param  $B  A Matrix with as many rows as A and any number of columns.
+     *    @return  X so that L*U*X = B(piv,:)
+     *    @PHPExcel_Calculation_Exception  IllegalArgumentException Matrix row dimensions must agree.
+     *    @PHPExcel_Calculation_Exception  RuntimeException  Matrix is singular.
+     */
+    public function solve($B)
+    {
+        if ($B->getRowDimension() == $this->m) {
+            if ($this->isNonsingular()) {
+                // Copy right hand side with pivoting
+                $nx = $B->getColumnDimension();
+                $X  = $B->getMatrix($this->piv, 0, $nx-1);
+                // Solve L*Y = B(piv,:)
+                for ($k = 0; $k < $this->n; ++$k) {
+                    for ($i = $k+1; $i < $this->n; ++$i) {
+                        for ($j = 0; $j < $nx; ++$j) {
+                            $X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
+                        }
+                    }
+                }
+                // Solve U*X = Y;
+                for ($k = $this->n-1; $k >= 0; --$k) {
+                    for ($j = 0; $j < $nx; ++$j) {
+                        $X->A[$k][$j] /= $this->LU[$k][$k];
+                    }
+                    for ($i = 0; $i < $k; ++$i) {
+                        for ($j = 0; $j < $nx; ++$j) {
+                            $X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
+                        }
+                    }
+                }
+                return $X;
+            } else {
+                throw new PHPExcel_Calculation_Exception(self::MATRIX_SINGULAR_EXCEPTION);
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::MATRIX_SQUARE_EXCEPTION);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/Matrix.php b/lib/PHPExcel/Shared/JAMA/Matrix.php
new file mode 100644
index 000000000..82fb0fb20
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/Matrix.php
@@ -0,0 +1,1159 @@
+<?php
+/**
+ * @package JAMA
+ */
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+
+/*
+ *    Matrix class
+ *
+ *    @author Paul Meagher
+ *    @author Michael Bommarito
+ *    @author Lukasz Karapuda
+ *    @author Bartek Matosiuk
+ *    @version 1.8
+ *    @license PHP v3.0
+ *    @see http://math.nist.gov/javanumerics/jama/
+ */
+class PHPExcel_Shared_JAMA_Matrix
+{
+    const POLYMORPHIC_ARGUMENT_EXCEPTION = "Invalid argument pattern for polymorphic function.";
+    const ARGUMENT_TYPE_EXCEPTION        = "Invalid argument type.";
+    const ARGUMENT_BOUNDS_EXCEPTION      = "Invalid argument range.";
+    const MATRIX_DIMENSION_EXCEPTION     = "Matrix dimensions are not equal.";
+    const ARRAY_LENGTH_EXCEPTION         = "Array length must be a multiple of m.";
+
+    /**
+     *    Matrix storage
+     *
+     *    @var array
+     *    @access public
+     */
+    public $A = array();
+
+    /**
+     *    Matrix row dimension
+     *
+     *    @var int
+     *    @access private
+     */
+    private $m;
+
+    /**
+     *    Matrix column dimension
+     *
+     *    @var int
+     *    @access private
+     */
+    private $n;
+
+    /**
+     *    Polymorphic constructor
+     *
+     *    As PHP has no support for polymorphic constructors, we hack our own sort of polymorphism using func_num_args, func_get_arg, and gettype. In essence, we're just implementing a simple RTTI filter and calling the appropriate constructor.
+     */
+    public function __construct()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                //Rectangular matrix - m x n initialized from 2D array
+                case 'array':
+                    $this->m = count($args[0]);
+                    $this->n = count($args[0][0]);
+                    $this->A = $args[0];
+                    break;
+                //Square matrix - n x n
+                case 'integer':
+                    $this->m = $args[0];
+                    $this->n = $args[0];
+                    $this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
+                    break;
+                //Rectangular matrix - m x n
+                case 'integer,integer':
+                    $this->m = $args[0];
+                    $this->n = $args[1];
+                    $this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
+                    break;
+                //Rectangular matrix - m x n initialized from packed array
+                case 'array,integer':
+                    $this->m = $args[1];
+                    if ($this->m != 0) {
+                        $this->n = count($args[0]) / $this->m;
+                    } else {
+                        $this->n = 0;
+                    }
+                    if (($this->m * $this->n) == count($args[0])) {
+                        for ($i = 0; $i < $this->m; ++$i) {
+                            for ($j = 0; $j < $this->n; ++$j) {
+                                $this->A[$i][$j] = $args[0][$i + $j * $this->m];
+                            }
+                        }
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARRAY_LENGTH_EXCEPTION);
+                    }
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    getArray
+     *
+     *    @return array Matrix array
+     */
+    public function getArray()
+    {
+        return $this->A;
+    }
+
+    /**
+     *    getRowDimension
+     *
+     *    @return int Row dimension
+     */
+    public function getRowDimension()
+    {
+        return $this->m;
+    }
+
+    /**
+     *    getColumnDimension
+     *
+     *    @return int Column dimension
+     */
+    public function getColumnDimension()
+    {
+        return $this->n;
+    }
+
+    /**
+     *    get
+     *
+     *    Get the i,j-th element of the matrix.
+     *    @param int $i Row position
+     *    @param int $j Column position
+     *    @return mixed Element (int/float/double)
+     */
+    public function get($i = null, $j = null)
+    {
+        return $this->A[$i][$j];
+    }
+
+    /**
+     *    getMatrix
+     *
+     *    Get a submatrix
+     *    @param int $i0 Initial row index
+     *    @param int $iF Final row index
+     *    @param int $j0 Initial column index
+     *    @param int $jF Final column index
+     *    @return Matrix Submatrix
+     */
+    public function getMatrix()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                //A($i0...; $j0...)
+                case 'integer,integer':
+                    list($i0, $j0) = $args;
+                    if ($i0 >= 0) {
+                        $m = $this->m - $i0;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    if ($j0 >= 0) {
+                        $n = $this->n - $j0;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
+                    for ($i = $i0; $i < $this->m; ++$i) {
+                        for ($j = $j0; $j < $this->n; ++$j) {
+                            $R->set($i, $j, $this->A[$i][$j]);
+                        }
+                    }
+                    return $R;
+                    break;
+                //A($i0...$iF; $j0...$jF)
+                case 'integer,integer,integer,integer':
+                    list($i0, $iF, $j0, $jF) = $args;
+                    if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
+                        $m = $iF - $i0;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) {
+                        $n = $jF - $j0;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    $R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1);
+                    for ($i = $i0; $i <= $iF; ++$i) {
+                        for ($j = $j0; $j <= $jF; ++$j) {
+                            $R->set($i - $i0, $j - $j0, $this->A[$i][$j]);
+                        }
+                    }
+                    return $R;
+                    break;
+                //$R = array of row indices; $C = array of column indices
+                case 'array,array':
+                    list($RL, $CL) = $args;
+                    if (count($RL) > 0) {
+                        $m = count($RL);
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    if (count($CL) > 0) {
+                        $n = count($CL);
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
+                    for ($i = 0; $i < $m; ++$i) {
+                        for ($j = 0; $j < $n; ++$j) {
+                            $R->set($i - $i0, $j - $j0, $this->A[$RL[$i]][$CL[$j]]);
+                        }
+                    }
+                    return $R;
+                    break;
+                //$RL = array of row indices; $CL = array of column indices
+                case 'array,array':
+                    list($RL, $CL) = $args;
+                    if (count($RL) > 0) {
+                        $m = count($RL);
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    if (count($CL) > 0) {
+                        $n = count($CL);
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
+                    for ($i = 0; $i < $m; ++$i) {
+                        for ($j = 0; $j < $n; ++$j) {
+                            $R->set($i, $j, $this->A[$RL[$i]][$CL[$j]]);
+                        }
+                    }
+                    return $R;
+                    break;
+                //A($i0...$iF); $CL = array of column indices
+                case 'integer,integer,array':
+                    list($i0, $iF, $CL) = $args;
+                    if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
+                        $m = $iF - $i0;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    if (count($CL) > 0) {
+                        $n = count($CL);
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
+                    for ($i = $i0; $i < $iF; ++$i) {
+                        for ($j = 0; $j < $n; ++$j) {
+                            $R->set($i - $i0, $j, $this->A[$RL[$i]][$j]);
+                        }
+                    }
+                    return $R;
+                    break;
+                //$RL = array of row indices
+                case 'array,integer,integer':
+                    list($RL, $j0, $jF) = $args;
+                    if (count($RL) > 0) {
+                        $m = count($RL);
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) {
+                        $n = $jF - $j0;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
+                    }
+                    $R = new PHPExcel_Shared_JAMA_Matrix($m, $n+1);
+                    for ($i = 0; $i < $m; ++$i) {
+                        for ($j = $j0; $j <= $jF; ++$j) {
+                            $R->set($i, $j - $j0, $this->A[$RL[$i]][$j]);
+                        }
+                    }
+                    return $R;
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    checkMatrixDimensions
+     *
+     *    Is matrix B the same size?
+     *    @param Matrix $B Matrix B
+     *    @return boolean
+     */
+    public function checkMatrixDimensions($B = null)
+    {
+        if ($B instanceof PHPExcel_Shared_JAMA_Matrix) {
+            if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) {
+                return true;
+            } else {
+                throw new PHPExcel_Calculation_Exception(self::MATRIX_DIMENSION_EXCEPTION);
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+        }
+    }    //    function checkMatrixDimensions()
+
+    /**
+     *    set
+     *
+     *    Set the i,j-th element of the matrix.
+     *    @param int $i Row position
+     *    @param int $j Column position
+     *    @param mixed $c Int/float/double value
+     *    @return mixed Element (int/float/double)
+     */
+    public function set($i = null, $j = null, $c = null)
+    {
+        // Optimized set version just has this
+        $this->A[$i][$j] = $c;
+    }    //    function set()
+
+    /**
+     *    identity
+     *
+     *    Generate an identity matrix.
+     *    @param int $m Row dimension
+     *    @param int $n Column dimension
+     *    @return Matrix Identity matrix
+     */
+    public function identity($m = null, $n = null)
+    {
+        return $this->diagonal($m, $n, 1);
+    }
+
+    /**
+     *    diagonal
+     *
+     *    Generate a diagonal matrix
+     *    @param int $m Row dimension
+     *    @param int $n Column dimension
+     *    @param mixed $c Diagonal value
+     *    @return Matrix Diagonal matrix
+     */
+    public function diagonal($m = null, $n = null, $c = 1)
+    {
+        $R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
+        for ($i = 0; $i < $m; ++$i) {
+            $R->set($i, $i, $c);
+        }
+        return $R;
+    }
+
+    /**
+     *    getMatrixByRow
+     *
+     *    Get a submatrix by row index/range
+     *    @param int $i0 Initial row index
+     *    @param int $iF Final row index
+     *    @return Matrix Submatrix
+     */
+    public function getMatrixByRow($i0 = null, $iF = null)
+    {
+        if (is_int($i0)) {
+            if (is_int($iF)) {
+                return $this->getMatrix($i0, 0, $iF + 1, $this->n);
+            } else {
+                return $this->getMatrix($i0, 0, $i0 + 1, $this->n);
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+        }
+    }
+
+    /**
+     *    getMatrixByCol
+     *
+     *    Get a submatrix by column index/range
+     *    @param int $i0 Initial column index
+     *    @param int $iF Final column index
+     *    @return Matrix Submatrix
+     */
+    public function getMatrixByCol($j0 = null, $jF = null)
+    {
+        if (is_int($j0)) {
+            if (is_int($jF)) {
+                return $this->getMatrix(0, $j0, $this->m, $jF + 1);
+            } else {
+                return $this->getMatrix(0, $j0, $this->m, $j0 + 1);
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+        }
+    }
+
+    /**
+     *    transpose
+     *
+     *    Tranpose matrix
+     *    @return Matrix Transposed matrix
+     */
+    public function transpose()
+    {
+        $R = new PHPExcel_Shared_JAMA_Matrix($this->n, $this->m);
+        for ($i = 0; $i < $this->m; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                $R->set($j, $i, $this->A[$i][$j]);
+            }
+        }
+        return $R;
+    }    //    function transpose()
+
+    /**
+     *    trace
+     *
+     *    Sum of diagonal elements
+     *    @return float Sum of diagonal elements
+     */
+    public function trace()
+    {
+        $s = 0;
+        $n = min($this->m, $this->n);
+        for ($i = 0; $i < $n; ++$i) {
+            $s += $this->A[$i][$i];
+        }
+        return $s;
+    }
+
+    /**
+     *    uminus
+     *
+     *    Unary minus matrix -A
+     *    @return Matrix Unary minus matrix
+     */
+    public function uminus()
+    {
+    }
+
+    /**
+     *    plus
+     *
+     *    A + B
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Sum
+     */
+    public function plus()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $M->set($i, $j, $M->get($i, $j) + $this->A[$i][$j]);
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    plusEquals
+     *
+     *    A = A + B
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Sum
+     */
+    public function plusEquals()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $validValues = true;
+                    $value = $M->get($i, $j);
+                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
+                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
+                    }
+                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+                        $value = trim($value, '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
+                    }
+                    if ($validValues) {
+                        $this->A[$i][$j] += $value;
+                    } else {
+                        $this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
+                    }
+                }
+            }
+            return $this;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    minus
+     *
+     *    A - B
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Sum
+     */
+    public function minus()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $M->set($i, $j, $M->get($i, $j) - $this->A[$i][$j]);
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    minusEquals
+     *
+     *    A = A - B
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Sum
+     */
+    public function minusEquals()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $validValues = true;
+                    $value = $M->get($i, $j);
+                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
+                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
+                    }
+                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+                        $value = trim($value, '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
+                    }
+                    if ($validValues) {
+                        $this->A[$i][$j] -= $value;
+                    } else {
+                        $this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
+                    }
+                }
+            }
+            return $this;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    arrayTimes
+     *
+     *    Element-by-element multiplication
+     *    Cij = Aij * Bij
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Matrix Cij
+     */
+    public function arrayTimes()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $M->set($i, $j, $M->get($i, $j) * $this->A[$i][$j]);
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    arrayTimesEquals
+     *
+     *    Element-by-element multiplication
+     *    Aij = Aij * Bij
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Matrix Aij
+     */
+    public function arrayTimesEquals()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $validValues = true;
+                    $value = $M->get($i, $j);
+                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
+                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
+                    }
+                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+                        $value = trim($value, '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
+                    }
+                    if ($validValues) {
+                        $this->A[$i][$j] *= $value;
+                    } else {
+                        $this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
+                    }
+                }
+            }
+            return $this;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    arrayRightDivide
+     *
+     *    Element-by-element right division
+     *    A / B
+     *    @param Matrix $B Matrix B
+     *    @return Matrix Division result
+     */
+    public function arrayRightDivide()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $validValues = true;
+                    $value = $M->get($i, $j);
+                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
+                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
+                    }
+                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+                        $value = trim($value, '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
+                    }
+                    if ($validValues) {
+                        if ($value == 0) {
+                            //    Trap for Divide by Zero error
+                            $M->set($i, $j, '#DIV/0!');
+                        } else {
+                            $M->set($i, $j, $this->A[$i][$j] / $value);
+                        }
+                    } else {
+                        $M->set($i, $j, PHPExcel_Calculation_Functions::NaN());
+                    }
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+
+    /**
+     *    arrayRightDivideEquals
+     *
+     *    Element-by-element right division
+     *    Aij = Aij / Bij
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Matrix Aij
+     */
+    public function arrayRightDivideEquals()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $this->A[$i][$j] = $this->A[$i][$j] / $M->get($i, $j);
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+
+    /**
+     *    arrayLeftDivide
+     *
+     *    Element-by-element Left division
+     *    A / B
+     *    @param Matrix $B Matrix B
+     *    @return Matrix Division result
+     */
+    public function arrayLeftDivide()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $M->set($i, $j, $M->get($i, $j) / $this->A[$i][$j]);
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+
+    /**
+     *    arrayLeftDivideEquals
+     *
+     *    Element-by-element Left division
+     *    Aij = Aij / Bij
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Matrix Aij
+     */
+    public function arrayLeftDivideEquals()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $this->A[$i][$j] = $M->get($i, $j) / $this->A[$i][$j];
+                }
+            }
+            return $M;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+
+    /**
+     *    times
+     *
+     *    Matrix multiplication
+     *    @param mixed $n Matrix/Array/Scalar
+     *    @return Matrix Product
+     */
+    public function times()
+    {
+        if (func_num_args() > 0) {
+            $args  = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $B = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    if ($this->n == $B->m) {
+                        $C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
+                        for ($j = 0; $j < $B->n; ++$j) {
+                            for ($k = 0; $k < $this->n; ++$k) {
+                                $Bcolj[$k] = $B->A[$k][$j];
+                            }
+                            for ($i = 0; $i < $this->m; ++$i) {
+                                $Arowi = $this->A[$i];
+                                $s = 0;
+                                for ($k = 0; $k < $this->n; ++$k) {
+                                    $s += $Arowi[$k] * $Bcolj[$k];
+                                }
+                                $C->A[$i][$j] = $s;
+                            }
+                        }
+                        return $C;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionMismatch));
+                    }
+                    break;
+                case 'array':
+                    $B = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    if ($this->n == $B->m) {
+                        $C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
+                        for ($i = 0; $i < $C->m; ++$i) {
+                            for ($j = 0; $j < $C->n; ++$j) {
+                                $s = "0";
+                                for ($k = 0; $k < $C->n; ++$k) {
+                                    $s += $this->A[$i][$k] * $B->A[$k][$j];
+                                }
+                                $C->A[$i][$j] = $s;
+                            }
+                        }
+                        return $C;
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionMismatch));
+                    }
+                    return $M;
+                    break;
+                case 'integer':
+                    $C = new PHPExcel_Shared_JAMA_Matrix($this->A);
+                    for ($i = 0; $i < $C->m; ++$i) {
+                        for ($j = 0; $j < $C->n; ++$j) {
+                            $C->A[$i][$j] *= $args[0];
+                        }
+                    }
+                    return $C;
+                    break;
+                case 'double':
+                    $C = new PHPExcel_Shared_JAMA_Matrix($this->m, $this->n);
+                    for ($i = 0; $i < $C->m; ++$i) {
+                        for ($j = 0; $j < $C->n; ++$j) {
+                            $C->A[$i][$j] = $args[0] * $this->A[$i][$j];
+                        }
+                    }
+                    return $C;
+                    break;
+                case 'float':
+                    $C = new PHPExcel_Shared_JAMA_Matrix($this->A);
+                    for ($i = 0; $i < $C->m; ++$i) {
+                        for ($j = 0; $j < $C->n; ++$j) {
+                            $C->A[$i][$j] *= $args[0];
+                        }
+                    }
+                    return $C;
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    power
+     *
+     *    A = A ^ B
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Sum
+     */
+    public function power()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                    break;
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $validValues = true;
+                    $value = $M->get($i, $j);
+                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
+                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
+                    }
+                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+                        $value = trim($value, '"');
+                        $validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
+                    }
+                    if ($validValues) {
+                        $this->A[$i][$j] = pow($this->A[$i][$j], $value);
+                    } else {
+                        $this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
+                    }
+                }
+            }
+            return $this;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    concat
+     *
+     *    A = A & B
+     *    @param mixed $B Matrix/Array
+     *    @return Matrix Sum
+     */
+    public function concat()
+    {
+        if (func_num_args() > 0) {
+            $args = func_get_args();
+            $match = implode(",", array_map('gettype', $args));
+
+            switch ($match) {
+                case 'object':
+                    if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) {
+                        $M = $args[0];
+                    } else {
+                        throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION);
+                    }
+                case 'array':
+                    $M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
+                    break;
+                default:
+                    throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+                    break;
+            }
+            $this->checkMatrixDimensions($M);
+            for ($i = 0; $i < $this->m; ++$i) {
+                for ($j = 0; $j < $this->n; ++$j) {
+                    $this->A[$i][$j] = trim($this->A[$i][$j], '"').trim($M->get($i, $j), '"');
+                }
+            }
+            return $this;
+        } else {
+            throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
+        }
+    }
+
+    /**
+     *    Solve A*X = B.
+     *
+     *    @param Matrix $B Right hand side
+     *    @return Matrix ... Solution if A is square, least squares solution otherwise
+     */
+    public function solve($B)
+    {
+        if ($this->m == $this->n) {
+            $LU = new PHPExcel_Shared_JAMA_LUDecomposition($this);
+            return $LU->solve($B);
+        } else {
+            $QR = new PHPExcel_Shared_JAMA_QRDecomposition($this);
+            return $QR->solve($B);
+        }
+    }
+
+    /**
+     *    Matrix inverse or pseudoinverse.
+     *
+     *    @return Matrix ... Inverse(A) if A is square, pseudoinverse otherwise.
+     */
+    public function inverse()
+    {
+        return $this->solve($this->identity($this->m, $this->m));
+    }
+
+    /**
+     *    det
+     *
+     *    Calculate determinant
+     *    @return float Determinant
+     */
+    public function det()
+    {
+        $L = new PHPExcel_Shared_JAMA_LUDecomposition($this);
+        return $L->det();
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/QRDecomposition.php b/lib/PHPExcel/Shared/JAMA/QRDecomposition.php
new file mode 100644
index 000000000..1e43c7c43
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/QRDecomposition.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    For an m-by-n matrix A with m >= n, the QR decomposition is an m-by-n
+ *    orthogonal matrix Q and an n-by-n upper triangular matrix R so that
+ *    A = Q*R.
+ *
+ *    The QR decompostion always exists, even if the matrix does not have
+ *    full rank, so the constructor will never fail.  The primary use of the
+ *    QR decomposition is in the least squares solution of nonsquare systems
+ *    of simultaneous linear equations.  This will fail if isFullRank()
+ *    returns false.
+ *
+ *    @author  Paul Meagher
+ *    @license PHP v3.0
+ *    @version 1.1
+ */
+class PHPExcel_Shared_JAMA_QRDecomposition
+{
+    const MATRIX_RANK_EXCEPTION  = "Can only perform operation on full-rank matrix.";
+
+    /**
+     *    Array for internal storage of decomposition.
+     *    @var array
+     */
+    private $QR = array();
+
+    /**
+     *    Row dimension.
+     *    @var integer
+     */
+    private $m;
+
+    /**
+    *    Column dimension.
+    *    @var integer
+    */
+    private $n;
+
+    /**
+     *    Array for internal storage of diagonal of R.
+     *    @var  array
+     */
+    private $Rdiag = array();
+
+
+    /**
+     *    QR Decomposition computed by Householder reflections.
+     *
+     *    @param matrix $A Rectangular matrix
+     *    @return Structure to access R and the Householder vectors and compute Q.
+     */
+    public function __construct($A)
+    {
+        if ($A instanceof PHPExcel_Shared_JAMA_Matrix) {
+            // Initialize.
+            $this->QR = $A->getArrayCopy();
+            $this->m  = $A->getRowDimension();
+            $this->n  = $A->getColumnDimension();
+            // Main loop.
+            for ($k = 0; $k < $this->n; ++$k) {
+                // Compute 2-norm of k-th column without under/overflow.
+                $nrm = 0.0;
+                for ($i = $k; $i < $this->m; ++$i) {
+                    $nrm = hypo($nrm, $this->QR[$i][$k]);
+                }
+                if ($nrm != 0.0) {
+                    // Form k-th Householder vector.
+                    if ($this->QR[$k][$k] < 0) {
+                        $nrm = -$nrm;
+                    }
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $this->QR[$i][$k] /= $nrm;
+                    }
+                    $this->QR[$k][$k] += 1.0;
+                    // Apply transformation to remaining columns.
+                    for ($j = $k+1; $j < $this->n; ++$j) {
+                        $s = 0.0;
+                        for ($i = $k; $i < $this->m; ++$i) {
+                            $s += $this->QR[$i][$k] * $this->QR[$i][$j];
+                        }
+                        $s = -$s/$this->QR[$k][$k];
+                        for ($i = $k; $i < $this->m; ++$i) {
+                            $this->QR[$i][$j] += $s * $this->QR[$i][$k];
+                        }
+                    }
+                }
+                $this->Rdiag[$k] = -$nrm;
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ARGUMENT_TYPE_EXCEPTION);
+        }
+    }    //    function __construct()
+
+
+    /**
+     *    Is the matrix full rank?
+     *
+     *    @return boolean true if R, and hence A, has full rank, else false.
+     */
+    public function isFullRank()
+    {
+        for ($j = 0; $j < $this->n; ++$j) {
+            if ($this->Rdiag[$j] == 0) {
+                return false;
+            }
+        }
+        return true;
+    }    //    function isFullRank()
+
+    /**
+     *    Return the Householder vectors
+     *
+     *    @return Matrix Lower trapezoidal matrix whose columns define the reflections
+     */
+    public function getH()
+    {
+        for ($i = 0; $i < $this->m; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                if ($i >= $j) {
+                    $H[$i][$j] = $this->QR[$i][$j];
+                } else {
+                    $H[$i][$j] = 0.0;
+                }
+            }
+        }
+        return new PHPExcel_Shared_JAMA_Matrix($H);
+    }    //    function getH()
+
+    /**
+     *    Return the upper triangular factor
+     *
+     *    @return Matrix upper triangular factor
+     */
+    public function getR()
+    {
+        for ($i = 0; $i < $this->n; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                if ($i < $j) {
+                    $R[$i][$j] = $this->QR[$i][$j];
+                } elseif ($i == $j) {
+                    $R[$i][$j] = $this->Rdiag[$i];
+                } else {
+                    $R[$i][$j] = 0.0;
+                }
+            }
+        }
+        return new PHPExcel_Shared_JAMA_Matrix($R);
+    }    //    function getR()
+
+    /**
+     *    Generate and return the (economy-sized) orthogonal factor
+     *
+     *    @return Matrix orthogonal factor
+     */
+    public function getQ()
+    {
+        for ($k = $this->n-1; $k >= 0; --$k) {
+            for ($i = 0; $i < $this->m; ++$i) {
+                $Q[$i][$k] = 0.0;
+            }
+            $Q[$k][$k] = 1.0;
+            for ($j = $k; $j < $this->n; ++$j) {
+                if ($this->QR[$k][$k] != 0) {
+                    $s = 0.0;
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $s += $this->QR[$i][$k] * $Q[$i][$j];
+                    }
+                    $s = -$s/$this->QR[$k][$k];
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $Q[$i][$j] += $s * $this->QR[$i][$k];
+                    }
+                }
+            }
+        }
+        /*
+        for($i = 0; $i < count($Q); ++$i) {
+            for($j = 0; $j < count($Q); ++$j) {
+                if (! isset($Q[$i][$j]) ) {
+                    $Q[$i][$j] = 0;
+                }
+            }
+        }
+        */
+        return new PHPExcel_Shared_JAMA_Matrix($Q);
+    }    //    function getQ()
+
+    /**
+     *    Least squares solution of A*X = B
+     *
+     *    @param Matrix $B A Matrix with as many rows as A and any number of columns.
+     *    @return Matrix Matrix that minimizes the two norm of Q*R*X-B.
+     */
+    public function solve($B)
+    {
+        if ($B->getRowDimension() == $this->m) {
+            if ($this->isFullRank()) {
+                // Copy right hand side
+                $nx = $B->getColumnDimension();
+                $X  = $B->getArrayCopy();
+                // Compute Y = transpose(Q)*B
+                for ($k = 0; $k < $this->n; ++$k) {
+                    for ($j = 0; $j < $nx; ++$j) {
+                        $s = 0.0;
+                        for ($i = $k; $i < $this->m; ++$i) {
+                            $s += $this->QR[$i][$k] * $X[$i][$j];
+                        }
+                        $s = -$s/$this->QR[$k][$k];
+                        for ($i = $k; $i < $this->m; ++$i) {
+                            $X[$i][$j] += $s * $this->QR[$i][$k];
+                        }
+                    }
+                }
+                // Solve R*X = Y;
+                for ($k = $this->n-1; $k >= 0; --$k) {
+                    for ($j = 0; $j < $nx; ++$j) {
+                        $X[$k][$j] /= $this->Rdiag[$k];
+                    }
+                    for ($i = 0; $i < $k; ++$i) {
+                        for ($j = 0; $j < $nx; ++$j) {
+                            $X[$i][$j] -= $X[$k][$j]* $this->QR[$i][$k];
+                        }
+                    }
+                }
+                $X = new PHPExcel_Shared_JAMA_Matrix($X);
+                return ($X->getMatrix(0, $this->n-1, 0, $nx));
+            } else {
+                throw new PHPExcel_Calculation_Exception(self::MATRIX_RANK_EXCEPTION);
+            }
+        } else {
+            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MATRIX_DIMENSION_EXCEPTION);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/lib/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
new file mode 100644
index 000000000..f57d122ce
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
@@ -0,0 +1,528 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    For an m-by-n matrix A with m >= n, the singular value decomposition is
+ *    an m-by-n orthogonal matrix U, an n-by-n diagonal matrix S, and
+ *    an n-by-n orthogonal matrix V so that A = U*S*V'.
+ *
+ *    The singular values, sigma[$k] = S[$k][$k], are ordered so that
+ *    sigma[0] >= sigma[1] >= ... >= sigma[n-1].
+ *
+ *    The singular value decompostion always exists, so the constructor will
+ *    never fail.  The matrix condition number and the effective numerical
+ *    rank can be computed from this decomposition.
+ *
+ *    @author  Paul Meagher
+ *    @license PHP v3.0
+ *    @version 1.1
+ */
+class SingularValueDecomposition
+{
+    /**
+     *    Internal storage of U.
+     *    @var array
+     */
+    private $U = array();
+
+    /**
+     *    Internal storage of V.
+     *    @var array
+     */
+    private $V = array();
+
+    /**
+     *    Internal storage of singular values.
+     *    @var array
+     */
+    private $s = array();
+
+    /**
+     *    Row dimension.
+     *    @var int
+     */
+    private $m;
+
+    /**
+     *    Column dimension.
+     *    @var int
+     */
+    private $n;
+
+    /**
+     *    Construct the singular value decomposition
+     *
+     *    Derived from LINPACK code.
+     *
+     *    @param $A Rectangular matrix
+     *    @return Structure to access U, S and V.
+     */
+    public function __construct($Arg)
+    {
+        // Initialize.
+        $A = $Arg->getArrayCopy();
+        $this->m = $Arg->getRowDimension();
+        $this->n = $Arg->getColumnDimension();
+        $nu      = min($this->m, $this->n);
+        $e       = array();
+        $work    = array();
+        $wantu   = true;
+        $wantv   = true;
+        $nct = min($this->m - 1, $this->n);
+        $nrt = max(0, min($this->n - 2, $this->m));
+
+        // Reduce A to bidiagonal form, storing the diagonal elements
+        // in s and the super-diagonal elements in e.
+        for ($k = 0; $k < max($nct, $nrt); ++$k) {
+            if ($k < $nct) {
+                // Compute the transformation for the k-th column and
+                // place the k-th diagonal in s[$k].
+                // Compute 2-norm of k-th column without under/overflow.
+                $this->s[$k] = 0;
+                for ($i = $k; $i < $this->m; ++$i) {
+                    $this->s[$k] = hypo($this->s[$k], $A[$i][$k]);
+                }
+                if ($this->s[$k] != 0.0) {
+                    if ($A[$k][$k] < 0.0) {
+                        $this->s[$k] = -$this->s[$k];
+                    }
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $A[$i][$k] /= $this->s[$k];
+                    }
+                    $A[$k][$k] += 1.0;
+                }
+                $this->s[$k] = -$this->s[$k];
+            }
+
+            for ($j = $k + 1; $j < $this->n; ++$j) {
+                if (($k < $nct) & ($this->s[$k] != 0.0)) {
+                    // Apply the transformation.
+                    $t = 0;
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $t += $A[$i][$k] * $A[$i][$j];
+                    }
+                    $t = -$t / $A[$k][$k];
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $A[$i][$j] += $t * $A[$i][$k];
+                    }
+                    // Place the k-th row of A into e for the
+                    // subsequent calculation of the row transformation.
+                    $e[$j] = $A[$k][$j];
+                }
+            }
+
+            if ($wantu and ($k < $nct)) {
+                // Place the transformation in U for subsequent back
+                // multiplication.
+                for ($i = $k; $i < $this->m; ++$i) {
+                    $this->U[$i][$k] = $A[$i][$k];
+                }
+            }
+
+            if ($k < $nrt) {
+                // Compute the k-th row transformation and place the
+                // k-th super-diagonal in e[$k].
+                // Compute 2-norm without under/overflow.
+                $e[$k] = 0;
+                for ($i = $k + 1; $i < $this->n; ++$i) {
+                    $e[$k] = hypo($e[$k], $e[$i]);
+                }
+                if ($e[$k] != 0.0) {
+                    if ($e[$k+1] < 0.0) {
+                        $e[$k] = -$e[$k];
+                    }
+                    for ($i = $k + 1; $i < $this->n; ++$i) {
+                        $e[$i] /= $e[$k];
+                    }
+                    $e[$k+1] += 1.0;
+                }
+                $e[$k] = -$e[$k];
+                if (($k+1 < $this->m) and ($e[$k] != 0.0)) {
+                    // Apply the transformation.
+                    for ($i = $k+1; $i < $this->m; ++$i) {
+                        $work[$i] = 0.0;
+                    }
+                    for ($j = $k+1; $j < $this->n; ++$j) {
+                        for ($i = $k+1; $i < $this->m; ++$i) {
+                            $work[$i] += $e[$j] * $A[$i][$j];
+                        }
+                    }
+                    for ($j = $k + 1; $j < $this->n; ++$j) {
+                        $t = -$e[$j] / $e[$k+1];
+                        for ($i = $k + 1; $i < $this->m; ++$i) {
+                            $A[$i][$j] += $t * $work[$i];
+                        }
+                    }
+                }
+                if ($wantv) {
+                    // Place the transformation in V for subsequent
+                    // back multiplication.
+                    for ($i = $k + 1; $i < $this->n; ++$i) {
+                        $this->V[$i][$k] = $e[$i];
+                    }
+                }
+            }
+        }
+
+        // Set up the final bidiagonal matrix or order p.
+        $p = min($this->n, $this->m + 1);
+        if ($nct < $this->n) {
+            $this->s[$nct] = $A[$nct][$nct];
+        }
+        if ($this->m < $p) {
+            $this->s[$p-1] = 0.0;
+        }
+        if ($nrt + 1 < $p) {
+            $e[$nrt] = $A[$nrt][$p-1];
+        }
+        $e[$p-1] = 0.0;
+        // If required, generate U.
+        if ($wantu) {
+            for ($j = $nct; $j < $nu; ++$j) {
+                for ($i = 0; $i < $this->m; ++$i) {
+                    $this->U[$i][$j] = 0.0;
+                }
+                $this->U[$j][$j] = 1.0;
+            }
+            for ($k = $nct - 1; $k >= 0; --$k) {
+                if ($this->s[$k] != 0.0) {
+                    for ($j = $k + 1; $j < $nu; ++$j) {
+                        $t = 0;
+                        for ($i = $k; $i < $this->m; ++$i) {
+                            $t += $this->U[$i][$k] * $this->U[$i][$j];
+                        }
+                        $t = -$t / $this->U[$k][$k];
+                        for ($i = $k; $i < $this->m; ++$i) {
+                            $this->U[$i][$j] += $t * $this->U[$i][$k];
+                        }
+                    }
+                    for ($i = $k; $i < $this->m; ++$i) {
+                        $this->U[$i][$k] = -$this->U[$i][$k];
+                    }
+                    $this->U[$k][$k] = 1.0 + $this->U[$k][$k];
+                    for ($i = 0; $i < $k - 1; ++$i) {
+                        $this->U[$i][$k] = 0.0;
+                    }
+                } else {
+                    for ($i = 0; $i < $this->m; ++$i) {
+                        $this->U[$i][$k] = 0.0;
+                    }
+                    $this->U[$k][$k] = 1.0;
+                }
+            }
+        }
+
+        // If required, generate V.
+        if ($wantv) {
+            for ($k = $this->n - 1; $k >= 0; --$k) {
+                if (($k < $nrt) and ($e[$k] != 0.0)) {
+                    for ($j = $k + 1; $j < $nu; ++$j) {
+                        $t = 0;
+                        for ($i = $k + 1; $i < $this->n; ++$i) {
+                            $t += $this->V[$i][$k]* $this->V[$i][$j];
+                        }
+                        $t = -$t / $this->V[$k+1][$k];
+                        for ($i = $k + 1; $i < $this->n; ++$i) {
+                            $this->V[$i][$j] += $t * $this->V[$i][$k];
+                        }
+                    }
+                }
+                for ($i = 0; $i < $this->n; ++$i) {
+                    $this->V[$i][$k] = 0.0;
+                }
+                $this->V[$k][$k] = 1.0;
+            }
+        }
+
+        // Main iteration loop for the singular values.
+        $pp   = $p - 1;
+        $iter = 0;
+        $eps  = pow(2.0, -52.0);
+
+        while ($p > 0) {
+            // Here is where a test for too many iterations would go.
+            // This section of the program inspects for negligible
+            // elements in the s and e arrays.  On completion the
+            // variables kase and k are set as follows:
+            // kase = 1  if s(p) and e[k-1] are negligible and k<p
+            // kase = 2  if s(k) is negligible and k<p
+            // kase = 3  if e[k-1] is negligible, k<p, and
+            //           s(k), ..., s(p) are not negligible (qr step).
+            // kase = 4  if e(p-1) is negligible (convergence).
+            for ($k = $p - 2; $k >= -1; --$k) {
+                if ($k == -1) {
+                    break;
+                }
+                if (abs($e[$k]) <= $eps * (abs($this->s[$k]) + abs($this->s[$k+1]))) {
+                    $e[$k] = 0.0;
+                    break;
+                }
+            }
+            if ($k == $p - 2) {
+                $kase = 4;
+            } else {
+                for ($ks = $p - 1; $ks >= $k; --$ks) {
+                    if ($ks == $k) {
+                        break;
+                    }
+                    $t = ($ks != $p ? abs($e[$ks]) : 0.) + ($ks != $k + 1 ? abs($e[$ks-1]) : 0.);
+                    if (abs($this->s[$ks]) <= $eps * $t) {
+                        $this->s[$ks] = 0.0;
+                        break;
+                    }
+                }
+                if ($ks == $k) {
+                    $kase = 3;
+                } elseif ($ks == $p-1) {
+                    $kase = 1;
+                } else {
+                    $kase = 2;
+                    $k = $ks;
+                }
+            }
+            ++$k;
+
+            // Perform the task indicated by kase.
+            switch ($kase) {
+                // Deflate negligible s(p).
+                case 1:
+                    $f = $e[$p-2];
+                    $e[$p-2] = 0.0;
+                    for ($j = $p - 2; $j >= $k; --$j) {
+                        $t  = hypo($this->s[$j], $f);
+                        $cs = $this->s[$j] / $t;
+                        $sn = $f / $t;
+                        $this->s[$j] = $t;
+                        if ($j != $k) {
+                            $f = -$sn * $e[$j-1];
+                            $e[$j-1] = $cs * $e[$j-1];
+                        }
+                        if ($wantv) {
+                            for ($i = 0; $i < $this->n; ++$i) {
+                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$p-1];
+                                $this->V[$i][$p-1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$p-1];
+                                $this->V[$i][$j] = $t;
+                            }
+                        }
+                    }
+                    break;
+                // Split at negligible s(k).
+                case 2:
+                    $f = $e[$k-1];
+                    $e[$k-1] = 0.0;
+                    for ($j = $k; $j < $p; ++$j) {
+                        $t = hypo($this->s[$j], $f);
+                        $cs = $this->s[$j] / $t;
+                        $sn = $f / $t;
+                        $this->s[$j] = $t;
+                        $f = -$sn * $e[$j];
+                        $e[$j] = $cs * $e[$j];
+                        if ($wantu) {
+                            for ($i = 0; $i < $this->m; ++$i) {
+                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$k-1];
+                                $this->U[$i][$k-1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$k-1];
+                                $this->U[$i][$j] = $t;
+                            }
+                        }
+                    }
+                    break;
+                // Perform one qr step.
+                case 3:
+                    // Calculate the shift.
+                    $scale = max(max(max(max(abs($this->s[$p-1]), abs($this->s[$p-2])), abs($e[$p-2])), abs($this->s[$k])), abs($e[$k]));
+                    $sp   = $this->s[$p-1] / $scale;
+                    $spm1 = $this->s[$p-2] / $scale;
+                    $epm1 = $e[$p-2] / $scale;
+                    $sk   = $this->s[$k] / $scale;
+                    $ek   = $e[$k] / $scale;
+                    $b    = (($spm1 + $sp) * ($spm1 - $sp) + $epm1 * $epm1) / 2.0;
+                    $c    = ($sp * $epm1) * ($sp * $epm1);
+                    $shift = 0.0;
+                    if (($b != 0.0) || ($c != 0.0)) {
+                        $shift = sqrt($b * $b + $c);
+                        if ($b < 0.0) {
+                            $shift = -$shift;
+                        }
+                        $shift = $c / ($b + $shift);
+                    }
+                    $f = ($sk + $sp) * ($sk - $sp) + $shift;
+                    $g = $sk * $ek;
+                    // Chase zeros.
+                    for ($j = $k; $j < $p-1; ++$j) {
+                        $t  = hypo($f, $g);
+                        $cs = $f/$t;
+                        $sn = $g/$t;
+                        if ($j != $k) {
+                            $e[$j-1] = $t;
+                        }
+                        $f = $cs * $this->s[$j] + $sn * $e[$j];
+                        $e[$j] = $cs * $e[$j] - $sn * $this->s[$j];
+                        $g = $sn * $this->s[$j+1];
+                        $this->s[$j+1] = $cs * $this->s[$j+1];
+                        if ($wantv) {
+                            for ($i = 0; $i < $this->n; ++$i) {
+                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$j+1];
+                                $this->V[$i][$j+1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$j+1];
+                                $this->V[$i][$j] = $t;
+                            }
+                        }
+                        $t = hypo($f, $g);
+                        $cs = $f/$t;
+                        $sn = $g/$t;
+                        $this->s[$j] = $t;
+                        $f = $cs * $e[$j] + $sn * $this->s[$j+1];
+                        $this->s[$j+1] = -$sn * $e[$j] + $cs * $this->s[$j+1];
+                        $g = $sn * $e[$j+1];
+                        $e[$j+1] = $cs * $e[$j+1];
+                        if ($wantu && ($j < $this->m - 1)) {
+                            for ($i = 0; $i < $this->m; ++$i) {
+                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$j+1];
+                                $this->U[$i][$j+1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$j+1];
+                                $this->U[$i][$j] = $t;
+                            }
+                        }
+                    }
+                    $e[$p-2] = $f;
+                    $iter = $iter + 1;
+                    break;
+                // Convergence.
+                case 4:
+                    // Make the singular values positive.
+                    if ($this->s[$k] <= 0.0) {
+                        $this->s[$k] = ($this->s[$k] < 0.0 ? -$this->s[$k] : 0.0);
+                        if ($wantv) {
+                            for ($i = 0; $i <= $pp; ++$i) {
+                                $this->V[$i][$k] = -$this->V[$i][$k];
+                            }
+                        }
+                    }
+                    // Order the singular values.
+                    while ($k < $pp) {
+                        if ($this->s[$k] >= $this->s[$k+1]) {
+                            break;
+                        }
+                        $t = $this->s[$k];
+                        $this->s[$k] = $this->s[$k+1];
+                        $this->s[$k+1] = $t;
+                        if ($wantv and ($k < $this->n - 1)) {
+                            for ($i = 0; $i < $this->n; ++$i) {
+                                $t = $this->V[$i][$k+1];
+                                $this->V[$i][$k+1] = $this->V[$i][$k];
+                                $this->V[$i][$k] = $t;
+                            }
+                        }
+                        if ($wantu and ($k < $this->m-1)) {
+                            for ($i = 0; $i < $this->m; ++$i) {
+                                $t = $this->U[$i][$k+1];
+                                $this->U[$i][$k+1] = $this->U[$i][$k];
+                                $this->U[$i][$k] = $t;
+                            }
+                        }
+                        ++$k;
+                    }
+                    $iter = 0;
+                    --$p;
+                    break;
+            } // end switch
+        } // end while
+
+    } // end constructor
+
+
+    /**
+     *    Return the left singular vectors
+     *
+     *    @access public
+     *    @return U
+     */
+    public function getU()
+    {
+        return new Matrix($this->U, $this->m, min($this->m + 1, $this->n));
+    }
+
+
+    /**
+     *    Return the right singular vectors
+     *
+     *    @access public
+     *    @return V
+     */
+    public function getV()
+    {
+        return new Matrix($this->V);
+    }
+
+
+    /**
+     *    Return the one-dimensional array of singular values
+     *
+     *    @access public
+     *    @return diagonal of S.
+     */
+    public function getSingularValues()
+    {
+        return $this->s;
+    }
+
+
+    /**
+     *    Return the diagonal matrix of singular values
+     *
+     *    @access public
+     *    @return S
+     */
+    public function getS()
+    {
+        for ($i = 0; $i < $this->n; ++$i) {
+            for ($j = 0; $j < $this->n; ++$j) {
+                $S[$i][$j] = 0.0;
+            }
+            $S[$i][$i] = $this->s[$i];
+        }
+        return new Matrix($S);
+    }
+
+
+    /**
+     *    Two norm
+     *
+     *    @access public
+     *    @return max(S)
+     */
+    public function norm2()
+    {
+        return $this->s[0];
+    }
+
+
+    /**
+     *    Two norm condition number
+     *
+     *    @access public
+     *    @return max(S)/min(S)
+     */
+    public function cond()
+    {
+        return $this->s[0] / $this->s[min($this->m, $this->n) - 1];
+    }
+
+
+    /**
+     *    Effective numerical matrix rank
+     *
+     *    @access public
+     *    @return Number of nonnegligible singular values.
+     */
+    public function rank()
+    {
+        $eps = pow(2.0, -52.0);
+        $tol = max($this->m, $this->n) * $this->s[0] * $eps;
+        $r = 0;
+        for ($i = 0; $i < count($this->s); ++$i) {
+            if ($this->s[$i] > $tol) {
+                ++$r;
+            }
+        }
+        return $r;
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/utils/Error.php b/lib/PHPExcel/Shared/JAMA/utils/Error.php
new file mode 100644
index 000000000..71b8c994a
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/utils/Error.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    Error handling
+ *    @author Michael Bommarito
+ *    @version 01292005
+ */
+
+//Language constant
+define('JAMALANG', 'EN');
+
+
+//All errors may be defined by the following format:
+//define('ExceptionName', N);
+//$error['lang'][ExceptionName] = 'Error message';
+$error = array();
+
+/*
+I've used Babelfish and a little poor knowledge of Romance/Germanic languages for the translations here.
+Feel free to correct anything that looks amiss to you.
+*/
+
+define('POLYMORPHIC_ARGUMENT_EXCEPTION', -1);
+$error['EN'][POLYMORPHIC_ARGUMENT_EXCEPTION] = "Invalid argument pattern for polymorphic function.";
+$error['FR'][POLYMORPHIC_ARGUMENT_EXCEPTION] = "Modèle inadmissible d'argument pour la fonction polymorphe.".
+$error['DE'][POLYMORPHIC_ARGUMENT_EXCEPTION] = "Unzulässiges Argumentmuster für polymorphe Funktion.";
+
+define('ARGUMENT_TYPE_EXCEPTION', -2);
+$error['EN'][ARGUMENT_TYPE_EXCEPTION] = "Invalid argument type.";
+$error['FR'][ARGUMENT_TYPE_EXCEPTION] = "Type inadmissible d'argument.";
+$error['DE'][ARGUMENT_TYPE_EXCEPTION] = "Unzulässige Argumentart.";
+
+define('ARGUMENT_BOUNDS_EXCEPTION', -3);
+$error['EN'][ARGUMENT_BOUNDS_EXCEPTION] = "Invalid argument range.";
+$error['FR'][ARGUMENT_BOUNDS_EXCEPTION] = "Gamme inadmissible d'argument.";
+$error['DE'][ARGUMENT_BOUNDS_EXCEPTION] = "Unzulässige Argumentstrecke.";
+
+define('MATRIX_DIMENSION_EXCEPTION', -4);
+$error['EN'][MATRIX_DIMENSION_EXCEPTION] = "Matrix dimensions are not equal.";
+$error['FR'][MATRIX_DIMENSION_EXCEPTION] = "Les dimensions de Matrix ne sont pas égales.";
+$error['DE'][MATRIX_DIMENSION_EXCEPTION] = "Matrixmaße sind nicht gleich.";
+
+define('PRECISION_LOSS_EXCEPTION', -5);
+$error['EN'][PRECISION_LOSS_EXCEPTION] = "Significant precision loss detected.";
+$error['FR'][PRECISION_LOSS_EXCEPTION] = "Perte significative de précision détectée.";
+$error['DE'][PRECISION_LOSS_EXCEPTION] = "Bedeutender Präzision Verlust ermittelte.";
+
+define('MATRIX_SPD_EXCEPTION', -6);
+$error['EN'][MATRIX_SPD_EXCEPTION] = "Can only perform operation on symmetric positive definite matrix.";
+$error['FR'][MATRIX_SPD_EXCEPTION] = "Perte significative de précision détectée.";
+$error['DE'][MATRIX_SPD_EXCEPTION] = "Bedeutender Präzision Verlust ermittelte.";
+
+define('MATRIX_SINGULAR_EXCEPTION', -7);
+$error['EN'][MATRIX_SINGULAR_EXCEPTION] = "Can only perform operation on singular matrix.";
+
+define('MATRIX_RANK_EXCEPTION', -8);
+$error['EN'][MATRIX_RANK_EXCEPTION] = "Can only perform operation on full-rank matrix.";
+
+define('ARRAY_LENGTH_EXCEPTION', -9);
+$error['EN'][ARRAY_LENGTH_EXCEPTION] = "Array length must be a multiple of m.";
+
+define('ROW_LENGTH_EXCEPTION', -10);
+$error['EN'][ROW_LENGTH_EXCEPTION] = "All rows must have the same length.";
+
+/**
+ *    Custom error handler
+ *    @param int $num Error number
+ */
+function JAMAError($errorNumber = null)
+{
+    global $error;
+
+    if (isset($errorNumber)) {
+        if (isset($error[JAMALANG][$errorNumber])) {
+            return $error[JAMALANG][$errorNumber];
+        } else {
+            return $error['EN'][$errorNumber];
+        }
+    } else {
+        return ("Invalid argument to JAMAError()");
+    }
+}
diff --git a/lib/PHPExcel/Shared/JAMA/utils/Maths.php b/lib/PHPExcel/Shared/JAMA/utils/Maths.php
new file mode 100644
index 000000000..386c1e673
--- /dev/null
+++ b/lib/PHPExcel/Shared/JAMA/utils/Maths.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ *    @package JAMA
+ *
+ *    Pythagorean Theorem:
+ *
+ *    a = 3
+ *    b = 4
+ *    r = sqrt(square(a) + square(b))
+ *    r = 5
+ *
+ *    r = sqrt(a^2 + b^2) without under/overflow.
+ */
+function hypo($a, $b)
+{
+    if (abs($a) > abs($b)) {
+        $r = $b / $a;
+        $r = abs($a) * sqrt(1 + $r * $r);
+    } elseif ($b != 0) {
+        $r = $a / $b;
+        $r = abs($b) * sqrt(1 + $r * $r);
+    } else {
+        $r = 0.0;
+    }
+    return $r;
+}    //    function hypo()
+
+
+/**
+ *    Mike Bommarito's version.
+ *    Compute n-dimensional hyotheneuse.
+ *
+function hypot() {
+    $s = 0;
+    foreach (func_get_args() as $d) {
+        if (is_numeric($d)) {
+            $s += pow($d, 2);
+        } else {
+            throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION));
+        }
+    }
+    return sqrt($s);
+}
+*/
diff --git a/lib/PHPExcel/Shared/OLE.php b/lib/PHPExcel/Shared/OLE.php
new file mode 100644
index 000000000..1d3532a1f
--- /dev/null
+++ b/lib/PHPExcel/Shared/OLE.php
@@ -0,0 +1,526 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+// $Id: OLE.php,v 1.13 2007/03/07 14:38:25 schmidt Exp $
+
+
+/**
+* Array for storing OLE instances that are accessed from
+* OLE_ChainedBlockStream::stream_open().
+* @var  array
+*/
+$GLOBALS['_OLE_INSTANCES'] = array();
+
+/**
+* OLE package base class.
+*
+* @author   Xavier Noguer <xnoguer@php.net>
+* @author   Christian Schmidt <schmidt@php.net>
+* @category   PHPExcel
+* @package    PHPExcel_Shared_OLE
+*/
+class PHPExcel_Shared_OLE
+{
+    const OLE_PPS_TYPE_ROOT   =      5;
+    const OLE_PPS_TYPE_DIR    =      1;
+    const OLE_PPS_TYPE_FILE   =      2;
+    const OLE_DATA_SIZE_SMALL = 0x1000;
+    const OLE_LONG_INT_SIZE   =      4;
+    const OLE_PPS_SIZE        =   0x80;
+
+    /**
+     * The file handle for reading an OLE container
+     * @var resource
+    */
+    public $_file_handle;
+
+    /**
+    * Array of PPS's found on the OLE container
+    * @var array
+    */
+    public $_list = array();
+
+    /**
+     * Root directory of OLE container
+     * @var OLE_PPS_Root
+    */
+    public $root;
+
+    /**
+     * Big Block Allocation Table
+     * @var array  (blockId => nextBlockId)
+    */
+    public $bbat;
+
+    /**
+     * Short Block Allocation Table
+     * @var array  (blockId => nextBlockId)
+    */
+    public $sbat;
+
+    /**
+     * Size of big blocks. This is usually 512.
+     * @var  int  number of octets per block.
+    */
+    public $bigBlockSize;
+
+    /**
+     * Size of small blocks. This is usually 64.
+     * @var  int  number of octets per block
+    */
+    public $smallBlockSize;
+
+    /**
+     * Reads an OLE container from the contents of the file given.
+     *
+     * @acces public
+     * @param string $file
+     * @return mixed true on success, PEAR_Error on failure
+    */
+    public function read($file)
+    {
+        $fh = fopen($file, "r");
+        if (!$fh) {
+            throw new PHPExcel_Reader_Exception("Can't open file $file");
+        }
+        $this->_file_handle = $fh;
+
+        $signature = fread($fh, 8);
+        if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" != $signature) {
+            throw new PHPExcel_Reader_Exception("File doesn't seem to be an OLE container.");
+        }
+        fseek($fh, 28);
+        if (fread($fh, 2) != "\xFE\xFF") {
+            // This shouldn't be a problem in practice
+            throw new PHPExcel_Reader_Exception("Only Little-Endian encoding is supported.");
+        }
+        // Size of blocks and short blocks in bytes
+        $this->bigBlockSize = pow(2, self::_readInt2($fh));
+        $this->smallBlockSize  = pow(2, self::_readInt2($fh));
+
+        // Skip UID, revision number and version number
+        fseek($fh, 44);
+        // Number of blocks in Big Block Allocation Table
+        $bbatBlockCount = self::_readInt4($fh);
+
+        // Root chain 1st block
+        $directoryFirstBlockId = self::_readInt4($fh);
+
+        // Skip unused bytes
+        fseek($fh, 56);
+        // Streams shorter than this are stored using small blocks
+        $this->bigBlockThreshold = self::_readInt4($fh);
+        // Block id of first sector in Short Block Allocation Table
+        $sbatFirstBlockId = self::_readInt4($fh);
+        // Number of blocks in Short Block Allocation Table
+        $sbbatBlockCount = self::_readInt4($fh);
+        // Block id of first sector in Master Block Allocation Table
+        $mbatFirstBlockId = self::_readInt4($fh);
+        // Number of blocks in Master Block Allocation Table
+        $mbbatBlockCount = self::_readInt4($fh);
+        $this->bbat = array();
+
+        // Remaining 4 * 109 bytes of current block is beginning of Master
+        // Block Allocation Table
+        $mbatBlocks = array();
+        for ($i = 0; $i < 109; ++$i) {
+            $mbatBlocks[] = self::_readInt4($fh);
+        }
+
+        // Read rest of Master Block Allocation Table (if any is left)
+        $pos = $this->_getBlockOffset($mbatFirstBlockId);
+        for ($i = 0; $i < $mbbatBlockCount; ++$i) {
+            fseek($fh, $pos);
+            for ($j = 0; $j < $this->bigBlockSize / 4 - 1; ++$j) {
+                $mbatBlocks[] = self::_readInt4($fh);
+            }
+            // Last block id in each block points to next block
+            $pos = $this->_getBlockOffset(self::_readInt4($fh));
+        }
+
+        // Read Big Block Allocation Table according to chain specified by
+        // $mbatBlocks
+        for ($i = 0; $i < $bbatBlockCount; ++$i) {
+            $pos = $this->_getBlockOffset($mbatBlocks[$i]);
+            fseek($fh, $pos);
+            for ($j = 0; $j < $this->bigBlockSize / 4; ++$j) {
+                $this->bbat[] = self::_readInt4($fh);
+            }
+        }
+
+        // Read short block allocation table (SBAT)
+        $this->sbat = array();
+        $shortBlockCount = $sbbatBlockCount * $this->bigBlockSize / 4;
+        $sbatFh = $this->getStream($sbatFirstBlockId);
+        for ($blockId = 0; $blockId < $shortBlockCount; ++$blockId) {
+            $this->sbat[$blockId] = self::_readInt4($sbatFh);
+        }
+        fclose($sbatFh);
+
+        $this->_readPpsWks($directoryFirstBlockId);
+
+        return true;
+    }
+
+    /**
+     * @param  int  block id
+     * @param  int  byte offset from beginning of file
+     * @access public
+     */
+    public function _getBlockOffset($blockId)
+    {
+        return 512 + $blockId * $this->bigBlockSize;
+    }
+
+    /**
+    * Returns a stream for use with fread() etc. External callers should
+    * use PHPExcel_Shared_OLE_PPS_File::getStream().
+    * @param   int|PPS   block id or PPS
+    * @return  resource  read-only stream
+    */
+    public function getStream($blockIdOrPps)
+    {
+        static $isRegistered = false;
+        if (!$isRegistered) {
+            stream_wrapper_register('ole-chainedblockstream', 'PHPExcel_Shared_OLE_ChainedBlockStream');
+            $isRegistered = true;
+        }
+
+        // Store current instance in global array, so that it can be accessed
+        // in OLE_ChainedBlockStream::stream_open().
+        // Object is removed from self::$instances in OLE_Stream::close().
+        $GLOBALS['_OLE_INSTANCES'][] = $this;
+        $instanceId = end(array_keys($GLOBALS['_OLE_INSTANCES']));
+
+        $path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
+        if ($blockIdOrPps instanceof PHPExcel_Shared_OLE_PPS) {
+            $path .= '&blockId=' . $blockIdOrPps->_StartBlock;
+            $path .= '&size=' . $blockIdOrPps->Size;
+        } else {
+            $path .= '&blockId=' . $blockIdOrPps;
+        }
+        return fopen($path, 'r');
+    }
+
+    /**
+     * Reads a signed char.
+     * @param   resource  file handle
+     * @return  int
+     * @access public
+     */
+    private static function _readInt1($fh)
+    {
+        list(, $tmp) = unpack("c", fread($fh, 1));
+        return $tmp;
+    }
+
+    /**
+     * Reads an unsigned short (2 octets).
+     * @param   resource  file handle
+     * @return  int
+     * @access public
+     */
+    private static function _readInt2($fh)
+    {
+        list(, $tmp) = unpack("v", fread($fh, 2));
+        return $tmp;
+    }
+
+    /**
+     * Reads an unsigned long (4 octets).
+     * @param   resource  file handle
+     * @return  int
+     * @access public
+     */
+    private static function _readInt4($fh)
+    {
+        list(, $tmp) = unpack("V", fread($fh, 4));
+        return $tmp;
+    }
+
+    /**
+    * Gets information about all PPS's on the OLE container from the PPS WK's
+    * creates an OLE_PPS object for each one.
+    *
+    * @access public
+    * @param  integer  the block id of the first block
+    * @return mixed true on success, PEAR_Error on failure
+    */
+    public function _readPpsWks($blockId)
+    {
+        $fh = $this->getStream($blockId);
+        for ($pos = 0;; $pos += 128) {
+            fseek($fh, $pos, SEEK_SET);
+            $nameUtf16 = fread($fh, 64);
+            $nameLength = self::_readInt2($fh);
+            $nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
+            // Simple conversion from UTF-16LE to ISO-8859-1
+            $name = str_replace("\x00", "", $nameUtf16);
+            $type = self::_readInt1($fh);
+            switch ($type) {
+                case self::OLE_PPS_TYPE_ROOT:
+                    $pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
+                    $this->root = $pps;
+                    break;
+                case self::OLE_PPS_TYPE_DIR:
+                    $pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null, null, null, null, null, array());
+                    break;
+                case self::OLE_PPS_TYPE_FILE:
+                    $pps = new PHPExcel_Shared_OLE_PPS_File($name);
+                    break;
+                default:
+                    continue 2;
+            }
+            fseek($fh, 1, SEEK_CUR);
+            $pps->Type    = $type;
+            $pps->Name    = $name;
+            $pps->PrevPps = self::_readInt4($fh);
+            $pps->NextPps = self::_readInt4($fh);
+            $pps->DirPps  = self::_readInt4($fh);
+            fseek($fh, 20, SEEK_CUR);
+            $pps->Time1st = self::OLE2LocalDate(fread($fh, 8));
+            $pps->Time2nd = self::OLE2LocalDate(fread($fh, 8));
+            $pps->_StartBlock = self::_readInt4($fh);
+            $pps->Size = self::_readInt4($fh);
+            $pps->No = count($this->_list);
+            $this->_list[] = $pps;
+
+            // check if the PPS tree (starting from root) is complete
+            if (isset($this->root) && $this->_ppsTreeComplete($this->root->No)) {
+                break;
+            }
+        }
+        fclose($fh);
+
+        // Initialize $pps->children on directories
+        foreach ($this->_list as $pps) {
+            if ($pps->Type == self::OLE_PPS_TYPE_DIR || $pps->Type == self::OLE_PPS_TYPE_ROOT) {
+                $nos = array($pps->DirPps);
+                $pps->children = array();
+                while ($nos) {
+                    $no = array_pop($nos);
+                    if ($no != -1) {
+                        $childPps = $this->_list[$no];
+                        $nos[] = $childPps->PrevPps;
+                        $nos[] = $childPps->NextPps;
+                        $pps->children[] = $childPps;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+    * It checks whether the PPS tree is complete (all PPS's read)
+    * starting with the given PPS (not necessarily root)
+    *
+    * @access public
+    * @param integer $index The index of the PPS from which we are checking
+    * @return boolean Whether the PPS tree for the given PPS is complete
+    */
+    public function _ppsTreeComplete($index)
+    {
+        return isset($this->_list[$index]) &&
+               ($pps = $this->_list[$index]) &&
+               ($pps->PrevPps == -1 ||
+                $this->_ppsTreeComplete($pps->PrevPps)) &&
+               ($pps->NextPps == -1 ||
+                $this->_ppsTreeComplete($pps->NextPps)) &&
+               ($pps->DirPps == -1 ||
+                $this->_ppsTreeComplete($pps->DirPps));
+    }
+
+    /**
+    * Checks whether a PPS is a File PPS or not.
+    * If there is no PPS for the index given, it will return false.
+    *
+    * @access public
+    * @param integer $index The index for the PPS
+    * @return bool true if it's a File PPS, false otherwise
+    */
+    public function isFile($index)
+    {
+        if (isset($this->_list[$index])) {
+            return ($this->_list[$index]->Type == self::OLE_PPS_TYPE_FILE);
+        }
+        return false;
+    }
+
+    /**
+    * Checks whether a PPS is a Root PPS or not.
+    * If there is no PPS for the index given, it will return false.
+    *
+    * @access public
+    * @param integer $index The index for the PPS.
+    * @return bool true if it's a Root PPS, false otherwise
+    */
+    public function isRoot($index)
+    {
+        if (isset($this->_list[$index])) {
+            return ($this->_list[$index]->Type == self::OLE_PPS_TYPE_ROOT);
+        }
+        return false;
+    }
+
+    /**
+    * Gives the total number of PPS's found in the OLE container.
+    *
+    * @access public
+    * @return integer The total number of PPS's found in the OLE container
+    */
+    public function ppsTotal()
+    {
+        return count($this->_list);
+    }
+
+    /**
+    * Gets data from a PPS
+    * If there is no PPS for the index given, it will return an empty string.
+    *
+    * @access public
+    * @param integer $index    The index for the PPS
+    * @param integer $position The position from which to start reading
+    *                          (relative to the PPS)
+    * @param integer $length   The amount of bytes to read (at most)
+    * @return string The binary string containing the data requested
+    * @see OLE_PPS_File::getStream()
+    */
+    public function getData($index, $position, $length)
+    {
+        // if position is not valid return empty string
+        if (!isset($this->_list[$index]) || ($position >= $this->_list[$index]->Size) || ($position < 0)) {
+            return '';
+        }
+        $fh = $this->getStream($this->_list[$index]);
+        $data = stream_get_contents($fh, $length, $position);
+        fclose($fh);
+        return $data;
+    }
+
+    /**
+    * Gets the data length from a PPS
+    * If there is no PPS for the index given, it will return 0.
+    *
+    * @access public
+    * @param integer $index    The index for the PPS
+    * @return integer The amount of bytes in data the PPS has
+    */
+    public function getDataLength($index)
+    {
+        if (isset($this->_list[$index])) {
+            return $this->_list[$index]->Size;
+        }
+        return 0;
+    }
+
+    /**
+    * Utility function to transform ASCII text to Unicode
+    *
+    * @access public
+    * @static
+    * @param string $ascii The ASCII string to transform
+    * @return string The string in Unicode
+    */
+    public static function Asc2Ucs($ascii)
+    {
+        $rawname = '';
+        for ($i = 0; $i < strlen($ascii); ++$i) {
+            $rawname .= $ascii[$i] . "\x00";
+        }
+        return $rawname;
+    }
+
+    /**
+    * Utility function
+    * Returns a string for the OLE container with the date given
+    *
+    * @access public
+    * @static
+    * @param integer $date A timestamp
+    * @return string The string for the OLE container
+    */
+    public static function LocalDate2OLE($date = null)
+    {
+        if (!isset($date)) {
+            return "\x00\x00\x00\x00\x00\x00\x00\x00";
+        }
+
+        // factor used for separating numbers into 4 bytes parts
+        $factor = pow(2, 32);
+
+        // days from 1-1-1601 until the beggining of UNIX era
+        $days = 134774;
+        // calculate seconds
+        $big_date = $days*24*3600 + gmmktime(date("H", $date), date("i", $date), date("s", $date), date("m", $date), date("d", $date), date("Y", $date));
+        // multiply just to make MS happy
+        $big_date *= 10000000;
+
+        $high_part = floor($big_date / $factor);
+        // lower 4 bytes
+        $low_part = floor((($big_date / $factor) - $high_part) * $factor);
+
+        // Make HEX string
+        $res = '';
+
+        for ($i = 0; $i < 4; ++$i) {
+            $hex = $low_part % 0x100;
+            $res .= pack('c', $hex);
+            $low_part /= 0x100;
+        }
+        for ($i = 0; $i < 4; ++$i) {
+            $hex = $high_part % 0x100;
+            $res .= pack('c', $hex);
+            $high_part /= 0x100;
+        }
+        return $res;
+    }
+
+    /**
+    * Returns a timestamp from an OLE container's date
+    *
+    * @access public
+    * @static
+    * @param integer $string A binary string with the encoded date
+    * @return string The timestamp corresponding to the string
+    */
+    public static function OLE2LocalDate($string)
+    {
+        if (strlen($string) != 8) {
+            return new PEAR_Error("Expecting 8 byte string");
+        }
+
+        // factor used for separating numbers into 4 bytes parts
+        $factor = pow(2, 32);
+        list(, $high_part) = unpack('V', substr($string, 4, 4));
+        list(, $low_part) = unpack('V', substr($string, 0, 4));
+
+        $big_date = ($high_part * $factor) + $low_part;
+        // translate to seconds
+        $big_date /= 10000000;
+
+        // days from 1-1-1601 until the beggining of UNIX era
+        $days = 134774;
+
+        // translate to seconds from beggining of UNIX era
+        $big_date -= $days * 24 * 3600;
+        return floor($big_date);
+    }
+}
diff --git a/lib/PHPExcel/Shared/OLE/ChainedBlockStream.php b/lib/PHPExcel/Shared/OLE/ChainedBlockStream.php
new file mode 100644
index 000000000..84d2cc50b
--- /dev/null
+++ b/lib/PHPExcel/Shared/OLE/ChainedBlockStream.php
@@ -0,0 +1,206 @@
+<?php
+
+/**
+ * PHPExcel_Shared_OLE_ChainedBlockStream
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_OLE
+ * @copyright  Copyright (c) 2006 - 2007 Christian Schmidt
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_OLE_ChainedBlockStream
+{
+    /**
+     * The OLE container of the file that is being read.
+     * @var OLE
+     */
+    public $ole;
+
+    /**
+     * Parameters specified by fopen().
+     * @var array
+     */
+    public $params;
+
+    /**
+     * The binary data of the file.
+     * @var  string
+     */
+    public $data;
+
+    /**
+     * The file pointer.
+     * @var  int  byte offset
+     */
+    public $pos;
+
+    /**
+     * Implements support for fopen().
+     * For creating streams using this wrapper, use OLE_PPS_File::getStream().
+     *
+     * @param    string    $path            resource name including scheme, e.g.
+     *                                    ole-chainedblockstream://oleInstanceId=1
+     * @param    string    $mode            only "r" is supported
+     * @param    int        $options        mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
+     * @param    string  &$openedPath    absolute path of the opened stream (out parameter)
+     * @return    bool    true on success
+     */
+    public function stream_open($path, $mode, $options, &$openedPath)
+    {
+        if ($mode != 'r') {
+            if ($options & STREAM_REPORT_ERRORS) {
+                trigger_error('Only reading is supported', E_USER_WARNING);
+            }
+            return false;
+        }
+
+        // 25 is length of "ole-chainedblockstream://"
+        parse_str(substr($path, 25), $this->params);
+        if (!isset($this->params['oleInstanceId'], $this->params['blockId'], $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
+            if ($options & STREAM_REPORT_ERRORS) {
+                trigger_error('OLE stream not found', E_USER_WARNING);
+            }
+            return false;
+        }
+        $this->ole = $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']];
+
+        $blockId = $this->params['blockId'];
+        $this->data = '';
+        if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->_StartBlock) {
+            // Block id refers to small blocks
+            $rootPos = $this->ole->_getBlockOffset($this->ole->root->_StartBlock);
+            while ($blockId != -2) {
+                $pos = $rootPos + $blockId * $this->ole->bigBlockSize;
+                $blockId = $this->ole->sbat[$blockId];
+                fseek($this->ole->_file_handle, $pos);
+                $this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
+            }
+        } else {
+            // Block id refers to big blocks
+            while ($blockId != -2) {
+                $pos = $this->ole->_getBlockOffset($blockId);
+                fseek($this->ole->_file_handle, $pos);
+                $this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
+                $blockId = $this->ole->bbat[$blockId];
+            }
+        }
+        if (isset($this->params['size'])) {
+            $this->data = substr($this->data, 0, $this->params['size']);
+        }
+
+        if ($options & STREAM_USE_PATH) {
+            $openedPath = $path;
+        }
+
+        return true;
+    }
+
+    /**
+     * Implements support for fclose().
+     *
+     */
+    public function stream_close()
+    {
+        $this->ole = null;
+        unset($GLOBALS['_OLE_INSTANCES']);
+    }
+
+    /**
+     * Implements support for fread(), fgets() etc.
+     *
+     * @param   int        $count    maximum number of bytes to read
+     * @return  string
+     */
+    public function stream_read($count)
+    {
+        if ($this->stream_eof()) {
+            return false;
+        }
+        $s = substr($this->data, $this->pos, $count);
+        $this->pos += $count;
+        return $s;
+    }
+
+    /**
+     * Implements support for feof().
+     *
+     * @return  bool  TRUE if the file pointer is at EOF; otherwise FALSE
+     */
+    public function stream_eof()
+    {
+        return $this->pos >= strlen($this->data);
+    }
+
+    /**
+     * Returns the position of the file pointer, i.e. its offset into the file
+     * stream. Implements support for ftell().
+     *
+     * @return  int
+     */
+    public function stream_tell()
+    {
+        return $this->pos;
+    }
+
+    /**
+     * Implements support for fseek().
+     *
+     * @param    int        $offset    byte offset
+     * @param    int        $whence    SEEK_SET, SEEK_CUR or SEEK_END
+     * @return    bool
+     */
+    public function stream_seek($offset, $whence)
+    {
+        if ($whence == SEEK_SET && $offset >= 0) {
+            $this->pos = $offset;
+        } elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
+            $this->pos += $offset;
+        } elseif ($whence == SEEK_END && -$offset <= sizeof($this->data)) {
+            $this->pos = strlen($this->data) + $offset;
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Implements support for fstat(). Currently the only supported field is
+     * "size".
+     * @return  array
+     */
+    public function stream_stat()
+    {
+        return array(
+            'size' => strlen($this->data),
+            );
+    }
+
+    // Methods used by stream_wrapper_register() that are not implemented:
+    // bool stream_flush ( void )
+    // int stream_write ( string data )
+    // bool rename ( string path_from, string path_to )
+    // bool mkdir ( string path, int mode, int options )
+    // bool rmdir ( string path, int options )
+    // bool dir_opendir ( string path, int options )
+    // array url_stat ( string path, int flags )
+    // string dir_readdir ( void )
+    // bool dir_rewinddir ( void )
+    // bool dir_closedir ( void )
+}
diff --git a/lib/PHPExcel/Shared/OLE/PPS.php b/lib/PHPExcel/Shared/OLE/PPS.php
new file mode 100644
index 000000000..608a892aa
--- /dev/null
+++ b/lib/PHPExcel/Shared/OLE/PPS.php
@@ -0,0 +1,230 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+// $Id: PPS.php,v 1.7 2007/02/13 21:00:42 schmidt Exp $
+
+
+/**
+* Class for creating PPS's for OLE containers
+*
+* @author   Xavier Noguer <xnoguer@php.net>
+* @category PHPExcel
+* @package  PHPExcel_Shared_OLE
+*/
+class PHPExcel_Shared_OLE_PPS
+{
+    /**
+    * The PPS index
+    * @var integer
+    */
+    public $No;
+
+    /**
+    * The PPS name (in Unicode)
+    * @var string
+    */
+    public $Name;
+
+    /**
+    * The PPS type. Dir, Root or File
+    * @var integer
+    */
+    public $Type;
+
+    /**
+    * The index of the previous PPS
+    * @var integer
+    */
+    public $PrevPps;
+
+    /**
+    * The index of the next PPS
+    * @var integer
+    */
+    public $NextPps;
+
+    /**
+    * The index of it's first child if this is a Dir or Root PPS
+    * @var integer
+    */
+    public $DirPps;
+
+    /**
+    * A timestamp
+    * @var integer
+    */
+    public $Time1st;
+
+    /**
+    * A timestamp
+    * @var integer
+    */
+    public $Time2nd;
+
+    /**
+    * Starting block (small or big) for this PPS's data  inside the container
+    * @var integer
+    */
+    public $_StartBlock;
+
+    /**
+    * The size of the PPS's data (in bytes)
+    * @var integer
+    */
+    public $Size;
+
+    /**
+    * The PPS's data (only used if it's not using a temporary file)
+    * @var string
+    */
+    public $_data;
+
+    /**
+    * Array of child PPS's (only used by Root and Dir PPS's)
+    * @var array
+    */
+    public $children = array();
+
+    /**
+    * Pointer to OLE container
+    * @var OLE
+    */
+    public $ole;
+
+    /**
+    * The constructor
+    *
+    * @access public
+    * @param integer $No   The PPS index
+    * @param string  $name The PPS name
+    * @param integer $type The PPS type. Dir, Root or File
+    * @param integer $prev The index of the previous PPS
+    * @param integer $next The index of the next PPS
+    * @param integer $dir  The index of it's first child if this is a Dir or Root PPS
+    * @param integer $time_1st A timestamp
+    * @param integer $time_2nd A timestamp
+    * @param string  $data  The (usually binary) source data of the PPS
+    * @param array   $children Array containing children PPS for this PPS
+    */
+    public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children)
+    {
+        $this->No      = $No;
+        $this->Name    = $name;
+        $this->Type    = $type;
+        $this->PrevPps = $prev;
+        $this->NextPps = $next;
+        $this->DirPps  = $dir;
+        $this->Time1st = $time_1st;
+        $this->Time2nd = $time_2nd;
+        $this->_data      = $data;
+        $this->children   = $children;
+        if ($data != '') {
+            $this->Size = strlen($data);
+        } else {
+            $this->Size = 0;
+        }
+    }
+
+    /**
+    * Returns the amount of data saved for this PPS
+    *
+    * @access public
+    * @return integer The amount of data (in bytes)
+    */
+    public function _DataLen()
+    {
+        if (!isset($this->_data)) {
+            return 0;
+        }
+        //if (isset($this->_PPS_FILE)) {
+        //    fseek($this->_PPS_FILE, 0);
+        //    $stats = fstat($this->_PPS_FILE);
+        //    return $stats[7];
+        //} else {
+            return strlen($this->_data);
+        //}
+    }
+
+    /**
+    * Returns a string with the PPS's WK (What is a WK?)
+    *
+    * @access public
+    * @return string The binary string
+    */
+    public function _getPpsWk()
+    {
+        $ret = str_pad($this->Name, 64, "\x00");
+
+        $ret .= pack("v", strlen($this->Name) + 2)  // 66
+              . pack("c", $this->Type)              // 67
+              . pack("c", 0x00) //UK                // 68
+              . pack("V", $this->PrevPps) //Prev    // 72
+              . pack("V", $this->NextPps) //Next    // 76
+              . pack("V", $this->DirPps)  //Dir     // 80
+              . "\x00\x09\x02\x00"                  // 84
+              . "\x00\x00\x00\x00"                  // 88
+              . "\xc0\x00\x00\x00"                  // 92
+              . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
+              . "\x00\x00\x00\x00"                  // 100
+              . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time1st)       // 108
+              . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time2nd)       // 116
+              . pack("V", isset($this->_StartBlock)?
+                        $this->_StartBlock:0)        // 120
+              . pack("V", $this->Size)               // 124
+              . pack("V", 0);                        // 128
+        return $ret;
+    }
+
+    /**
+    * Updates index and pointers to previous, next and children PPS's for this
+    * PPS. I don't think it'll work with Dir PPS's.
+    *
+    * @access public
+    * @param array &$raList Reference to the array of PPS's for the whole OLE
+    *                          container
+    * @return integer          The index for this PPS
+    */
+    public static function _savePpsSetPnt(&$raList, $to_save, $depth = 0)
+    {
+        if (!is_array($to_save) || (empty($to_save))) {
+            return 0xFFFFFFFF;
+        } elseif (count($to_save) == 1) {
+            $cnt = count($raList);
+            // If the first entry, it's the root... Don't clone it!
+            $raList[$cnt] = ( $depth == 0 ) ? $to_save[0] : clone $to_save[0];
+            $raList[$cnt]->No = $cnt;
+            $raList[$cnt]->PrevPps = 0xFFFFFFFF;
+            $raList[$cnt]->NextPps = 0xFFFFFFFF;
+            $raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+        } else {
+            $iPos  = floor(count($to_save) / 2);
+            $aPrev = array_slice($to_save, 0, $iPos);
+            $aNext = array_slice($to_save, $iPos + 1);
+            $cnt   = count($raList);
+            // If the first entry, it's the root... Don't clone it!
+            $raList[$cnt] = ( $depth == 0 ) ? $to_save[$iPos] : clone $to_save[$iPos];
+            $raList[$cnt]->No = $cnt;
+            $raList[$cnt]->PrevPps = self::_savePpsSetPnt($raList, $aPrev, $depth++);
+            $raList[$cnt]->NextPps = self::_savePpsSetPnt($raList, $aNext, $depth++);
+            $raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+
+        }
+        return $cnt;
+    }
+}
diff --git a/lib/PHPExcel/Shared/OLE/PPS/File.php b/lib/PHPExcel/Shared/OLE/PPS/File.php
new file mode 100644
index 000000000..1ca337cba
--- /dev/null
+++ b/lib/PHPExcel/Shared/OLE/PPS/File.php
@@ -0,0 +1,74 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+// $Id: File.php,v 1.11 2007/02/13 21:00:42 schmidt Exp $
+
+
+/**
+* Class for creating File PPS's for OLE containers
+*
+* @author   Xavier Noguer <xnoguer@php.net>
+* @category PHPExcel
+* @package  PHPExcel_Shared_OLE
+*/
+class PHPExcel_Shared_OLE_PPS_File extends PHPExcel_Shared_OLE_PPS
+{
+    /**
+    * The constructor
+    *
+    * @access public
+    * @param string $name The name of the file (in Unicode)
+    * @see OLE::Asc2Ucs()
+    */
+    public function __construct($name)
+    {
+        parent::__construct(null, $name, PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE, null, null, null, null, null, '', array());
+    }
+
+    /**
+    * Initialization method. Has to be called right after OLE_PPS_File().
+    *
+    * @access public
+    * @return mixed true on success
+    */
+    public function init()
+    {
+        return true;
+    }
+
+    /**
+    * Append data to PPS
+    *
+    * @access public
+    * @param string $data The data to append
+    */
+    public function append($data)
+    {
+        $this->_data .= $data;
+    }
+
+    /**
+     * Returns a stream for reading this file using fread() etc.
+     * @return  resource  a read-only stream
+     */
+    public function getStream()
+    {
+        $this->ole->getStream($this);
+    }
+}
diff --git a/lib/PHPExcel/Shared/OLE/PPS/Root.php b/lib/PHPExcel/Shared/OLE/PPS/Root.php
new file mode 100644
index 000000000..5d4052f06
--- /dev/null
+++ b/lib/PHPExcel/Shared/OLE/PPS/Root.php
@@ -0,0 +1,462 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+// $Id: Root.php,v 1.9 2005/04/23 21:53:49 dufuz Exp $
+
+
+/**
+* Class for creating Root PPS's for OLE containers
+*
+* @author   Xavier Noguer <xnoguer@php.net>
+* @category PHPExcel
+* @package  PHPExcel_Shared_OLE
+*/
+class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
+{
+
+    /**
+     * Directory for temporary files
+     * @var string
+     */
+    protected $tempDirectory = null;
+
+    /**
+     * @param integer $time_1st A timestamp
+     * @param integer $time_2nd A timestamp
+     */
+    public function __construct($time_1st, $time_2nd, $raChild)
+    {
+        $this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+
+        parent::__construct(null, PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'), PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT, null, null, null, $time_1st, $time_2nd, null, $raChild);
+    }
+
+    /**
+    * Method for saving the whole OLE container (including files).
+    * In fact, if called with an empty argument (or '-'), it saves to a
+    * temporary file and then outputs it's contents to stdout.
+    * If a resource pointer to a stream created by fopen() is passed
+    * it will be used, but you have to close such stream by yourself.
+    *
+    * @param string|resource $filename The name of the file or stream where to save the OLE container.
+    * @access public
+    * @return mixed true on success
+    */
+    public function save($filename)
+    {
+        // Initial Setting for saving
+        $this->_BIG_BLOCK_SIZE  = pow(
+            2,
+            (isset($this->_BIG_BLOCK_SIZE))? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
+        );
+        $this->_SMALL_BLOCK_SIZE= pow(
+            2,
+            (isset($this->_SMALL_BLOCK_SIZE))?  self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
+        );
+
+        if (is_resource($filename)) {
+            $this->_FILEH_ = $filename;
+        } elseif ($filename == '-' || $filename == '') {
+            if ($this->tempDirectory === null) {
+                $this->tempDirectory = PHPExcel_Shared_File::sys_get_temp_dir();
+            }
+            $this->_tmp_filename = tempnam($this->tempDirectory, "OLE_PPS_Root");
+            $this->_FILEH_ = fopen($this->_tmp_filename, "w+b");
+            if ($this->_FILEH_ == false) {
+                throw new PHPExcel_Writer_Exception("Can't create temporary file.");
+            }
+        } else {
+            $this->_FILEH_ = fopen($filename, "wb");
+        }
+        if ($this->_FILEH_ == false) {
+            throw new PHPExcel_Writer_Exception("Can't open $filename. It may be in use or protected.");
+        }
+        // Make an array of PPS's (for Save)
+        $aList = array();
+        PHPExcel_Shared_OLE_PPS::_savePpsSetPnt($aList, array($this));
+        // calculate values for header
+        list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo);
+        // Save Header
+        $this->_saveHeader($iSBDcnt, $iBBcnt, $iPPScnt);
+
+        // Make Small Data string (write SBD)
+        $this->_data = $this->_makeSmallData($aList);
+
+        // Write BB
+        $this->_saveBigData($iSBDcnt, $aList);
+        // Write PPS
+        $this->_savePps($aList);
+        // Write Big Block Depot and BDList and Adding Header informations
+        $this->_saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
+
+        if (!is_resource($filename)) {
+            fclose($this->_FILEH_);
+        }
+
+        return true;
+    }
+
+    /**
+    * Calculate some numbers
+    *
+    * @access public
+    * @param array $raList Reference to an array of PPS's
+    * @return array The array of numbers
+    */
+    public function _calcSize(&$raList)
+    {
+        // Calculate Basic Setting
+        list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0,0,0);
+        $iSmallLen = 0;
+        $iSBcnt = 0;
+        $iCount = count($raList);
+        for ($i = 0; $i < $iCount; ++$i) {
+            if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
+                $raList[$i]->Size = $raList[$i]->_DataLen();
+                if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
+                    $iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                } else {
+                    $iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
+                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                }
+            }
+        }
+        $iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
+        $iSlCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
+        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
+        $iBBcnt +=  (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
+                      (( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
+        $iCnt = count($raList);
+        $iBdCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
+        $iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
+
+        return array($iSBDcnt, $iBBcnt, $iPPScnt);
+    }
+
+    /**
+    * Helper function for caculating a magic value for block sizes
+    *
+    * @access public
+    * @param integer $i2 The argument
+    * @see save()
+    * @return integer
+    */
+    private static function adjust2($i2)
+    {
+        $iWk = log($i2)/log(2);
+        return ($iWk > floor($iWk))? floor($iWk)+1:$iWk;
+    }
+
+    /**
+    * Save OLE header
+    *
+    * @access public
+    * @param integer $iSBDcnt
+    * @param integer $iBBcnt
+    * @param integer $iPPScnt
+    */
+    public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt)
+    {
+        $FILE = $this->_FILEH_;
+
+        // Calculate Basic Setting
+        $iBlCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
+        $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
+
+        $iBdExL = 0;
+        $iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
+        $iAllW = $iAll;
+        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
+
+        // Calculate BD count
+        if ($iBdCnt > $i1stBdL) {
+            while (1) {
+                ++$iBdExL;
+                ++$iAllW;
+                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
+                if ($iBdCnt <= ($iBdExL*$iBlCnt+ $i1stBdL)) {
+                    break;
+                }
+            }
+        }
+
+        // Save Header
+        fwrite(
+            $FILE,
+            "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . pack("v", 0x3b)
+            . pack("v", 0x03)
+            . pack("v", -2)
+            . pack("v", 9)
+            . pack("v", 6)
+            . pack("v", 0)
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . pack("V", $iBdCnt)
+            . pack("V", $iBBcnt+$iSBDcnt) //ROOT START
+            . pack("V", 0)
+            . pack("V", 0x1000)
+            . pack("V", $iSBDcnt ? 0 : -2) //Small Block Depot
+            . pack("V", $iSBDcnt)
+        );
+        // Extra BDList Start, Count
+        if ($iBdCnt < $i1stBdL) {
+            fwrite(
+                $FILE,
+                pack("V", -2) // Extra BDList Start
+                . pack("V", 0)// Extra BDList Count
+            );
+        } else {
+            fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
+        }
+
+        // BDList
+        for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; ++$i) {
+            fwrite($FILE, pack("V", $iAll+$i));
+        }
+        if ($i < $i1stBdL) {
+            $jB = $i1stBdL - $i;
+            for ($j = 0; $j < $jB; ++$j) {
+                fwrite($FILE, (pack("V", -1)));
+            }
+        }
+    }
+
+    /**
+    * Saving big data (PPS's with data bigger than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
+    *
+    * @access public
+    * @param integer $iStBlk
+    * @param array &$raList Reference to array of PPS's
+    */
+    public function _saveBigData($iStBlk, &$raList)
+    {
+        $FILE = $this->_FILEH_;
+
+        // cycle through PPS's
+        $iCount = count($raList);
+        for ($i = 0; $i < $iCount; ++$i) {
+            if ($raList[$i]->Type != PHPExcel_Shared_OLE::OLE_PPS_TYPE_DIR) {
+                $raList[$i]->Size = $raList[$i]->_DataLen();
+                if (($raList[$i]->Size >= PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) || (($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data))) {
+                    // Write Data
+                    //if (isset($raList[$i]->_PPS_FILE)) {
+                    //    $iLen = 0;
+                    //    fseek($raList[$i]->_PPS_FILE, 0); // To The Top
+                    //    while ($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
+                    //        $iLen += strlen($sBuff);
+                    //        fwrite($FILE, $sBuff);
+                    //    }
+                    //} else {
+                        fwrite($FILE, $raList[$i]->_data);
+                    //}
+
+                    if ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) {
+                        fwrite($FILE, str_repeat("\x00", $this->_BIG_BLOCK_SIZE - ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)));
+                    }
+                    // Set For PPS
+                    $raList[$i]->_StartBlock = $iStBlk;
+                    $iStBlk +=
+                            (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
+                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                }
+                // Close file for each PPS, and unlink it
+                //if (isset($raList[$i]->_PPS_FILE)) {
+                //    fclose($raList[$i]->_PPS_FILE);
+                //    $raList[$i]->_PPS_FILE = null;
+                //    unlink($raList[$i]->_tmp_filename);
+                //}
+            }
+        }
+    }
+
+    /**
+    * get small data (PPS's with data smaller than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
+    *
+    * @access public
+    * @param array &$raList Reference to array of PPS's
+    */
+    public function _makeSmallData(&$raList)
+    {
+        $sRes = '';
+        $FILE = $this->_FILEH_;
+        $iSmBlk = 0;
+
+        $iCount = count($raList);
+        for ($i = 0; $i < $iCount; ++$i) {
+            // Make SBD, small data string
+            if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
+                if ($raList[$i]->Size <= 0) {
+                    continue;
+                }
+                if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
+                    $iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                    // Add to SBD
+                    $jB = $iSmbCnt - 1;
+                    for ($j = 0; $j < $jB; ++$j) {
+                        fwrite($FILE, pack("V", $j+$iSmBlk+1));
+                    }
+                    fwrite($FILE, pack("V", -2));
+
+                    //// Add to Data String(this will be written for RootEntry)
+                    //if ($raList[$i]->_PPS_FILE) {
+                    //    fseek($raList[$i]->_PPS_FILE, 0); // To The Top
+                    //    while ($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
+                    //        $sRes .= $sBuff;
+                    //    }
+                    //} else {
+                        $sRes .= $raList[$i]->_data;
+                    //}
+                    if ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) {
+                        $sRes .= str_repeat("\x00", $this->_SMALL_BLOCK_SIZE - ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE));
+                    }
+                    // Set for PPS
+                    $raList[$i]->_StartBlock = $iSmBlk;
+                    $iSmBlk += $iSmbCnt;
+                }
+            }
+        }
+        $iSbCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
+        if ($iSmBlk % $iSbCnt) {
+            $iB = $iSbCnt - ($iSmBlk % $iSbCnt);
+            for ($i = 0; $i < $iB; ++$i) {
+                fwrite($FILE, pack("V", -1));
+            }
+        }
+        return $sRes;
+    }
+
+    /**
+    * Saves all the PPS's WKs
+    *
+    * @access public
+    * @param array $raList Reference to an array with all PPS's
+    */
+    public function _savePps(&$raList)
+    {
+        // Save each PPS WK
+        $iC = count($raList);
+        for ($i = 0; $i < $iC; ++$i) {
+            fwrite($this->_FILEH_, $raList[$i]->_getPpsWk());
+        }
+        // Adjust for Block
+        $iCnt = count($raList);
+        $iBCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
+        if ($iCnt % $iBCnt) {
+            fwrite($this->_FILEH_, str_repeat("\x00", ($iBCnt - ($iCnt % $iBCnt)) * PHPExcel_Shared_OLE::OLE_PPS_SIZE));
+        }
+    }
+
+    /**
+    * Saving Big Block Depot
+    *
+    * @access public
+    * @param integer $iSbdSize
+    * @param integer $iBsize
+    * @param integer $iPpsCnt
+    */
+    public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt)
+    {
+        $FILE = $this->_FILEH_;
+        // Calculate Basic Setting
+        $iBbCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
+        $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
+
+        $iBdExL = 0;
+        $iAll = $iBsize + $iPpsCnt + $iSbdSize;
+        $iAllW = $iAll;
+        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
+        // Calculate BD count
+        if ($iBdCnt >$i1stBdL) {
+            while (1) {
+                ++$iBdExL;
+                ++$iAllW;
+                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
+                if ($iBdCnt <= ($iBdExL*$iBbCnt+ $i1stBdL)) {
+                    break;
+                }
+            }
+        }
+
+        // Making BD
+        // Set for SBD
+        if ($iSbdSize > 0) {
+            for ($i = 0; $i < ($iSbdSize - 1); ++$i) {
+                fwrite($FILE, pack("V", $i+1));
+            }
+            fwrite($FILE, pack("V", -2));
+        }
+        // Set for B
+        for ($i = 0; $i < ($iBsize - 1); ++$i) {
+            fwrite($FILE, pack("V", $i+$iSbdSize+1));
+        }
+        fwrite($FILE, pack("V", -2));
+
+        // Set for PPS
+        for ($i = 0; $i < ($iPpsCnt - 1); ++$i) {
+            fwrite($FILE, pack("V", $i+$iSbdSize+$iBsize+1));
+        }
+        fwrite($FILE, pack("V", -2));
+        // Set for BBD itself ( 0xFFFFFFFD : BBD)
+        for ($i = 0; $i < $iBdCnt; ++$i) {
+            fwrite($FILE, pack("V", 0xFFFFFFFD));
+        }
+        // Set for ExtraBDList
+        for ($i = 0; $i < $iBdExL; ++$i) {
+            fwrite($FILE, pack("V", 0xFFFFFFFC));
+        }
+        // Adjust for Block
+        if (($iAllW + $iBdCnt) % $iBbCnt) {
+            $iBlock = ($iBbCnt - (($iAllW + $iBdCnt) % $iBbCnt));
+            for ($i = 0; $i < $iBlock; ++$i) {
+                fwrite($FILE, pack("V", -1));
+            }
+        }
+        // Extra BDList
+        if ($iBdCnt > $i1stBdL) {
+            $iN=0;
+            $iNb=0;
+            for ($i = $i1stBdL; $i < $iBdCnt; $i++, ++$iN) {
+                if ($iN >= ($iBbCnt - 1)) {
+                    $iN = 0;
+                    ++$iNb;
+                    fwrite($FILE, pack("V", $iAll+$iBdCnt+$iNb));
+                }
+                fwrite($FILE, pack("V", $iBsize+$iSbdSize+$iPpsCnt+$i));
+            }
+            if (($iBdCnt-$i1stBdL) % ($iBbCnt-1)) {
+                $iB = ($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1));
+                for ($i = 0; $i < $iB; ++$i) {
+                    fwrite($FILE, pack("V", -1));
+                }
+            }
+            fwrite($FILE, pack("V", -2));
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/OLERead.php b/lib/PHPExcel/Shared/OLERead.php
new file mode 100644
index 000000000..6b15d9700
--- /dev/null
+++ b/lib/PHPExcel/Shared/OLERead.php
@@ -0,0 +1,318 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+defined('IDENTIFIER_OLE') ||
+    define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
+
+class PHPExcel_Shared_OLERead
+{
+    private $data = '';
+
+    // OLE identifier
+    const IDENTIFIER_OLE                    = IDENTIFIER_OLE;
+
+    // Size of a sector = 512 bytes
+    const BIG_BLOCK_SIZE                    = 0x200;
+
+    // Size of a short sector = 64 bytes
+    const SMALL_BLOCK_SIZE                  = 0x40;
+
+    // Size of a directory entry always = 128 bytes
+    const PROPERTY_STORAGE_BLOCK_SIZE       = 0x80;
+
+    // Minimum size of a standard stream = 4096 bytes, streams smaller than this are stored as short streams
+    const SMALL_BLOCK_THRESHOLD             = 0x1000;
+
+    // header offsets
+    const NUM_BIG_BLOCK_DEPOT_BLOCKS_POS    = 0x2c;
+    const ROOT_START_BLOCK_POS              = 0x30;
+    const SMALL_BLOCK_DEPOT_BLOCK_POS       = 0x3c;
+    const EXTENSION_BLOCK_POS               = 0x44;
+    const NUM_EXTENSION_BLOCK_POS           = 0x48;
+    const BIG_BLOCK_DEPOT_BLOCKS_POS        = 0x4c;
+
+    // property storage offsets (directory offsets)
+    const SIZE_OF_NAME_POS                  = 0x40;
+    const TYPE_POS                          = 0x42;
+    const START_BLOCK_POS                   = 0x74;
+    const SIZE_POS                          = 0x78;
+
+
+
+    public $wrkbook                         = null;
+    public $summaryInformation              = null;
+    public $documentSummaryInformation      = null;
+
+
+    /**
+     * Read the file
+     *
+     * @param $sFileName string Filename
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function read($sFileName)
+    {
+        // Check if file exists and is readable
+        if (!is_readable($sFileName)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $sFileName . " for reading! File does not exist, or it is not readable.");
+        }
+
+        // Get the file identifier
+        // Don't bother reading the whole file until we know it's a valid OLE file
+        $this->data = file_get_contents($sFileName, false, null, 0, 8);
+
+        // Check OLE identifier
+        if ($this->data != self::IDENTIFIER_OLE) {
+            throw new PHPExcel_Reader_Exception('The filename ' . $sFileName . ' is not recognised as an OLE file');
+        }
+
+        // Get the file data
+        $this->data = file_get_contents($sFileName);
+
+        // Total number of sectors used for the SAT
+        $this->numBigBlockDepotBlocks = self::getInt4d($this->data, self::NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);
+
+        // SecID of the first sector of the directory stream
+        $this->rootStartBlock = self::getInt4d($this->data, self::ROOT_START_BLOCK_POS);
+
+        // SecID of the first sector of the SSAT (or -2 if not extant)
+        $this->sbdStartBlock = self::getInt4d($this->data, self::SMALL_BLOCK_DEPOT_BLOCK_POS);
+
+        // SecID of the first sector of the MSAT (or -2 if no additional sectors are used)
+        $this->extensionBlock = self::getInt4d($this->data, self::EXTENSION_BLOCK_POS);
+
+        // Total number of sectors used by MSAT
+        $this->numExtensionBlocks = self::getInt4d($this->data, self::NUM_EXTENSION_BLOCK_POS);
+
+        $bigBlockDepotBlocks = array();
+        $pos = self::BIG_BLOCK_DEPOT_BLOCKS_POS;
+
+        $bbdBlocks = $this->numBigBlockDepotBlocks;
+
+        if ($this->numExtensionBlocks != 0) {
+            $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS)/4;
+        }
+
+        for ($i = 0; $i < $bbdBlocks; ++$i) {
+              $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
+              $pos += 4;
+        }
+
+        for ($j = 0; $j < $this->numExtensionBlocks; ++$j) {
+            $pos = ($this->extensionBlock + 1) * self::BIG_BLOCK_SIZE;
+            $blocksToRead = min($this->numBigBlockDepotBlocks - $bbdBlocks, self::BIG_BLOCK_SIZE / 4 - 1);
+
+            for ($i = $bbdBlocks; $i < $bbdBlocks + $blocksToRead; ++$i) {
+                $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
+                $pos += 4;
+            }
+
+            $bbdBlocks += $blocksToRead;
+            if ($bbdBlocks < $this->numBigBlockDepotBlocks) {
+                $this->extensionBlock = self::getInt4d($this->data, $pos);
+            }
+        }
+
+        $pos = 0;
+        $this->bigBlockChain = '';
+        $bbs = self::BIG_BLOCK_SIZE / 4;
+        for ($i = 0; $i < $this->numBigBlockDepotBlocks; ++$i) {
+            $pos = ($bigBlockDepotBlocks[$i] + 1) * self::BIG_BLOCK_SIZE;
+
+            $this->bigBlockChain .= substr($this->data, $pos, 4*$bbs);
+            $pos += 4*$bbs;
+        }
+
+        $pos = 0;
+        $sbdBlock = $this->sbdStartBlock;
+        $this->smallBlockChain = '';
+        while ($sbdBlock != -2) {
+            $pos = ($sbdBlock + 1) * self::BIG_BLOCK_SIZE;
+
+            $this->smallBlockChain .= substr($this->data, $pos, 4*$bbs);
+            $pos += 4*$bbs;
+
+            $sbdBlock = self::getInt4d($this->bigBlockChain, $sbdBlock*4);
+        }
+
+        // read the directory stream
+        $block = $this->rootStartBlock;
+        $this->entry = $this->_readData($block);
+
+        $this->readPropertySets();
+    }
+
+    /**
+     * Extract binary stream data
+     *
+     * @return string
+     */
+    public function getStream($stream)
+    {
+        if ($stream === null) {
+            return null;
+        }
+
+        $streamData = '';
+
+        if ($this->props[$stream]['size'] < self::SMALL_BLOCK_THRESHOLD) {
+            $rootdata = $this->_readData($this->props[$this->rootentry]['startBlock']);
+
+            $block = $this->props[$stream]['startBlock'];
+
+            while ($block != -2) {
+                  $pos = $block * self::SMALL_BLOCK_SIZE;
+                $streamData .= substr($rootdata, $pos, self::SMALL_BLOCK_SIZE);
+
+                $block = self::getInt4d($this->smallBlockChain, $block*4);
+            }
+
+            return $streamData;
+        } else {
+            $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
+            if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
+                ++$numBlocks;
+            }
+
+            if ($numBlocks == 0) {
+                return '';
+            }
+
+            $block = $this->props[$stream]['startBlock'];
+
+            while ($block != -2) {
+                $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+                $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+                $block = self::getInt4d($this->bigBlockChain, $block*4);
+            }
+
+            return $streamData;
+        }
+    }
+
+    /**
+     * Read a standard stream (by joining sectors using information from SAT)
+     *
+     * @param int $bl Sector ID where the stream starts
+     * @return string Data for standard stream
+     */
+    private function _readData($bl)
+    {
+        $block = $bl;
+        $data = '';
+
+        while ($block != -2) {
+            $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+            $data .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+            $block = self::getInt4d($this->bigBlockChain, $block*4);
+        }
+        return $data;
+    }
+
+    /**
+     * Read entries in the directory stream.
+     */
+    private function readPropertySets()
+    {
+        $offset = 0;
+
+        // loop through entires, each entry is 128 bytes
+        $entryLen = strlen($this->entry);
+        while ($offset < $entryLen) {
+            // entry data (128 bytes)
+            $d = substr($this->entry, $offset, self::PROPERTY_STORAGE_BLOCK_SIZE);
+
+            // size in bytes of name
+            $nameSize = ord($d[self::SIZE_OF_NAME_POS]) | (ord($d[self::SIZE_OF_NAME_POS+1]) << 8);
+
+            // type of entry
+            $type = ord($d[self::TYPE_POS]);
+
+            // sectorID of first sector or short sector, if this entry refers to a stream (the case with workbook)
+            // sectorID of first sector of the short-stream container stream, if this entry is root entry
+            $startBlock = self::getInt4d($d, self::START_BLOCK_POS);
+
+            $size = self::getInt4d($d, self::SIZE_POS);
+
+            $name = str_replace("\x00", "", substr($d, 0, $nameSize));
+
+            $this->props[] = array(
+                'name' => $name,
+                'type' => $type,
+                'startBlock' => $startBlock,
+                'size' => $size
+            );
+
+            // tmp helper to simplify checks
+            $upName = strtoupper($name);
+
+            // Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
+            if (($upName === 'WORKBOOK') || ($upName === 'BOOK')) {
+                $this->wrkbook = count($this->props) - 1;
+            } elseif ($upName === 'ROOT ENTRY' || $upName === 'R') {
+                // Root entry
+                $this->rootentry = count($this->props) - 1;
+            }
+
+            // Summary information
+            if ($name == chr(5) . 'SummaryInformation') {
+//                echo 'Summary Information<br />';
+                $this->summaryInformation = count($this->props) - 1;
+            }
+
+            // Additional Document Summary information
+            if ($name == chr(5) . 'DocumentSummaryInformation') {
+//                echo 'Document Summary Information<br />';
+                $this->documentSummaryInformation = count($this->props) - 1;
+            }
+
+            $offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
+        }
+    }
+
+    /**
+     * Read 4 bytes of data at specified position
+     *
+     * @param string $data
+     * @param int $pos
+     * @return int
+     */
+    private static function getInt4d($data, $pos)
+    {
+        // FIX: represent numbers correctly on 64-bit system
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
+        // Hacked by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
+        $_or_24 = ord($data[$pos + 3]);
+        if ($_or_24 >= 128) {
+            // negative number
+            $_ord_24 = -abs((256 - $_or_24) << 24);
+        } else {
+            $_ord_24 = ($_or_24 & 127) << 24;
+        }
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
+    }
+}
diff --git a/lib/PHPExcel/Shared/PCLZip/gnu-lgpl.txt b/lib/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
new file mode 100644
index 000000000..b1e3f5a26
--- /dev/null
+++ b/lib/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/lib/PHPExcel/Shared/PCLZip/pclzip.lib.php b/lib/PHPExcel/Shared/PCLZip/pclzip.lib.php
new file mode 100644
index 000000000..a5a9b0a8b
--- /dev/null
+++ b/lib/PHPExcel/Shared/PCLZip/pclzip.lib.php
@@ -0,0 +1,5173 @@
+<?php
+// --------------------------------------------------------------------------------
+// PhpConcept Library - Zip Module 2.8.2
+// --------------------------------------------------------------------------------
+// License GNU/LGPL - Vincent Blavet - August 2009
+// http://www.phpconcept.net
+// --------------------------------------------------------------------------------
+//
+// Presentation :
+//     PclZip is a PHP library that manage ZIP archives.
+//     So far tests show that archives generated by PclZip are readable by
+//     WinZip application and other tools.
+//
+// Description :
+//     See readme.txt and http://www.phpconcept.net
+//
+// Warning :
+//     This library and the associated files are non commercial, non professional
+//     work.
+//     It should not have unexpected results. However if any damage is caused by
+//     this software the author can not be responsible.
+//     The use of this software is at the risk of the user.
+//
+// --------------------------------------------------------------------------------
+// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
+// --------------------------------------------------------------------------------
+
+// ----- Constants
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
+}
+
+// ----- File list separator
+// In version 1.x of PclZip, the separator for file list is a space
+// (which is not a very smart choice, specifically for windows paths !).
+// A better separator should be a comma (,). This constant gives you the
+// abilty to change that.
+// However notice that changing this value, may have impact on existing
+// scripts, using space separated filenames.
+// Recommanded values for compatibility with older versions :
+//define('PCLZIP_SEPARATOR', ' ');
+// Recommanded values for smart separation of filenames.
+if (!defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
+}
+
+// ----- Error configuration
+// 0 : PclZip Class integrated error handling
+// 1 : PclError external library error handling. By enabling this
+//         you must ensure that you have included PclError library.
+// [2,...] : reserved for futur use
+if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
+}
+
+// ----- Optional static temporary directory
+//             By default temporary files are generated in the script current
+//             path.
+//             If defined :
+//             - MUST BE terminated by a '/'.
+//             - MUST be a valid, already created directory
+//             Samples :
+// define('PCLZIP_TEMPORARY_DIR', '/temp/');
+// define('PCLZIP_TEMPORARY_DIR', 'C:/Temp/');
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
+}
+
+// ----- Optional threshold ratio for use of temporary files
+//             Pclzip sense the size of the file to add/extract and decide to
+//             use or not temporary file. The algorythm is looking for
+//             memory_limit of PHP and apply a ratio.
+//             threshold = memory_limit * ratio.
+//             Recommended values are under 0.5. Default 0.47.
+//             Samples :
+// define('PCLZIP_TEMPORARY_FILE_RATIO', 0.5);
+if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
+}
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
+// --------------------------------------------------------------------------------
+
+// ----- Global variables
+$g_pclzip_version = "2.8.2";
+
+// ----- Error codes
+//     -1 : Unable to open file in binary write mode
+//     -2 : Unable to open file in binary read mode
+//     -3 : Invalid parameters
+//     -4 : File does not exist
+//     -5 : Filename is too long (max. 255)
+//     -6 : Not a valid zip file
+//     -7 : Invalid extracted file size
+//     -8 : Unable to create directory
+//     -9 : Invalid archive extension
+//    -10 : Invalid archive format
+//    -11 : Unable to delete file (unlink)
+//    -12 : Unable to rename file (rename)
+//    -13 : Invalid header checksum
+//    -14 : Invalid archive size
+define('PCLZIP_ERR_USER_ABORTED', 2);
+define('PCLZIP_ERR_NO_ERROR', 0);
+define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+define('PCLZIP_ERR_MISSING_FILE', -4);
+define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+define('PCLZIP_ERR_INVALID_ZIP', -6);
+define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+define('PCLZIP_ERR_BAD_EXTENSION', -9);
+define('PCLZIP_ERR_BAD_FORMAT', -10);
+define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
+
+// ----- Options values
+define('PCLZIP_OPT_PATH', 77001);
+define('PCLZIP_OPT_ADD_PATH', 77002);
+define('PCLZIP_OPT_REMOVE_PATH', 77003);
+define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+define('PCLZIP_OPT_SET_CHMOD', 77005);
+define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+define('PCLZIP_OPT_BY_NAME', 77008);
+define('PCLZIP_OPT_BY_INDEX', 77009);
+define('PCLZIP_OPT_BY_EREG', 77010);
+define('PCLZIP_OPT_BY_PREG', 77011);
+define('PCLZIP_OPT_COMMENT', 77012);
+define('PCLZIP_OPT_ADD_COMMENT', 77013);
+define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
+// Having big trouble with crypt. Need to multiply 2 long int
+// which is not correctly supported by PHP ...
+//define('PCLZIP_OPT_CRYPT', 77018);
+define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
+
+// ----- File description attributes
+define('PCLZIP_ATT_FILE_NAME', 79001);
+define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+define('PCLZIP_ATT_FILE_MTIME', 79004);
+define('PCLZIP_ATT_FILE_CONTENT', 79005);
+define('PCLZIP_ATT_FILE_COMMENT', 79006);
+
+// ----- Call backs values
+define('PCLZIP_CB_PRE_EXTRACT', 78001);
+define('PCLZIP_CB_POST_EXTRACT', 78002);
+define('PCLZIP_CB_PRE_ADD', 78003);
+define('PCLZIP_CB_POST_ADD', 78004);
+/* For futur use
+define('PCLZIP_CB_PRE_LIST', 78005);
+define('PCLZIP_CB_POST_LIST', 78006);
+define('PCLZIP_CB_PRE_DELETE', 78007);
+define('PCLZIP_CB_POST_DELETE', 78008);
+*/
+
+// --------------------------------------------------------------------------------
+// Class : PclZip
+// Description :
+//     PclZip is the class that represent a Zip archive.
+//     The public methods allow the manipulation of the archive.
+// Attributes :
+//     Attributes must not be accessed directly.
+// Methods :
+//     PclZip() : Object creator
+//     create() : Creates the Zip archive
+//     listContent() : List the content of the Zip archive
+//     extract() : Extract the content of the archive
+//     properties() : List the properties of the archive
+// --------------------------------------------------------------------------------
+class PclZip
+{
+    // ----- Filename of the zip file
+    public $zipname = '';
+
+    // ----- File descriptor of the zip file
+    public $zip_fd = 0;
+
+    // ----- Internal error handling
+    public $error_code = 1;
+    public $error_string = '';
+
+    // ----- Current status of the magic_quotes_runtime
+    // This value store the php configuration for magic_quotes
+    // The class can then disable the magic_quotes and reset it after
+    public $magic_quotes_status;
+
+    // --------------------------------------------------------------------------------
+    // Function : PclZip()
+    // Description :
+    //     Creates a PclZip object and set the name of the associated Zip archive
+    //     filename.
+    //     Note that no real action is taken, if the archive does not exist it is not
+    //     created. Use create() for that.
+    // --------------------------------------------------------------------------------
+    public function __construct($p_zipname)
+    {
+
+        // ----- Tests the zlib
+        if (!function_exists('gzopen')) {
+            die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+        }
+
+        // ----- Set the attributes
+        $this->zipname = $p_zipname;
+        $this->zip_fd = 0;
+        $this->magic_quotes_status = -1;
+
+        // ----- Return
+        return;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //     create($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //     create($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //     This method supports two different synopsis. The first one is historical.
+    //     This method creates a Zip Archive. The Zip file is created in the
+    //     filesystem. The files and directories indicated in $p_filelist
+    //     are added in the archive. See the parameters description for the
+    //     supported format of $p_filelist.
+    //     When a directory is in the list, the directory and its content is added
+    //     in the archive.
+    //     In this synopsis, the function takes an optional variable list of
+    //     options. See bellow the supported options.
+    // Parameters :
+    //     $p_filelist : An array containing file or directory names, or
+    //                                 a string containing one filename or one directory name, or
+    //                                 a string containing a list of filenames and/or directory
+    //                                 names separated by spaces.
+    //     $p_add_dir : A path to add before the real path of the archived file,
+    //                                in order to have it memorized in the archive.
+    //     $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                                     in order to have a shorter path memorized in the archive.
+    //                                     When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                                     is removed first, before $p_add_dir is added.
+    // Options :
+    //     PCLZIP_OPT_ADD_PATH :
+    //     PCLZIP_OPT_REMOVE_PATH :
+    //     PCLZIP_OPT_REMOVE_ALL_PATH :
+    //     PCLZIP_OPT_COMMENT :
+    //     PCLZIP_CB_PRE_ADD :
+    //     PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //     0 on failure,
+    //     The list of the added files, with a status of the add action.
+    //     (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function create($p_filelist)
+    {
+        $v_result=1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Set default values
+        $v_options = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove from the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+            } else {
+                // ----- Look for 2 args
+                // Here we need to support the first historic synopsis of the
+                // method.
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Init
+        $v_string_list = array();
+        $v_att_list = array();
+        $v_filedescr_list = array();
+        $p_result_list = array();
+
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+            // ----- Look if the first element is also an array
+            //             This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+            } else {
+                // ----- The list is a list of string names
+                $v_string_list = $p_filelist;
+            }
+        } elseif (is_string($p_filelist)) {
+            // ----- Look if the $p_filelist is a string
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+        } else {
+            // ----- Invalid variable type for $p_filelist
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+            return 0;
+        }
+
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                if ($v_string != '') {
+                    $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+                } else {
+                }
+            }
+        }
+
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Call the create fct
+        $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Return
+        return $p_result_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //     add($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //     add($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //     This method supports two synopsis. The first one is historical.
+    //     This methods add the list of files in an existing archive.
+    //     If a file with the same name already exists, it is added at the end of the
+    //     archive, the first one is still present.
+    //     If the archive does not exist, it is created.
+    // Parameters :
+    //     $p_filelist : An array containing file or directory names, or
+    //                                 a string containing one filename or one directory name, or
+    //                                 a string containing a list of filenames and/or directory
+    //                                 names separated by spaces.
+    //     $p_add_dir : A path to add before the real path of the archived file,
+    //                                in order to have it memorized in the archive.
+    //     $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                                     in order to have a shorter path memorized in the archive.
+    //                                     When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                                     is removed first, before $p_add_dir is added.
+    // Options :
+    //     PCLZIP_OPT_ADD_PATH :
+    //     PCLZIP_OPT_REMOVE_PATH :
+    //     PCLZIP_OPT_REMOVE_ALL_PATH :
+    //     PCLZIP_OPT_COMMENT :
+    //     PCLZIP_OPT_ADD_COMMENT :
+    //     PCLZIP_OPT_PREPEND_COMMENT :
+    //     PCLZIP_CB_PRE_ADD :
+    //     PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //     0 on failure,
+    //     The list of the added files, with a status of the add action.
+    //     (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function add($p_filelist)
+    {
+        $v_result=1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Set default values
+        $v_options = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_ADD_COMMENT => 'optional',
+                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+            } else {
+                // ----- Look for 2 args
+                // Here we need to support the first historic synopsis of the
+                // method.
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Init
+        $v_string_list = array();
+        $v_att_list = array();
+        $v_filedescr_list = array();
+        $p_result_list = array();
+
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+            // ----- Look if the first element is also an array
+            //             This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+            } else {
+                // ----- The list is a list of string names
+                $v_string_list = $p_filelist;
+            }
+        } elseif (is_string($p_filelist)) {
+            // ----- Look if the $p_filelist is a string
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+        } else {
+            // ----- Invalid variable type for $p_filelist
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+            return 0;
+        }
+
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+            }
+        }
+
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+          PCLZIP_ATT_FILE_NAME => 'mandatory',
+          PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+          PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+          PCLZIP_ATT_FILE_MTIME => 'optional',
+          PCLZIP_ATT_FILE_CONTENT => 'optional',
+          PCLZIP_ATT_FILE_COMMENT => 'optional',
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Call the create fct
+        $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Return
+        return $p_result_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : listContent()
+    // Description :
+    //     This public method, gives the list of the files and directories, with their
+    //     properties.
+    //     The properties of each entries in the list are (used also in other functions) :
+    //         filename : Name of the file. For a create or add action it is the filename
+    //                                given by the user. For an extract function it is the filename
+    //                                of the extracted file.
+    //         stored_filename : Name of the file / directory stored in the archive.
+    //         size : Size of the stored file.
+    //         compressed_size : Size of the file's data compressed in the archive
+    //                                             (without the headers overhead)
+    //         mtime : Last known modification date of the file (UNIX timestamp)
+    //         comment : Comment associated with the file
+    //         folder : true | false
+    //         index : index of the file in the archive
+    //         status : status of the action (depending of the action) :
+    //                            Values are :
+    //                                ok : OK !
+    //                                filtered : the file / dir is not extracted (filtered by user)
+    //                                already_a_directory : the file can not be extracted because a
+    //                                                                            directory with the same name already exists
+    //                                write_protected : the file can not be extracted because a file
+    //                                                                    with the same name already exists and is
+    //                                                                    write protected
+    //                                newer_exist : the file was not extracted because a newer file exists
+    //                                path_creation_fail : the file is not extracted because the folder
+    //                                                                         does not exist and can not be created
+    //                                write_error : the file was not extracted because there was a
+    //                                                            error while writing the file
+    //                                read_error : the file was not extracted because there was a error
+    //                                                         while reading the file
+    //                                invalid_header : the file was not extracted because of an archive
+    //                                                                 format error (bad file header)
+    //     Note that each time a method can continue operating when there
+    //     is an action error on a file, the error is only logged in the file status.
+    // Return Values :
+    //     0 on an unrecoverable failure,
+    //     The list of the files in the archive.
+    // --------------------------------------------------------------------------------
+    public function listContent()
+    {
+        $v_result=1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return(0);
+        }
+
+        // ----- Call the extracting fct
+        $p_list = array();
+        if (($v_result = $this->privList($p_list)) != 1) {
+            unset($p_list);
+            return(0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //     extract($p_path="./", $p_remove_path="")
+    //     extract([$p_option, $p_option_value, ...])
+    // Description :
+    //     This method supports two synopsis. The first one is historical.
+    //     This method extract all the files / directories from the archive to the
+    //     folder indicated in $p_path.
+    //     If you want to ignore the 'root' part of path of the memorized files
+    //     you can indicate this in the optional $p_remove_path parameter.
+    //     By default, if a newer file with the same name already exists, the
+    //     file is not extracted.
+    //
+    //     If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+    //     are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+    //     at the end of the path value of PCLZIP_OPT_PATH.
+    // Parameters :
+    //     $p_path : Path where the files and directories are to be extracted
+    //     $p_remove_path : First part ('root' part) of the memorized path
+    //                                        (if any similar) to remove while extracting.
+    // Options :
+    //     PCLZIP_OPT_PATH :
+    //     PCLZIP_OPT_ADD_PATH :
+    //     PCLZIP_OPT_REMOVE_PATH :
+    //     PCLZIP_OPT_REMOVE_ALL_PATH :
+    //     PCLZIP_CB_PRE_EXTRACT :
+    //     PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //     0 or a negative value on failure,
+    //     The list of the extracted files, with a status of the action.
+    //     (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function extract()
+    {
+        $v_result=1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return(0);
+        }
+
+        // ----- Set default values
+        $v_options = array();
+    //        $v_path = "./";
+        $v_path = '';
+        $v_remove_path = "";
+        $v_remove_all_path = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                  PCLZIP_OPT_PATH => 'optional',
+                  PCLZIP_OPT_REMOVE_PATH => 'optional',
+                  PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                  PCLZIP_OPT_ADD_PATH => 'optional',
+                  PCLZIP_CB_PRE_EXTRACT => 'optional',
+                  PCLZIP_CB_POST_EXTRACT => 'optional',
+                  PCLZIP_OPT_SET_CHMOD => 'optional',
+                  PCLZIP_OPT_BY_NAME => 'optional',
+                  PCLZIP_OPT_BY_EREG => 'optional',
+                  PCLZIP_OPT_BY_PREG => 'optional',
+                  PCLZIP_OPT_BY_INDEX => 'optional',
+                  PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                  PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                  PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                  PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                  PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                  PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                  PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                  PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+            } else {
+                // ----- Look for 2 args
+                // Here we need to support the first historic synopsis of the
+                // method.
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Trace
+
+        // ----- Call the extracting fct
+        $p_list = array();
+        $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
+        if ($v_result < 1) {
+            unset($p_list);
+            return(0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //     extractByIndex($p_index, $p_path="./", $p_remove_path="")
+    //     extractByIndex($p_index, [$p_option, $p_option_value, ...])
+    // Description :
+    //     This method supports two synopsis. The first one is historical.
+    //     This method is doing a partial extract of the archive.
+    //     The extracted files or folders are identified by their index in the
+    //     archive (from 0 to n).
+    //     Note that if the index identify a folder, only the folder entry is
+    //     extracted, not all the files included in the archive.
+    // Parameters :
+    //     $p_index : A single index (integer) or a string of indexes of files to
+    //                            extract. The form of the string is "0,4-6,8-12" with only numbers
+    //                            and '-' for range or ',' to separate ranges. No spaces or ';'
+    //                            are allowed.
+    //     $p_path : Path where the files and directories are to be extracted
+    //     $p_remove_path : First part ('root' part) of the memorized path
+    //                                        (if any similar) to remove while extracting.
+    // Options :
+    //     PCLZIP_OPT_PATH :
+    //     PCLZIP_OPT_ADD_PATH :
+    //     PCLZIP_OPT_REMOVE_PATH :
+    //     PCLZIP_OPT_REMOVE_ALL_PATH :
+    //     PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+    //         not as files.
+    //         The resulting content is in a new field 'content' in the file
+    //         structure.
+    //         This option must be used alone (any other options are ignored).
+    //     PCLZIP_CB_PRE_EXTRACT :
+    //     PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //     0 on failure,
+    //     The list of the extracted files, with a status of the action.
+    //     (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    //function extractByIndex($p_index, options...)
+    public function extractByIndex($p_index)
+    {
+        $v_result=1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return(0);
+        }
+
+        // ----- Set default values
+        $v_options = array();
+    //        $v_path = "./";
+        $v_path = '';
+        $v_remove_path = "";
+        $v_remove_all_path = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+                if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+                    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+                } else {
+                }
+            } else {
+                // ----- Look for 2 args
+                // Here we need to support the first historic synopsis of the
+                // method.
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Trace
+
+        // ----- Trick
+        // Here I want to reuse extractByRule(), so I need to parse the $p_index
+        // with privParseOptions()
+        $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+        $v_options_trick = array();
+        $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array (PCLZIP_OPT_BY_INDEX => 'optional'));
+        if ($v_result != 1) {
+            return 0;
+        }
+        $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Call the extracting fct
+        if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+            return(0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //     delete([$p_option, $p_option_value, ...])
+    // Description :
+    //     This method removes files from the archive.
+    //     If no parameters are given, then all the archive is emptied.
+    // Parameters :
+    //     None or optional arguments.
+    // Options :
+    //     PCLZIP_OPT_BY_INDEX :
+    //     PCLZIP_OPT_BY_NAME :
+    //     PCLZIP_OPT_BY_EREG :
+    //     PCLZIP_OPT_BY_PREG :
+    // Return Values :
+    //     0 on failure,
+    //     The list of the files which are still present in the archive.
+    //     (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function delete()
+    {
+        $v_result=1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return(0);
+        }
+
+        // ----- Set default values
+        $v_options = array();
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Parse the options
+            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array (
+                PCLZIP_OPT_BY_NAME => 'optional',
+                PCLZIP_OPT_BY_EREG => 'optional',
+                PCLZIP_OPT_BY_PREG => 'optional',
+                PCLZIP_OPT_BY_INDEX => 'optional'
+            ));
+            if ($v_result != 1) {
+                    return 0;
+            }
+        }
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Call the delete fct
+        $v_list = array();
+        if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+            $this->privSwapBackMagicQuotes();
+            unset($v_list);
+            return(0);
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : deleteByIndex()
+    // Description :
+    //     ***** Deprecated *****
+    //     delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+    // --------------------------------------------------------------------------------
+    public function deleteByIndex($p_index)
+    {
+
+        $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : properties()
+    // Description :
+    //     This method gives the properties of the archive.
+    //     The properties are :
+    //         nb : Number of files in the archive
+    //         comment : Comment associated with the archive file
+    //         status : not_exist, ok
+    // Parameters :
+    //     None
+    // Return Values :
+    //     0 on failure,
+    //     An array with the archive properties.
+    // --------------------------------------------------------------------------------
+    public function properties()
+    {
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            $this->privSwapBackMagicQuotes();
+            return(0);
+        }
+
+        // ----- Default properties
+        $v_prop = array();
+        $v_prop['comment'] = '';
+        $v_prop['nb'] = 0;
+        $v_prop['status'] = 'not_exist';
+
+        // ----- Look if file exists
+        if (@is_file($this->zipname)) {
+            // ----- Open the zip file
+            if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+                $this->privSwapBackMagicQuotes();
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+                // ----- Return
+                return 0;
+            }
+
+            // ----- Read the central directory informations
+            $v_central_dir = array();
+            if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+                $this->privSwapBackMagicQuotes();
+                return 0;
+            }
+
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Set the user attributes
+            $v_prop['comment'] = $v_central_dir['comment'];
+            $v_prop['nb'] = $v_central_dir['entries'];
+            $v_prop['status'] = 'ok';
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_prop;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : duplicate()
+    // Description :
+    //     This method creates an archive by copying the content of an other one. If
+    //     the archive already exist, it is replaced by the new one without any warning.
+    // Parameters :
+    //     $p_archive : The filename of a valid archive, or
+    //                                a valid PclZip object.
+    // Return Values :
+    //     1 on success.
+    //     0 or a negative value on error (error code).
+    // --------------------------------------------------------------------------------
+    public function duplicate($p_archive)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the $p_archive is a PclZip object
+        if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
+            // ----- Duplicate the archive
+            $v_result = $this->privDuplicate($p_archive->zipname);
+        } elseif (is_string($p_archive)) {
+            // ----- Look if the $p_archive is a string (so a filename)
+            // ----- Check that $p_archive is a valid zip file
+            // TBC : Should also check the archive format
+            if (!is_file($p_archive)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+                $v_result = PCLZIP_ERR_MISSING_FILE;
+            } else {
+                // ----- Duplicate the archive
+                $v_result = $this->privDuplicate($p_archive);
+            }
+        } else {
+            // ----- Invalid variable
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : merge()
+    // Description :
+    //     This method merge the $p_archive_to_add archive at the end of the current
+    //     one ($this).
+    //     If the archive ($this) does not exist, the merge becomes a duplicate.
+    //     If the $p_archive_to_add archive does not exist, the merge is a success.
+    // Parameters :
+    //     $p_archive_to_add : It can be directly the filename of a valid zip archive,
+    //                                             or a PclZip object archive.
+    // Return Values :
+    //     1 on success,
+    //     0 or negative values on error (see below).
+    // --------------------------------------------------------------------------------
+    public function merge($p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return(0);
+        }
+
+        // ----- Look if the $p_archive_to_add is a PclZip object
+        if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
+            // ----- Merge the archive
+            $v_result = $this->privMerge($p_archive_to_add);
+        } elseif (is_string($p_archive_to_add)) {
+            // ----- Look if the $p_archive_to_add is a string (so a filename)
+            // ----- Create a temporary archive
+            $v_object_archive = new PclZip($p_archive_to_add);
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($v_object_archive);
+        } else {
+            // ----- Invalid variable
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+
+
+    // --------------------------------------------------------------------------------
+    // Function : errorCode()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorCode()
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return(PclErrorCode());
+        } else {
+            return($this->error_code);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorName()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorName($p_with_code = false)
+    {
+        $v_name = array(
+            PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+            PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+            PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+            PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+            PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+            PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+            PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+            PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+            PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+            PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+            PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+            PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+            PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+            PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+            PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+            PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+            PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+            PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+            PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
+            PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
+            PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION',
+        );
+
+        if (isset($v_name[$this->error_code])) {
+            $v_value = $v_name[$this->error_code];
+        } else {
+            $v_value = 'NoName';
+        }
+
+        if ($p_with_code) {
+            return($v_value.' ('.$this->error_code.')');
+        } else {
+            return($v_value);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorInfo()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorInfo($p_full = false)
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return(PclErrorString());
+        } else {
+            if ($p_full) {
+                return($this->errorName(true)." : ".$this->error_string);
+            } else {
+                return($this->error_string." [code ".$this->error_code."]");
+            }
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+
+    // --------------------------------------------------------------------------------
+    // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+    // *****                                                                                                                *****
+    // *****             THESES FUNCTIONS MUST NOT BE USED DIRECTLY             *****
+    // --------------------------------------------------------------------------------
+
+
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFormat()
+    // Description :
+    //     This method check that the archive exists and is a valid zip archive.
+    //     Several level of check exists. (futur)
+    // Parameters :
+    //     $p_level : Level of check. Default 0.
+    //                            0 : Check the first bytes (magic codes) (default value))
+    //                            1 : 0 + Check the central directory (futur)
+    //                            2 : 1 + Check each file header (futur)
+    // Return Values :
+    //     true on success,
+    //     false on error, the error code is set.
+    // --------------------------------------------------------------------------------
+    public function privCheckFormat($p_level = 0)
+    {
+        $v_result = true;
+
+        // ----- Reset the file system cache
+        clearstatcache();
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the file exits
+        if (!is_file($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+            return(false);
+        }
+
+        // ----- Check that the file is readeable
+        if (!is_readable($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+            return(false);
+        }
+
+        // ----- Check the magic code
+        // TBC
+
+        // ----- Check the central header
+        // TBC
+
+        // ----- Check each file header
+        // TBC
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privParseOptions()
+    // Description :
+    //     This internal methods reads the variable list of arguments ($p_options_list,
+    //     $p_size) and generate an array with the options and values ($v_result_list).
+    //     $v_requested_options contains the options that can be present and those that
+    //     must be present.
+    //     $v_requested_options is an array, with the option value as key, and 'optional',
+    //     or 'mandatory' as value.
+    // Parameters :
+    //     See above.
+    // Return Values :
+    //     1 on success.
+    //     0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
+    {
+        $v_result=1;
+
+        // ----- Read the options
+        $i=0;
+        while ($i<$p_size) {
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$p_options_list[$i]])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Look for next option
+            switch ($p_options_list[$i]) {
+                // ----- Look for options that request a path value
+                case PCLZIP_OPT_PATH:
+                case PCLZIP_OPT_REMOVE_PATH:
+                case PCLZIP_OPT_ADD_PATH:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check the value
+                    $v_value = $p_options_list[$i+1];
+                    if ((!is_integer($v_value)) || ($v_value<0)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value (and convert it in bytes)
+                    $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_ON:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_OFF:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+                        return PclZip::errorCode();
+                    }
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+                        return PclZip::errorCode();
+                    }
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i+1]) && ($p_options_list[$i+1] != '')) {
+                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
+                        $i++;
+                    } else {
+                    }
+                    break;
+                // ----- Look for options that request an array of string for value
+                case PCLZIP_OPT_BY_NAME:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i+1])) {
+                            $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+                    } elseif (is_array($p_options_list[$i+1])) {
+                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+                // ----- Look for options that request an EREG or PREG expression
+                case PCLZIP_OPT_BY_EREG:
+                    // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+                    // to PCLZIP_OPT_BY_PREG
+                    $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+                case PCLZIP_OPT_BY_PREG:
+                //case PCLZIP_OPT_CRYPT :
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i+1])) {
+                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_OPT_COMMENT:
+                case PCLZIP_OPT_ADD_COMMENT:
+                case PCLZIP_OPT_PREPEND_COMMENT:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i+1])) {
+                            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" .PclZipUtilOptionText($p_options_list[$i]) ."'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an array of index
+                case PCLZIP_OPT_BY_INDEX:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_work_list = array();
+                    if (is_string($p_options_list[$i+1])) {
+                        // ----- Remove spaces
+                        $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+
+                        // ----- Parse items
+                        $v_work_list = explode(",", $p_options_list[$i+1]);
+                    } elseif (is_integer($p_options_list[$i+1])) {
+                            $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+                    } elseif (is_array($p_options_list[$i+1])) {
+                            $v_work_list = $p_options_list[$i+1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Reduce the index list
+                    // each index item in the list must be a couple with a start and
+                    // an end value : [0,3], [5-5], [8-10], ...
+                    // ----- Check the format of each item
+                    $v_sort_flag=false;
+                    $v_sort_value=0;
+                    for ($j=0; $j<sizeof($v_work_list); $j++) {
+                        // ----- Explode the item
+                        $v_item_list = explode("-", $v_work_list[$j]);
+                        $v_size_item_list = sizeof($v_item_list);
+
+                        // ----- TBC : Here we might check that each item is a
+                        // real integer ...
+
+                        // ----- Look for single value
+                        if ($v_size_item_list == 1) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
+                        } elseif ($v_size_item_list == 2) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
+                        } else {
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+
+
+                        // ----- Look for list sort
+                        if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                            $v_sort_flag=true;
+
+                            // ----- TBC : An automatic sort should be writen ...
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+                        $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+                    }
+
+                    // ----- Sort the items
+                    if ($v_sort_flag) {
+                        // TBC : To Be Completed
+                    }
+                    // ----- Next option
+                    $i++;
+                    break;
+                // ----- Look for options that request no value
+                case PCLZIP_OPT_REMOVE_ALL_PATH:
+                case PCLZIP_OPT_EXTRACT_AS_STRING:
+                case PCLZIP_OPT_NO_COMPRESSION:
+                case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
+                case PCLZIP_OPT_REPLACE_NEWER:
+                case PCLZIP_OPT_STOP_ON_ERROR:
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+                // ----- Look for options that request an octal value
+                case PCLZIP_OPT_SET_CHMOD:
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+                    $i++;
+                    break;
+
+                // ----- Look for options that request a call-back
+                case PCLZIP_CB_PRE_EXTRACT:
+                case PCLZIP_CB_POST_EXTRACT:
+                case PCLZIP_CB_PRE_ADD:
+                case PCLZIP_CB_POST_ADD:
+                /* for futur use
+                case PCLZIP_CB_PRE_DELETE :
+                case PCLZIP_CB_POST_DELETE :
+                case PCLZIP_CB_PRE_LIST :
+                case PCLZIP_CB_POST_LIST :
+                */
+                    // ----- Check the number of parameters
+                    if (($i+1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_function_name = $p_options_list[$i+1];
+
+                    // ----- Check that the value is a valid existing function
+                    if (!function_exists($v_function_name)) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Set the attribute
+                    $v_result_list[$p_options_list[$i]] = $v_function_name;
+                    $i++;
+                    break;
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" .$p_options_list[$i]."'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Next options
+            $i++;
+        }
+
+        // ----- Look for mandatory options
+        if ($v_requested_options !== false) {
+            for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+                // ----- Look for mandatory option
+                if ($v_requested_options[$key] == 'mandatory') {
+                    // ----- Look if present
+                    if (!isset($v_result_list[$key])) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                }
+            }
+        }
+
+        // ----- Look for default values
+        if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOptionDefaultThreshold()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privOptionDefaultThreshold(&$p_options)
+    {
+        $v_result=1;
+
+        if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            return $v_result;
+        }
+
+        // ----- Get 'memory_limit' configuration value
+        $v_memory_limit = ini_get('memory_limit');
+        $v_memory_limit = trim($v_memory_limit);
+        $last = strtolower(substr($v_memory_limit, -1));
+
+        if ($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+            $v_memory_limit = $v_memory_limit*1073741824;
+        }
+        if ($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
+            $v_memory_limit = $v_memory_limit*1048576;
+        }
+        if ($last == 'k') {
+            $v_memory_limit = $v_memory_limit*1024;
+        }
+
+        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+
+        // ----- Sanity check : No threshold if value lower than 1M
+        if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+            unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrParseAtt()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //     1 on success.
+    //     0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
+    {
+        $v_result=1;
+
+        // ----- For each file in the list check the attributes
+        foreach ($p_file_list as $v_key => $v_value) {
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$v_key])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Look for attribute
+            switch ($v_key) {
+                case PCLZIP_ATT_FILE_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['filename'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+                    break;
+                case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_short_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+                    break;
+                case PCLZIP_ATT_FILE_NEW_FULL_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_full_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+                    break;
+                // ----- Look for options that takes a string
+                case PCLZIP_ATT_FILE_COMMENT:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+                    $p_filedescr['comment'] = $v_value;
+                    break;
+                case PCLZIP_ATT_FILE_MTIME:
+                    if (!is_integer($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+                        return PclZip::errorCode();
+                    }
+                    $p_filedescr['mtime'] = $v_value;
+                    break;
+                case PCLZIP_ATT_FILE_CONTENT:
+                    $p_filedescr['content'] = $v_value;
+                    break;
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '".$v_key."'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Look for mandatory options
+            if ($v_requested_options !== false) {
+                for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                    // ----- Look for mandatory option
+                    if ($v_requested_options[$key] == 'mandatory') {
+                        // ----- Look if present
+                        if (!isset($p_file_list[$key])) {
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+                            return PclZip::errorCode();
+                        }
+                    }
+                }
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrExpand()
+    // Description :
+    //     This method look for each item of the list to see if its a file, a folder
+    //     or a string to be added as file. For any other type of files (link, other)
+    //     just ignore the item.
+    //     Then prepare the information that will be stored for that file.
+    //     When its a folder, expand the folder with all the files that are in that
+    //     folder (recursively).
+    // Parameters :
+    // Return Values :
+    //     1 on success.
+    //     0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Create a result list
+        $v_result_list = array();
+
+        // ----- Look each entry
+        for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+            // ----- Get filedescr
+            $v_descr = $p_filedescr_list[$i];
+
+            // ----- Reduce the filename
+            $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+            $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+            // ----- Look for real file or folder
+            if (file_exists($v_descr['filename'])) {
+                if (@is_file($v_descr['filename'])) {
+                    $v_descr['type'] = 'file';
+                } elseif (@is_dir($v_descr['filename'])) {
+                    $v_descr['type'] = 'folder';
+                } elseif (@is_link($v_descr['filename'])) {
+                    // skip
+                    continue;
+                } else {
+                    // skip
+                    continue;
+                }
+            } elseif (isset($v_descr['content'])) {
+                // ----- Look for string added as file
+                $v_descr['type'] = 'virtual_file';
+            } else {
+                // ----- Missing file
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Calculate the stored filename
+            $this->privCalculateStoredFilename($v_descr, $p_options);
+
+            // ----- Add the descriptor in result list
+            $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+            // ----- Look for folder
+            if ($v_descr['type'] == 'folder') {
+                // ----- List of items in folder
+                $v_dirlist_descr = array();
+                $v_dirlist_nb = 0;
+                if ($v_folder_handler = @opendir($v_descr['filename'])) {
+                    while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+                        // ----- Skip '.' and '..'
+                        if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                                continue;
+                        }
+
+                        // ----- Compose the full filename
+                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+
+                        // ----- Look for different stored filename
+                        // Because the name of the folder was changed, the name of the
+                        // files/sub-folders also change
+                        if (($v_descr['stored_filename'] != $v_descr['filename'])
+                                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                            if ($v_descr['stored_filename'] != '') {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+                            } else {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+                            }
+                        }
+                        $v_dirlist_nb++;
+                    }
+
+                    @closedir($v_folder_handler);
+                } else {
+                    // TBC : unable to open folder in read mode
+                }
+
+                // ----- Expand each element of the list
+                if ($v_dirlist_nb != 0) {
+                    // ----- Expand
+                    if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+                        return $v_result;
+                    }
+
+                    // ----- Concat the resulting list
+                    $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+                }
+
+                // ----- Free local array
+                unset($v_dirlist_descr);
+            }
+        }
+
+        // ----- Get the result list
+        $p_filedescr_list = $v_result_list;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCreate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the file in write mode
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Add the list of files
+        $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAdd()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        // ----- Look if the archive exists or is empty
+        if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
+            // ----- Do a create
+            $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+            // ----- Return
+            return $v_result;
+        }
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($v_result=$this->privOpenFd('rb')) != 1) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive
+        $v_swap = $this->zip_fd;
+        $this->zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->privCloseFd();
+            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Create the Central Dir files header
+        for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    fclose($v_zip_temp_fd);
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = $v_central_dir['comment'];
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+            $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd)-$v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap = $this->zip_fd;
+        $this->zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOpenFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privOpenFd($p_mode)
+    {
+        $v_result=1;
+
+        // ----- Look if already open
+        if ($this->zip_fd != 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCloseFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privCloseFd()
+    {
+        $v_result=1;
+
+        if ($this->zip_fd != 0) {
+            @fclose($this->zip_fd);
+        }
+        $this->zip_fd = 0;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddList()
+    // Description :
+    //     $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //     different from the real path of the file. This is usefull if you want to have PclTar
+    //     running in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //     $p_list : An array containing the file or directory names to add in the tar
+    //     $p_result_list : list of added files with their properties (specially the status field)
+    //     $p_add_dir : Path to add in the filename path archived
+    //     $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    //    public function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+    public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Create the Central Dir files header
+        for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = '';
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd)-$v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileList()
+    // Description :
+    // Parameters :
+    //     $p_filedescr_list : An array containing the file description
+    //                                            or directory names to add in the zip
+    //     $p_result_list : list of added files with their properties (specially the status field)
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result=1;
+        $v_header = array();
+
+        // ----- Recuperate the current number of elt in list
+        $v_nb = sizeof($p_result_list);
+
+        // ----- Loop on the files
+        for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+            // ----- Format the filename
+            $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+            // ----- Skip empty file names
+            // TBC : Can this be possible ? not checked in DescrParseAtt ?
+            if ($p_filedescr_list[$j]['filename'] == "") {
+                continue;
+            }
+
+            // ----- Check the filename
+            if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+                return PclZip::errorCode();
+            }
+
+            // ----- Look if it is a file or a dir with no all path remove option
+            // or a dir with all its path removed
+    //            if (    (is_file($p_filedescr_list[$j]['filename']))
+    //                    || (    is_dir($p_filedescr_list[$j]['filename'])
+            if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                // ----- Add the file
+                $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
+                if ($v_result != 1) {
+                    return $v_result;
+                }
+
+                // ----- Store the file infos
+                $p_result_list[$v_nb++] = $v_header;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // TBC : Already done in the fileAtt check ... ?
+        if ($p_filename == "") {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Look for a stored different filename
+        /* TBC : Removed
+        if (isset($p_filedescr['stored_filename'])) {
+            $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        else {
+            $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        */
+
+        // ----- Set the file properties
+        clearstatcache();
+        $p_header['version'] = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag'] = 0;
+        $p_header['compression'] = 0;
+        $p_header['crc'] = 0;
+        $p_header['compressed_size'] = 0;
+        $p_header['filename_len'] = strlen($p_filename);
+        $p_header['extra_len'] = 0;
+        $p_header['disk'] = 0;
+        $p_header['internal'] = 0;
+        $p_header['offset'] = 0;
+        $p_header['filename'] = $p_filename;
+    // TBC : Removed        $p_header['stored_filename'] = $v_stored_filename;
+        $p_header['stored_filename'] = $p_filedescr['stored_filename'];
+        $p_header['extra'] = '';
+        $p_header['status'] = 'ok';
+        $p_header['index'] = -1;
+
+        // ----- Look for regular file
+        if ($p_filedescr['type']=='file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size'] = filesize($p_filename);
+        } elseif ($p_filedescr['type']=='folder') {
+            // ----- Look for regular folder
+            $p_header['external'] = 0x00000010;
+            $p_header['mtime'] = filemtime($p_filename);
+            $p_header['size'] = filesize($p_filename);
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            // ----- Look for virtual file
+            $p_header['external'] = 0x00000000;
+            $p_header['size'] = strlen($p_filedescr['content']);
+        }
+
+        // ----- Look for filetime
+        if (isset($p_filedescr['mtime'])) {
+            $p_header['mtime'] = $p_filedescr['mtime'];
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['mtime'] = time();
+        } else {
+            $p_header['mtime'] = filemtime($p_filename);
+        }
+
+        // ------ Look for file comment
+        if (isset($p_filedescr['comment'])) {
+            $p_header['comment_len'] = strlen($p_filedescr['comment']);
+            $p_header['comment'] = $p_filedescr['comment'];
+        } else {
+            $p_header['comment_len'] = 0;
+            $p_header['comment'] = '';
+        }
+
+        // ----- Look for pre-add callback
+        if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_header['status'] = "skipped";
+                $v_result = 1;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+                $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+            }
+        }
+
+        // ----- Look for empty stored filename
+        if ($p_header['stored_filename'] == "") {
+            $p_header['status'] = "filtered";
+        }
+
+        // ----- Check the path length
+        if (strlen($p_header['stored_filename']) > 0xFF) {
+            $p_header['status'] = 'filename_too_long';
+        }
+
+        // ----- Look if no error, or file not skipped
+        if ($p_header['status'] == 'ok') {
+            // ----- Look for a file
+            if ($p_filedescr['type'] == 'file') {
+                // ----- Look for using temporary file to zip
+                if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
+                    $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+                    if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                        return $v_result;
+                    }
+                } else {
+                    // ----- Use "in memory" zip algo
+                    // ----- Open the source file
+                    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+                        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Read the file content
+                    $v_content = @fread($v_file, $p_header['size']);
+
+                    // ----- Close the file
+                    @fclose($v_file);
+
+                    // ----- Calculate the CRC
+                    $p_header['crc'] = @crc32($v_content);
+
+                    // ----- Look for no compression
+                    if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = $p_header['size'];
+                        $p_header['compression'] = 0;
+                    } else {
+                        // ----- Look for normal compression
+                        // ----- Compress the content
+                        $v_content = @gzdeflate($v_content);
+
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = strlen($v_content);
+                        $p_header['compression'] = 8;
+                    }
+
+                    // ----- Call the header generation
+                    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                        @fclose($v_file);
+                        return $v_result;
+                    }
+
+                    // ----- Write the compressed (or not) content
+                    @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+                }
+            } elseif ($p_filedescr['type'] == 'virtual_file') {
+                // ----- Look for a virtual file (a file from string)
+                $v_content = $p_filedescr['content'];
+
+                // ----- Calculate the CRC
+                $p_header['crc'] = @crc32($v_content);
+
+                // ----- Look for no compression
+                if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = $p_header['size'];
+                    $p_header['compression'] = 0;
+                } else {
+                    // ----- Look for normal compression
+                    // ----- Compress the content
+                    $v_content = @gzdeflate($v_content);
+
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = strlen($v_content);
+                    $p_header['compression'] = 8;
+                }
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    @fclose($v_file);
+                    return $v_result;
+                }
+
+                // ----- Write the compressed (or not) content
+                @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+            } elseif ($p_filedescr['type'] == 'folder') {
+                // ----- Look for a directory
+                // ----- Look for directory last '/'
+                if (@substr($p_header['stored_filename'], -1) != '/') {
+                    $p_header['stored_filename'] .= '/';
+                }
+
+                // ----- Set the file properties
+                $p_header['size'] = 0;
+                //$p_header['external'] = 0x41FF0010;     // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010;     // Value for a folder : to be checked
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Look for post-add callback
+        if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Ignored
+                $v_result = 1;
+            }
+
+            // ----- Update the informations
+            // Nothing can be modified
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result=PCLZIP_ERR_NO_ERROR;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+            return PclZip::errorCode();
+        }
+
+        // ----- Creates a compressed temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+        if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = filesize($p_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($v_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file);
+        @gzclose($v_file_compressed);
+
+        // ----- Check the minimum file size
+        if (filesize($v_gzip_temp_name) < 18) {
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the compressed attributes
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the gzip file header
+        $v_binary_data = @fread($v_file_compressed, 10);
+        $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+        // ----- Check some parameters
+        $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+        // ----- Read the gzip file footer
+        @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+        $v_binary_data = @fread($v_file_compressed, 8);
+        $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+        // ----- Set the attributes
+        $p_header['compression'] = ord($v_data_header['cm']);
+        //$p_header['mtime'] = $v_data_header['mtime'];
+        $p_header['crc'] = $v_data_footer['crc'];
+        $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Add the compressed data
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        fseek($v_file_compressed, 10);
+        $v_size = $p_header['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($v_file_compressed, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Unlink the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCalculateStoredFilename()
+    // Description :
+    //     Based on file descriptor properties and global options, this method
+    //     calculate the filename that will be stored in the archive.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Working variables
+        $p_filename = $p_filedescr['filename'];
+        if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+            $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+        } else {
+            $p_add_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+            $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+        } else {
+            $p_remove_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+            $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        } else {
+            $p_remove_all_dir = 0;
+        }
+
+        // ----- Look for full name change
+        if (isset($p_filedescr['new_full_name'])) {
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+        } else {
+            // ----- Look for path and/or short name change
+            // ----- Look for short name change
+            // Its when we cahnge just the filename but not the path
+            if (isset($p_filedescr['new_short_name'])) {
+                $v_path_info = pathinfo($p_filename);
+                $v_dir = '';
+                if ($v_path_info['dirname'] != '') {
+                    $v_dir = $v_path_info['dirname'].'/';
+                }
+                $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+            } else {
+                // ----- Calculate the stored filename
+                $v_stored_filename = $p_filename;
+            }
+
+            // ----- Look for all path to remove
+            if ($p_remove_all_dir) {
+                $v_stored_filename = basename($p_filename);
+            } elseif ($p_remove_dir != "") {
+                // ----- Look for partial path remove
+                if (substr($p_remove_dir, -1) != '/') {
+                    $p_remove_dir .= "/";
+                }
+
+                if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
+                    if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
+                        $p_remove_dir = "./".$p_remove_dir;
+                    }
+                    if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
+                        $p_remove_dir = substr($p_remove_dir, 2);
+                    }
+                }
+
+                $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
+                if ($v_compare > 0) {
+                    if ($v_compare == 2) {
+                        $v_stored_filename = "";
+                    } else {
+                        $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
+                    }
+                }
+            }
+
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+
+            // ----- Look for path to add
+            if ($p_add_dir != "") {
+                if (substr($p_add_dir, -1) == "/") {
+                    $v_stored_filename = $p_add_dir.$v_stored_filename;
+                } else {
+                    $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+                }
+            }
+        }
+
+        // ----- Filename (reduce the path of stored name)
+        $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
+        $p_filedescr['stored_filename'] = $v_stored_filename;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteFileHeader(&$p_header)
+    {
+        $v_result=1;
+
+        // ----- Store the offset position of the file
+        $p_header['offset'] = ftell($this->zip_fd);
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+        $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
+
+        // ----- Write the first 148 bytes of the header in the archive
+        fputs($this->zip_fd, $v_binary_data, 30);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralFileHeader(&$p_header)
+    {
+        $v_result=1;
+
+        // TBC
+        //for(reset($p_header); $key = key($p_header); next($p_header)) {
+        //}
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+        $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+
+        // ----- Write the 42 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 46);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+    {
+        $v_result = 1;
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
+
+        // ----- Write the 22 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 22);
+
+        // ----- Write the variable fields
+        if (strlen($p_comment) != 0) {
+            fputs($this->zip_fd, $p_comment, strlen($p_comment));
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privList()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privList(&$p_list)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privSwapBackMagicQuotes();
+            return $v_result;
+        }
+
+        // ----- Go to beginning of Central Dir
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        for ($i=0; $i<$v_central_dir['entries']; $i++) {
+            // ----- Read the file header
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                $this->privSwapBackMagicQuotes();
+                return $v_result;
+            }
+            $v_header['index'] = $i;
+
+            // ----- Get the only interesting attributes
+            $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+            unset($v_header);
+        }
+
+        // ----- Close the zip file
+        $this->privCloseFd();
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privConvertHeader2FileInfo()
+    // Description :
+    //     This function takes the file informations from the central directory
+    //     entries and extract the interesting parameters that will be given back.
+    //     The resulting file infos are set in the array $p_info
+    //         $p_info['filename'] : Filename with full path. Given by user (add),
+    //                                                     extracted in the filesystem (extract).
+    //         $p_info['stored_filename'] : Stored filename in the archive.
+    //         $p_info['size'] = Size of the file.
+    //         $p_info['compressed_size'] = Compressed size of the file.
+    //         $p_info['mtime'] = Last modification date of the file.
+    //         $p_info['comment'] = Comment associated with the file.
+    //         $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+    //         $p_info['status'] = status of the action on the file.
+    //         $p_info['crc'] = CRC of the file content.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privConvertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result=1;
+
+        // ----- Get the interesting attributes
+        $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
+        $p_info['filename'] = $v_temp_path;
+        $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
+        $p_info['stored_filename'] = $v_temp_path;
+        $p_info['size'] = $p_header['size'];
+        $p_info['compressed_size'] = $p_header['compressed_size'];
+        $p_info['mtime'] = $p_header['mtime'];
+        $p_info['comment'] = $p_header['comment'];
+        $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+        $p_info['index'] = $p_header['index'];
+        $p_info['status'] = $p_header['status'];
+        $p_info['crc'] = $p_header['crc'];
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractByRule()
+    // Description :
+    //     Extract a file or directory depending of rules (by index, by name, ...)
+    // Parameters :
+    //     $p_file_list : An array where will be placed the properties of each
+    //                                    extracted file
+    //     $p_path : Path to add while writing the extracted files
+    //     $p_remove_path : Path to remove (from the file memorized path) while writing the
+    //                                        extracted files. If the path does not match the file path,
+    //                                        the file is extracted with its memorized path.
+    //                                        $p_remove_path does not apply to 'list' mode.
+    //                                        $p_path and $p_remove_path are commulative.
+    // Return Values :
+    //     1 on success,0 or less on error (see error code list)
+    // --------------------------------------------------------------------------------
+    public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check the path
+        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2)!=":/"))) {
+            $p_path = "./".$p_path;
+        }
+
+        // ----- Reduce the path last (and duplicated) '/'
+        if (($p_path != "./") && ($p_path != "/")) {
+            // ----- Look for the path end '/'
+            while (substr($p_path, -1) == "/") {
+                $p_path = substr($p_path, 0, strlen($p_path)-1);
+            }
+        }
+
+        // ----- Look for path to remove format (should end by /)
+        if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
+            $p_remove_path .= '/';
+        }
+        $p_remove_path_size = strlen($p_remove_path);
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            $this->privSwapBackMagicQuotes();
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+
+        // ----- Read each entry
+        $j_start = 0;
+        for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+            // ----- Read next Central dir entry
+            @rewind($this->zip_fd);
+            if (@fseek($this->zip_fd, $v_pos_entry)) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read the file header
+            $v_header = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header['index'] = $i;
+
+            // ----- Store the file position
+            $v_pos_entry = ftell($this->zip_fd);
+
+            // ----- Look for the specific extract rules
+            $v_extract = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+                // ----- Look if the filename is in the list
+                for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_extract = true;
+                        }
+                    } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        // ----- Look for a filename
+                        $v_extract = true;
+                    }
+                }
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+                // ----- Look for extract by preg rule
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+                    $v_extract = true;
+                }
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+                // ----- Look for extract by index rule
+                // ----- Look if the index is in the list
+                for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+                    if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                            $v_extract = true;
+                    }
+                    if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                            $j_start = $j+1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                        break;
+                    }
+                }
+            } else {
+                // ----- Look for no rule, which means extract all the archive
+                $v_extract = true;
+            }
+
+            // ----- Check compression method
+            if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
+                $v_header['status'] = 'unsupported_compression';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '".$v_header['stored_filename']."' is compressed by an unsupported compression method (".$v_header['compression'].") ");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Check encrypted files
+            if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+                $v_header['status'] = 'unsupported_encryption';
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for  filename '".$v_header['stored_filename']."'");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Look for real extraction
+            if (($v_extract) && ($v_header['status'] != 'ok')) {
+                $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
+                if ($v_result != 1) {
+                    $this->privCloseFd();
+                    $this->privSwapBackMagicQuotes();
+                    return $v_result;
+                }
+
+                $v_extract = false;
+            }
+
+            // ----- Look for real extraction
+            if ($v_extract) {
+                // ----- Go to the file position
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Look for extraction as string
+                if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+                    $v_string = '';
+
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Set the file content
+                    $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+                    // ----- Next extracted file
+                    $v_nb_extracted++;
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+                    // ----- Look for extraction in standard output
+                    // ----- Extracting the file in standard output
+                    $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                } else {
+                    // ----- Look for normal extraction
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //
+    // 1 : ... ?
+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+    // --------------------------------------------------------------------------------
+    public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for all path to remove
+        if ($p_remove_all_path == true) {
+            // ----- Look for folder entry that not need to be extracted
+            if (($p_entry['external']&0x00000010)==0x00000010) {
+                $p_entry['status'] = "filtered";
+
+                return $v_result;
+            }
+
+            // ----- Get the basename of the path
+            $p_entry['filename'] = basename($p_entry['filename']);
+        } elseif ($p_remove_path != "") {
+            // ----- Look for path to remove
+            if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+                // ----- Change the file status
+                $p_entry['status'] = "filtered";
+
+                // ----- Return
+                return $v_result;
+            }
+
+            $p_remove_path_size = strlen($p_remove_path);
+            if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
+                // ----- Remove the path
+                $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+            }
+        }
+
+        // ----- Add the path
+        if ($p_path != '') {
+            $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+        }
+
+        // ----- Check a base_dir_restriction
+        if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+            $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
+            if ($v_inclusion == 0) {
+                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '".$p_entry['filename']."' is outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+            // ----- Look for specific actions while the file exist
+            if (file_exists($p_entry['filename'])) {
+                // ----- Look if file is a directory
+                if (is_dir($p_entry['filename'])) {
+                    // ----- Change the file status
+                    $p_entry['status'] = "already_a_directory";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '".$p_entry['filename']."' is already used by an existing directory");
+                        return PclZip::errorCode();
+                    }
+                } elseif (!is_writeable($p_entry['filename'])) {
+                    // ----- Look if file is write protected
+                    // ----- Change the file status
+                    $p_entry['status'] = "write_protected";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '".$p_entry['filename']."' exists and is write protected");
+                        return PclZip::errorCode();
+                    }
+                } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+                    // ----- Look if the extracted file is older
+                    // ----- Change the file status
+                    if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
+                    } else {
+                        $p_entry['status'] = "newer_exist";
+
+                        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                        // For historical reason first PclZip implementation does not stop
+                        // when this kind of error occurs.
+                        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '".$p_entry['filename']."' exists and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+                            return PclZip::errorCode();
+                        }
+                    }
+                } else {
+                }
+            } else {
+                // ----- Check the directory availability and create it if necessary
+                if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+                    $v_dir_to_check = $p_entry['filename'];
+                } elseif (!strstr($p_entry['filename'], "/")) {
+                    $v_dir_to_check = "";
+                } else {
+                    $v_dir_to_check = dirname($p_entry['filename']);
+                }
+
+                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+                    // ----- Change the file status
+                    $p_entry['status'] = "path_creation_fail";
+
+                    // ----- Return
+                    //return $v_result;
+                    $v_result = 1;
+                }
+            }
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external']&0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compression'] == 0) {
+                    // ----- Opening destination file
+                    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+                        // ----- Change the file status
+                        $p_entry['status'] = "write_error";
+
+                        // ----- Return
+                        return $v_result;
+                    }
+
+                    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+                    $v_size = $p_entry['compressed_size'];
+                    while ($v_size != 0) {
+                        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+                        $v_buffer = @fread($this->zip_fd, $v_read_size);
+                        /* Try to speed up the code
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+                        */
+                        @fwrite($v_dest_file, $v_buffer, $v_read_size);
+                        $v_size -= $v_read_size;
+                    }
+
+                    // ----- Closing the destination file
+                    fclose($v_dest_file);
+
+                    // ----- Change the file mtime
+                    touch($p_entry['filename'], $p_entry['mtime']);
+                } else {
+                    // ----- TBC
+                    // Need to be finished
+                    if (($p_entry['flag'] & 1) == 1) {
+                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Look for using temporary file to unzip
+                    if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
+                        $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+                        if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                            return $v_result;
+                        }
+                    } else {
+                        // ----- Look for extract in memory
+                        // ----- Read the compressed file in a buffer (one shot)
+                        $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                        // ----- Decompress the file
+                        $v_file_content = @gzinflate($v_buffer);
+                        unset($v_buffer);
+                        if ($v_file_content === false) {
+                            // ----- Change the file status
+                            // TBC
+                            $p_entry['status'] = "error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Opening destination file
+                        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+                            // ----- Change the file status
+                            $p_entry['status'] = "write_error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Write the uncompressed data
+                        @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+                        unset($v_file_content);
+
+                        // ----- Closing the destination file
+                        @fclose($v_dest_file);
+                    }
+
+                    // ----- Change the file mtime
+                    @touch($p_entry['filename'], $p_entry['mtime']);
+                }
+
+                // ----- Look for chmod option
+                if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+                    // ----- Change the mode of the file
+                    @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+                }
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+            // ----- Look for post-extract callback
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                    $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Creates a temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+        if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+            return PclZip::errorCode();
+        }
+
+        // ----- Write gz file format header
+        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+        @fwrite($v_dest_file, $v_binary_data, 10);
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($this->zip_fd, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Write gz file format footer
+        $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+        @fwrite($v_dest_file, $v_binary_data, 8);
+
+        // ----- Close the temporary file
+        @fclose($v_dest_file);
+
+        // ----- Opening destination file
+        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            $p_entry['status'] = "write_error";
+            return $v_result;
+        }
+
+        // ----- Open the temporary gz file
+        if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+            @fclose($v_dest_file);
+            $p_entry['status'] = "read_error";
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @gzread($v_src_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+        @fclose($v_dest_file);
+        @gzclose($v_src_file);
+
+        // ----- Delete the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileInOutput()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileInOutput(&$p_entry, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                    $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Trace
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compressed_size'] == $p_entry['size']) {
+                    // ----- Read the file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Send the file to the output
+                    echo $v_buffer;
+                    unset($v_buffer);
+                } else {
+                    // ----- Read the compressed file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    $v_file_content = gzinflate($v_buffer);
+                    unset($v_buffer);
+
+                    // ----- Send the file to the output
+                    echo $v_file_content;
+                    unset($v_file_content);
+                }
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+            // ----- Look for post-extract callback
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                    $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+    {
+        $v_result=1;
+
+        // ----- Read the file header
+        $v_header = array();
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                    $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+                // ----- Look for not compressed file
+    //            if ($p_entry['compressed_size'] == $p_entry['size'])
+                if ($p_entry['compression'] == 0) {
+                    // ----- Reading the file
+                    $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+                } else {
+                    // ----- Reading the file
+                    $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    if (($p_string = @gzinflate($v_data)) === false) {
+                        // TBC
+                    }
+                }
+                // ----- Trace
+            } else {
+                    // TBC : error : can not extract a folder in a string
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+            // ----- Look for post-extract callback
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Swap the content to header
+            $v_local_header['content'] = $p_string;
+            $p_string = '';
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+    //            eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Swap back the content to header
+            $p_string = $v_local_header['content'];
+            unset($v_local_header['content']);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                    $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadFileHeader(&$p_header)
+    {
+        $v_result=1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x04034b50) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 26);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 26) {
+            $p_header['filename'] = "";
+            $p_header['status'] = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+        // ----- Get filename
+        $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+        // ----- Get extra_fields
+        if ($v_data['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Extract properties
+        $p_header['version_extracted'] = $v_data['version'];
+        $p_header['compression'] = $v_data['compression'];
+        $p_header['size'] = $v_data['size'];
+        $p_header['compressed_size'] = $v_data['compressed_size'];
+        $p_header['crc'] = $v_data['crc'];
+        $p_header['flag'] = $v_data['flag'];
+        $p_header['filename_len'] = $v_data['filename_len'];
+
+        // ----- Recuperate date in UNIX format
+        $p_header['mdate'] = $v_data['mdate'];
+        $p_header['mtime'] = $v_data['mtime'];
+        if ($p_header['mdate'] && $p_header['mtime']) {
+            // ----- Extract time
+            $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+            // ----- Extract date
+            $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // TBC
+        //for(reset($v_data); $key = key($v_data); next($v_data)) {
+        //}
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set the status field
+        $p_header['status'] = "ok";
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x02014b50) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 42);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 42) {
+            $p_header['filename'] = "";
+            $p_header['status'] = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+        // ----- Get filename
+        if ($p_header['filename_len'] != 0) {
+            $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+        } else {
+            $p_header['filename'] = '';
+        }
+
+        // ----- Get extra
+        if ($p_header['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Get comment
+        if ($p_header['comment_len'] != 0) {
+            $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+        } else {
+            $p_header['comment'] = '';
+        }
+
+        // ----- Extract properties
+
+        // ----- Recuperate date in UNIX format
+        //if ($p_header['mdate'] && $p_header['mtime'])
+        // TBC : bug : this was ignoring time with 0/0/0
+        if (1) {
+            // ----- Extract time
+            $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+            // ----- Extract date
+            $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set default status to ok
+        $p_header['status'] = 'ok';
+
+        // ----- Look if it is a directory
+        if (substr($p_header['filename'], -1) == '/') {
+            //$p_header['external'] = 0x41FF0010;
+            $p_header['external'] = 0x00000010;
+        }
+
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFileHeaders()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //     1 on success,
+    //     0 on error;
+    // --------------------------------------------------------------------------------
+    public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+    {
+        $v_result=1;
+
+        // ----- Check the static values
+        // TBC
+        if ($p_local_header['filename'] != $p_central_header['filename']) {
+        }
+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+        }
+        if ($p_local_header['flag'] != $p_central_header['flag']) {
+        }
+        if ($p_local_header['compression'] != $p_central_header['compression']) {
+        }
+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+        }
+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+        }
+
+        // ----- Look for flag bit 3
+        if (($p_local_header['flag'] & 8) == 8) {
+            $p_local_header['size'] = $p_central_header['size'];
+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+            $p_local_header['crc'] = $p_central_header['crc'];
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadEndCentralDir(&$p_central_dir)
+    {
+        $v_result=1;
+
+        // ----- Go to the end of the zip file
+        $v_size = filesize($this->zipname);
+        @fseek($this->zip_fd, $v_size);
+        if (@ftell($this->zip_fd) != $v_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- First try : look if this is an archive with no commentaries (most of the time)
+        // in this case the end of central dir is at 22 bytes of the file end
+        $v_found = 0;
+        if ($v_size > 26) {
+            @fseek($this->zip_fd, $v_size-22);
+            if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read for bytes
+            $v_binary_data = @fread($this->zip_fd, 4);
+            $v_data = @unpack('Vid', $v_binary_data);
+
+            // ----- Check signature
+            if ($v_data['id'] == 0x06054b50) {
+                $v_found = 1;
+            }
+
+            $v_pos = ftell($this->zip_fd);
+        }
+
+        // ----- Go back to the maximum possible size of the Central Dir End Record
+        if (!$v_found) {
+            $v_maximum_size = 65557; // 0xFFFF + 22;
+            if ($v_maximum_size > $v_size) {
+                $v_maximum_size = $v_size;
+            }
+            @fseek($this->zip_fd, $v_size-$v_maximum_size);
+            if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read byte per byte in order to find the signature
+            $v_pos = ftell($this->zip_fd);
+            $v_bytes = 0x00000000;
+            while ($v_pos < $v_size) {
+                // ----- Read a byte
+                $v_byte = @fread($this->zip_fd, 1);
+
+                // -----    Add the byte
+                //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+                // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+                // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+                // ----- Compare the bytes
+                if ($v_bytes == 0x504b0506) {
+                    $v_pos++;
+                    break;
+                }
+
+                $v_pos++;
+            }
+
+            // ----- Look if not found end of central dir
+            if ($v_pos == $v_size) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Read the first 18 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 18);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 18) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+        // ----- Check the global size
+        if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+            // ----- Removed in release 2.2 see readme file
+            // The check of the file size is a little too strict.
+            // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+            // While decrypted, zip has training 0 bytes
+            if (0) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive. Some trailing bytes exists after the archive.');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Get comment
+        if ($v_data['comment_size'] != 0) {
+            $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+        } else {
+            $p_central_dir['comment'] = '';
+        }
+
+        $p_central_dir['entries'] = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset'] = $v_data['offset'];
+        $p_central_dir['size'] = $v_data['size'];
+        $p_central_dir['disk'] = $v_data['disk'];
+        $p_central_dir['disk_start'] = $v_data['disk_start'];
+
+        // TBC
+        //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+        //}
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDeleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDeleteByRule(&$p_result_list, &$p_options)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        // ----- Open the zip file
+        if (($v_result=$this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Scan all the files
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_pos_entry)) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        $v_header_list = array();
+        $j_start = 0;
+        for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+            // ----- Read the file header
+            $v_header_list[$v_nb_extracted] = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+
+                return $v_result;
+            }
+
+
+            // ----- Store the index
+            $v_header_list[$v_nb_extracted]['index'] = $i;
+
+            // ----- Look for the specific extract rules
+            $v_found = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+                // ----- Look if the filename is in the list
+                for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        } elseif ((($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        }
+                    } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        // ----- Look for a filename
+                        $v_found = true;
+                    }
+                }
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+                // ----- Look for extract by preg rule
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                        $v_found = true;
+                }
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+                // ----- Look for extract by index rule
+                // ----- Look if the index is in the list
+                for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+                    if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_found = true;
+                    }
+                    if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j+1;
+                    }
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                        break;
+                    }
+                }
+            } else {
+                $v_found = true;
+            }
+
+            // ----- Look for deletion
+            if ($v_found) {
+                unset($v_header_list[$v_nb_extracted]);
+            } else {
+                $v_nb_extracted++;
+            }
+        }
+
+        // ----- Look if something need to be deleted
+        if ($v_nb_extracted > 0) {
+            // ----- Creates a temporay file
+            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+            // ----- Creates a temporary zip archive
+            $v_temp_zip = new PclZip($v_zip_temp_name);
+
+            // ----- Open the temporary zip file in write mode
+            if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+                $this->privCloseFd();
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Look which file need to be kept
+            for ($i=0; $i<sizeof($v_header_list); $i++) {
+                // ----- Calculate the position of the header
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Read the file header
+                $v_local_header = array();
+                if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Check that local file header is same as central file header
+                if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
+                    // TBC
+                }
+                unset($v_local_header);
+
+                // ----- Write the file header
+                if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Read/write the data block
+                if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+            }
+
+            // ----- Store the offset of the central dir
+            $v_offset = @ftell($v_temp_zip->zip_fd);
+
+            // ----- Re-Create the Central Dir files header
+            for ($i=0; $i<sizeof($v_header_list); $i++) {
+                // ----- Create the file header
+                if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    $v_temp_zip->privCloseFd();
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Transform the header to a 'usable' info
+                $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            }
+
+
+            // ----- Zip file comment
+            $v_comment = '';
+            if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+                $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            }
+
+            // ----- Calculate the size of the central header
+            $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+
+            // ----- Create the central dir footer
+            if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+                    // ----- Reset the file list
+                    unset($v_header_list);
+                    $v_temp_zip->privCloseFd();
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+            }
+
+            // ----- Close
+            $v_temp_zip->privCloseFd();
+            $this->privCloseFd();
+
+            // ----- Delete the zip file
+            // TBC : I should test the result ...
+            @unlink($this->zipname);
+
+            // ----- Rename the temporary file
+            // TBC : I should test the result ...
+            //@rename($v_zip_temp_name, $this->zipname);
+            PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+            // ----- Destroy the temporary archive
+            unset($v_temp_zip);
+        } elseif ($v_central_dir['entries'] != 0) {
+            // ----- Remove every files : reset the file
+            $this->privCloseFd();
+
+            if (($v_result = $this->privOpenFd('wb')) != 1) {
+                return $v_result;
+            }
+
+            if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+                return $v_result;
+            }
+
+            $this->privCloseFd();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDirCheck()
+    // Description :
+    //     Check if a directory exists, if not it creates it and all the parents directory
+    //     which may be useful.
+    // Parameters :
+    //     $p_dir : Directory path to check.
+    // Return Values :
+    //        1 : OK
+    //     -1 : Unable to create directory
+    // --------------------------------------------------------------------------------
+    public function privDirCheck($p_dir, $p_is_dir = false)
+    {
+        $v_result = 1;
+
+        // ----- Remove the final '/'
+        if (($p_is_dir) && (substr($p_dir, -1)=='/')) {
+            $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+        }
+
+        // ----- Check the directory availability
+        if ((is_dir($p_dir)) || ($p_dir == "")) {
+            return 1;
+        }
+
+        // ----- Extract parent directory
+        $p_parent_dir = dirname($p_dir);
+
+        // ----- Just a check
+        if ($p_parent_dir != $p_dir) {
+            // ----- Look for parent directory
+            if ($p_parent_dir != "") {
+                if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Create the directory
+        if (!@mkdir($p_dir, 0777)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privMerge()
+    // Description :
+    //     If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privMerge(&$p_archive_to_add)
+    {
+        $v_result=1;
+
+        // ----- Look if the archive_to_add exists
+        if (!is_file($p_archive_to_add->zipname)) {
+            // ----- Nothing to merge, so merge is a success
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Look if the archive exists
+        if (!is_file($this->zipname)) {
+            // ----- Do a duplicate
+            $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
+        if (($v_result=$this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Open the archive_to_add file
+        if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1) {
+            $this->privCloseFd();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir_to_add = array();
+        if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($p_archive_to_add->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the files from the archive_to_add into the temporary file
+        $v_size = $v_central_dir_to_add['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($v_zip_temp_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the block of file headers from the archive_to_add
+        $v_size = $v_central_dir_to_add['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Merge the file comments
+        $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+
+        // ----- Calculate the size of the (new) central header
+        $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive fd
+        $v_swap = $this->zip_fd;
+        $this->zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+            @fclose($v_zip_temp_fd);
+            $this->zip_fd = null;
+
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap = $this->zip_fd;
+        $this->zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Close
+        $this->privCloseFd();
+        $p_archive_to_add->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDuplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDuplicate($p_archive_filename)
+    {
+        $v_result=1;
+
+        // ----- Look if the $p_archive_filename exists
+        if (!is_file($p_archive_filename)) {
+            // ----- Nothing to duplicate, so duplicate is a success.
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
+        if (($v_result=$this->privOpenFd('wb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
+            $this->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = filesize($p_archive_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privErrorLog()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorLog($p_error_code = 0, $p_error_string = '')
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclError($p_error_code, $p_error_string);
+        } else {
+            $this->error_code = $p_error_code;
+            $this->error_string = $p_error_string;
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privErrorReset()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorReset()
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclErrorReset();
+        } else {
+            $this->error_code = 0;
+            $this->error_string = '';
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDisableMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDisableMagicQuotes()
+    {
+        $v_result=1;
+
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
+
+        // ----- Look if already done
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Get and memorize the magic_quote value
+        $this->magic_quotes_status = @get_magic_quotes_runtime();
+
+        // ----- Disable magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime(0);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privSwapBackMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privSwapBackMagicQuotes()
+    {
+        $v_result=1;
+
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
+
+        // ----- Look if something to do
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Swap back magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime($this->magic_quotes_status);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+}
+// End of class
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathReduction()
+// Description :
+// Parameters :
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilPathReduction($p_dir)
+{
+    $v_result = "";
+
+    // ----- Look for not empty path
+    if ($p_dir != "") {
+        // ----- Explode path by directory names
+        $v_list = explode("/", $p_dir);
+
+        // ----- Study directories from last to first
+        $v_skip = 0;
+        for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+            // ----- Look for current path
+            if ($v_list[$i] == ".") {
+                // ----- Ignore this directory
+                // Should be the first $i=0, but no check is done
+            } elseif ($v_list[$i] == "..") {
+                $v_skip++;
+            } elseif ($v_list[$i] == "") {
+                // ----- First '/' i.e. root slash
+                if ($i == 0) {
+                    $v_result = "/".$v_result;
+                    if ($v_skip > 0) {
+                        // ----- It is an invalid path, so the path is not modified
+                        // TBC
+                        $v_result = $p_dir;
+                        $v_skip = 0;
+                    }
+                } elseif ($i == (sizeof($v_list)-1)) {
+                    // ----- Last '/' i.e. indicates a directory
+                    $v_result = $v_list[$i];
+                } else {
+                    // ----- Double '/' inside the path
+                    // ----- Ignore only the double '//' in path,
+                    // but not the first and last '/'
+                }
+            } else {
+                // ----- Look for item to skip
+                if ($v_skip > 0) {
+                    $v_skip--;
+                } else {
+                    $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+                }
+            }
+        }
+
+        // ----- Look for skip
+        if ($v_skip > 0) {
+            while ($v_skip > 0) {
+                $v_result = '../'.$v_result;
+                $v_skip--;
+            }
+        }
+    }
+
+    // ----- Return
+    return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathInclusion()
+// Description :
+//     This function indicates if the path $p_path is under the $p_dir tree. Or,
+//     said in an other way, if the file or sub-dir $p_path is inside the dir
+//     $p_dir.
+//     The function indicates also if the path is exactly the same as the dir.
+//     This function supports path with duplicated '/' like '//', but does not
+//     support '.' or '..' statements.
+// Parameters :
+// Return Values :
+//     0 if $p_path is not inside directory $p_dir
+//     1 if $p_path is inside directory $p_dir
+//     2 if $p_path is exactly the same as $p_dir
+// --------------------------------------------------------------------------------
+function PclZipUtilPathInclusion($p_dir, $p_path)
+{
+    $v_result = 1;
+
+    // ----- Look for path beginning by ./
+    if (($p_dir == '.') || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false).'/'.substr($p_dir, 1);
+    }
+    if (($p_path == '.') || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false).'/'.substr($p_path, 1);
+    }
+
+    // ----- Explode dir and path by directory separator
+    $v_list_dir = explode("/", $p_dir);
+    $v_list_dir_size = sizeof($v_list_dir);
+    $v_list_path = explode("/", $p_path);
+    $v_list_path_size = sizeof($v_list_path);
+
+    // ----- Study directories paths
+    $i = 0;
+    $j = 0;
+    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
+        // ----- Look for empty dir (path reduction)
+        if ($v_list_dir[$i] == '') {
+            $i++;
+            continue;
+        }
+        if ($v_list_path[$j] == '') {
+            $j++;
+            continue;
+        }
+
+        // ----- Compare the items
+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
+            $v_result = 0;
+        }
+
+        // ----- Next items
+        $i++;
+        $j++;
+    }
+
+    // ----- Look if everything seems to be the same
+    if ($v_result) {
+        // ----- Skip all the empty items
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+            $i++;
+        }
+
+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+            // ----- There are exactly the same
+            $v_result = 2;
+        } elseif ($i < $v_list_dir_size) {
+            // ----- The path is shorter than the dir
+            $v_result = 0;
+        }
+    }
+
+    // ----- Return
+    return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilCopyBlock()
+// Description :
+// Parameters :
+//     $p_mode : read/write compression mode
+//                         0 : src & dest normal
+//                         1 : src gzip, dest normal
+//                         2 : src normal, dest gzip
+//                         3 : src & dest gzip
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
+{
+    $v_result = 1;
+
+    if ($p_mode==0) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode==1) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @gzread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode==2) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode==3) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @gzread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    }
+
+    // ----- Return
+    return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilRename()
+// Description :
+//     This function tries to do a simple rename() function. If it fails, it
+//     tries to copy the $p_src file in a new $p_dest file and then unlink the
+//     first one.
+// Parameters :
+//     $p_src : Old filename
+//     $p_dest : New filename
+// Return Values :
+//     1 on success, 0 on failure.
+// --------------------------------------------------------------------------------
+function PclZipUtilRename($p_src, $p_dest)
+{
+    $v_result = 1;
+
+    // ----- Try to rename the files
+    if (!@rename($p_src, $p_dest)) {
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
+    }
+
+    // ----- Return
+    return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilOptionText()
+// Description :
+//     Translate option value in text. Mainly for debug purpose.
+// Parameters :
+//     $p_option : the option value.
+// Return Values :
+//     The option text value.
+// --------------------------------------------------------------------------------
+function PclZipUtilOptionText($p_option)
+{
+    $v_list = get_defined_constants();
+    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
+        $v_prefix = substr($v_key, 0, 10);
+        if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
+            return $v_key;
+        }
+    }
+
+    $v_result = 'Unknown';
+
+    return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilTranslateWinPath()
+// Description :
+//     Translate windows path by replacing '\' by '/' and optionally removing
+//     drive letter.
+// Parameters :
+//     $p_path : path to translate.
+//     $p_remove_disk_letter : true | false
+// Return Values :
+//     The path translated.
+// --------------------------------------------------------------------------------
+function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
+{
+    if (stristr(php_uname(), 'windows')) {
+        // ----- Look for potential disk letter
+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+            $p_path = substr($p_path, $v_position+1);
+        }
+        // ----- Change potential windows directory separator
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+            $p_path = strtr($p_path, '\\', '/');
+        }
+    }
+    return $p_path;
+}
diff --git a/lib/PHPExcel/Shared/PCLZip/readme.txt b/lib/PHPExcel/Shared/PCLZip/readme.txt
new file mode 100644
index 000000000..d1b11e258
--- /dev/null
+++ b/lib/PHPExcel/Shared/PCLZip/readme.txt
@@ -0,0 +1,421 @@
+// --------------------------------------------------------------------------------
+// PclZip 2.8.2 - readme.txt
+// --------------------------------------------------------------------------------
+// License GNU/LGPL - August 2009
+// Vincent Blavet - vincent@phpconcept.net
+// http://www.phpconcept.net
+// --------------------------------------------------------------------------------
+// $Id: readme.txt,v 1.60 2009/09/30 20:35:21 vblavet Exp $
+// --------------------------------------------------------------------------------
+
+
+
+0 - Sommaire
+============
+    1 - Introduction
+    2 - What's new
+    3 - Corrected bugs
+    4 - Known bugs or limitations
+    5 - License
+    6 - Warning
+    7 - Documentation
+    8 - Author
+    9 - Contribute
+
+1 - Introduction
+================
+
+  PclZip is a library that allow you to manage a Zip archive.
+
+  Full documentation about PclZip can be found here : http://www.phpconcept.net/pclzip
+
+2 - What's new
+==============
+
+  Version 2.8.2 :
+    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
+      extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
+      can also be modified in the post-extract call back.
+    **Bugs correction :
+    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
+    - Remove use of eval() and do direct call to callback functions
+    - Correct support of 64bits systems (Thanks to WordPress team)
+
+  Version 2.8.1 :
+    - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
+      deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
+      automatically replace it by PCLZIP_OPT_BY_PREG.
+  
+  Version 2.8 :
+    - Improve extraction of zip archive for large files by using temporary files
+      This feature is working like the one defined in r2.7.
+      Options are renamed : PCLZIP_OPT_TEMP_FILE_ON, PCLZIP_OPT_TEMP_FILE_OFF,
+      PCLZIP_OPT_TEMP_FILE_THRESHOLD
+    - Add a ratio constant PCLZIP_TEMPORARY_FILE_RATIO to configure the auto
+      sense of temporary file use.
+    - Bug correction : Reduce filepath in returned file list to remove ennoying
+      './/' preambule in file path.
+
+  Version 2.7 :
+    - Improve creation of zip archive for large files :
+      PclZip will now autosense the configured memory and use temporary files
+      when large file is suspected.
+      This feature can also ne triggered by manual options in create() and add()
+      methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
+      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
+      'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
+      threshold to use temporary files.
+      Using "temporary files" rather than "memory" might take more time, but
+      might give the ability to zip very large files :
+      Tested on my win laptop with a 88Mo file :
+        Zip "in-memory" : 18sec (max_execution_time=30, memory_limit=180Mo)
+        Zip "tmporary-files" : 23sec (max_execution_time=30, memory_limit=30Mo)
+    - Replace use of mktime() by time() to limit the E_STRICT error messages.
+    - Bug correction : When adding files with full windows path (drive letter)
+      PclZip is now working. Before, if the drive letter is not the default
+      path, PclZip was not able to add the file.
+
+  Version 2.6 :
+    - Code optimisation
+    - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
+      add a comment for a specific file. (Don't really know if this is usefull)
+    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string 
+      as a file.
+    - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
+      a file.
+    - Correct a bug. Files archived with a timestamp with 0h0m0s were extracted
+      with current time
+    - Add CRC value in the informations returned back for each file after an
+      action.
+    - Add missing closedir() statement.
+    - When adding a folder, and removing the path of this folder, files were
+      incorrectly added with a '/' at the beginning. Which means files are 
+      related to root in unix systems. Corrected.
+    - Add conditional if before constant definition. This will allow users
+      to redefine constants without changing the file, and then improve
+      upgrade of pclzip code for new versions.
+  
+  Version 2.5 :
+    - Introduce the ability to add file/folder with individual properties (file descriptor).
+      This gives for example the ability to change the filename of a zipped file.
+      . Able to add files individually
+      . Able to change full name
+      . Able to change short name
+      . Compatible with global options
+    - New attributes : PCLZIP_ATT_FILE_NAME, PCLZIP_ATT_FILE_NEW_SHORT_NAME, PCLZIP_ATT_FILE_NEW_FULL_NAME
+    - New error code : PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE
+    - Add a security control feature. PclZip can extract any file in any folder
+      of a system. People may use this to upload a zip file and try to override
+      a system file. The PCLZIP_OPT_EXTRACT_DIR_RESTRICTION will give the
+      ability to forgive any directory transversal behavior.
+    - New PCLZIP_OPT_EXTRACT_DIR_RESTRICTION : check extraction path
+    - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
+    - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
+      by current path (getcwd())
+  
+  Version 2.4 :
+    - Code improvment : try to speed up the code by removing unusefull call to pack()
+    - Correct bug in delete() : delete() should be called with no argument. This was not
+      the case in 2.3. This is corrected in 2.4.
+    - Correct a bug in path_inclusion function. When the path has several '../../', the
+      result was bad.
+    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will 
+      disable it while working and det it back to its original value.
+      This resolve a lots of bad formated archive errors.
+    - Bug correction : PclZip now correctly unzip file in some specific situation,
+      when compressed content has same size as uncompressed content.
+    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH', 
+      directories are not any more created.
+    - Code improvment : correct unclosed opendir(), better handling of . and .. in
+      loops.
+
+
+  Version 2.3 :
+    - Correct a bug with PHP5 : affecting the value 0xFE49FFE0 to a variable does not
+      give the same result in PHP4 and PHP5 ....
+
+  Version 2.2 :
+    - Try development of PCLZIP_OPT_CRYPT .....
+      However this becomes to a stop. To crypt/decrypt I need to multiply 2 long integers,
+      the result (greater than a long) is not supported by PHP. Even the use of bcmath
+      functions does not help. I did not find yet a solution ...;
+    - Add missing '/' at end of directory entries
+    - Check is a file is encrypted or not. Returns status 'unsupported_encryption' and/or
+      error code PCLZIP_ERR_UNSUPPORTED_ENCRYPTION.
+    - Corrected : Bad "version need to extract" field in local file header
+    - Add private method privCheckFileHeaders() in order to check local and central
+      file headers. PclZip is now supporting purpose bit flag bit 3. Purpose bit flag bit 3 gives
+      the ability to have a local file header without size, compressed size and crc filled.
+    - Add a generic status 'error' for file status
+    - Add control of compression type. PclZip only support deflate compression method.
+      Before v2.2, PclZip does not check the compression method used in an archive while
+      extracting. With v2.2 PclZip returns a new error status for a file using an unsupported
+      compression method. New status is "unsupported_compression". New error code is
+      PCLZIP_ERR_UNSUPPORTED_COMPRESSION.
+    - Add optional attribute PCLZIP_OPT_STOP_ON_ERROR. This will stop the extract of files
+      when errors like 'a folder with same name exists' or 'a newer file exists' or
+      'a write protected file' exists, rather than set a status for the concerning file
+      and resume the extract of the zip.
+    - Add optional attribute PCLZIP_OPT_REPLACE_NEWER. This will force, during an extract' the
+      replacement of the file, even if a  newer version of the file exists.
+      Note that today if a file with the same name already exists but is older it will be
+      replaced by the extracted one.
+    - Improve PclZipUtilOption()
+    - Support of zip archive with trailing bytes. Before 2.2, PclZip checks that the central
+      directory structure is the last data in the archive. Crypt encryption/decryption of
+      zip archive put trailing 0 bytes after decryption. PclZip is now supporting this.
+
+  Version 2.1 :
+    - Add the ability to abort the extraction by using a user callback function.
+      The user can now return the value '2' in its callback which indicates to stop the
+      extraction. For a pre call-back extract is stopped before the extration of the current
+      file. For a post call back, the extraction is stopped after.
+    - Add the ability to extract a file (or several files) directly in the standard output.
+      This is done by the new parameter PCLZIP_OPT_EXTRACT_IN_OUTPUT with method extract().
+    - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
+      PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
+      in the zip archive.
+    - When merging two archives, the comments are not any more lost, but merged, with a 
+      blank space separator.
+    - Corrected bug : Files are not deleted when all files are asked to be deleted.
+    - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
+
+
+  Version 2.0 :
+    ***** Warning : Some new features may break the backward compatibility for your scripts.
+                    Please carefully read the readme file.
+    - Add the ability to delete by Index, name and regular expression. This feature is 
+      performed by the method delete(), which uses the optional parameters
+      PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
+    - Add the ability to extract by regular expression. To extract by regexp you must use the method
+      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG 
+      (depending if you want to use ereg() or preg_match() syntax) followed by the 
+      regular expression pattern.
+    - Add the ability to extract by index, directly with the extract() method. This is a
+      code improvment of the extractByIndex() method.
+    - Add the ability to extract by name. To extract by name you must use the method
+      extract(), with the option PCLZIP_OPT_BY_NAME followed by the filename to
+      extract or an array of filenames to extract. To extract all a folder, use the folder
+      name rather than the filename with a '/' at the end.
+    - Add the ability to add files without compression. This is done with a new attribute
+      which is PCLZIP_OPT_NO_COMPRESSION.
+    - Add the attribute PCLZIP_OPT_EXTRACT_AS_STRING, which allow to extract a file directly
+      in a string without using any file (or temporary file).
+    - Add constant PCLZIP_SEPARATOR for static configuration of filename separators in a single string.
+      The default separator is now a comma (,) and not any more a blank space.
+      THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
+      your script.
+    - Improve algorythm performance by removing the use of temporary files when adding or 
+      extracting files in an archive.
+    - Add (correct) detection of empty filename zipping. This can occurs when the removed
+      path is the same
+      as a zipped dir. The dir is not zipped (['status'] = filtered), only its content.
+    - Add better support for windows paths (thanks for help from manus@manusfreedom.com).
+    - Corrected bug : When the archive file already exists with size=0, the add() method
+      fails. Corrected in 2.0.
+    - Remove the use of OS_WINDOWS constant. Use php_uname() function rather.
+    - Control the order of index ranges in extract by index feature.
+    - Change the internal management of folders (better handling of internal flag).
+
+
+  Version 1.3 :
+    - Removing the double include check. This is now done by include_once() and require_once()
+      PHP directives.
+    - Changing the error handling mecanism : Remove the use of an external error library.
+      The former PclError...() functions are replaced by internal equivalent methods.
+      By changing the environment variable PCLZIP_ERROR_EXTERNAL you can still use the former library.
+      Introducing the use of constants for error codes rather than integer values. This will help
+      in futur improvment.
+      Introduction of error handling functions like errorCode(), errorName() and errorInfo().
+    - Remove the deprecated use of calling function with arguments passed by reference.
+    - Add the calling of extract(), extractByIndex(), create() and add() functions
+      with variable options rather than fixed arguments.
+    - Add the ability to remove all the file path while extracting or adding,
+      without any need to specify the path to remove.
+      This is available for extract(), extractByIndex(), create() and add() functionS by using
+      the new variable options parameters :
+      - PCLZIP_OPT_REMOVE_ALL_PATH : by indicating this option while calling the fct.
+    - Ability to change the mode of a file after the extraction (chmod()).
+      This is available for extract() and extractByIndex() functionS by using
+      the new variable options parameters.
+      - PCLZIP_OPT_SET_CHMOD : by setting the value of this option.
+    - Ability to definition call-back options. These call-back will be called during the adding,
+      or the extracting of file (extract(), extractByIndex(), create() and add() functions) :
+      - PCLZIP_CB_PRE_EXTRACT : will be called before each extraction of a file. The user
+        can trigerred the change the filename of the extracted file. The user can triggered the
+        skip of the extraction. This is adding a 'skipped' status in the file list result value.
+      - PCLZIP_CB_POST_EXTRACT : will be called after each extraction of a file.
+        Nothing can be triggered from that point.
+      - PCLZIP_CB_PRE_ADD : will be called before each add of a file. The user
+        can trigerred the change the stored filename of the added file. The user can triggered the
+        skip of the add. This is adding a 'skipped' status in the file list result value.
+      - PCLZIP_CB_POST_ADD : will be called after each add of a file.
+        Nothing can be triggered from that point.
+    - Two status are added in the file list returned as function result : skipped & filename_too_long
+      'skipped' is used when a call-back function ask for skipping the file.
+      'filename_too_long' is used while adding a file with a too long filename to archive (the file is
+      not added)
+    - Adding the function PclZipUtilPathInclusion(), that check the inclusion of a path into
+      a directory.
+    - Add a check of the presence of the archive file before some actions (like list, ...)
+    - Add the initialisation of field "index" in header array. This means that by
+      default index will be -1 when not explicitly set by the methods.
+
+  Version 1.2 :
+    - Adding a duplicate function.
+    - Adding a merge function. The merge function is a "quick merge" function,
+      it just append the content of an archive at the end of the first one. There
+      is no check for duplicate files or more recent files.
+    - Improve the search of the central directory end.
+
+  Version 1.1.2 :
+
+    - Changing the license of PclZip. PclZip is now released under the GNU / LGPL license
+      (see License section).
+    - Adding the optional support of a static temporary directory. You will need to configure
+      the constant PCLZIP_TEMPORARY_DIR if you want to use this feature.
+    - Improving the rename() function. In some cases rename() does not work (different
+      Filesystems), so it will be replaced by a copy() + unlink() functions.
+
+  Version 1.1.1 :
+
+    - Maintenance release, no new feature.
+
+  Version 1.1 :
+
+    - New method Add() : adding files in the archive
+    - New method ExtractByIndex() : partial extract of the archive, files are identified by
+      their index in the archive
+    - New method DeleteByIndex() : delete some files/folder entries from the archive,
+      files are identified by their index in the archive.
+    - Adding a test of the zlib extension presence. If not present abort the script.
+
+  Version 1.0.1 :
+
+    - No new feature
+
+
+3 - Corrected bugs
+==================
+
+  Corrected in Version 2.0 :
+    - Corrected : During an extraction, if a call-back fucntion is used and try to skip
+                  a file, all the extraction process is stopped. 
+
+  Corrected in Version 1.3 :
+    - Corrected : Support of static synopsis for method extract() is broken.
+    - Corrected : invalid size of archive content field (0xFF) should be (0xFFFF).
+    - Corrected : When an extract is done with a remove_path parameter, the entry for
+      the directory with exactly the same path is not skipped/filtered.
+    - Corrected : extractByIndex() and deleteByIndex() were not managing index in the
+      right way. For example indexes '1,3-5,11' will only extract files 1 and 11. This
+      is due to a sort of the index resulting table that puts 11 before 3-5 (sort on
+      string and not interger). The sort is temporarilly removed, this means that
+      you must provide a sorted list of index ranges.
+
+  Corrected in Version 1.2 :
+
+    - Nothing.
+
+  Corrected in Version 1.1.2 :
+
+    - Corrected : Winzip is unable to delete or add new files in a PclZip created archives.
+
+  Corrected in Version 1.1.1 :
+
+    - Corrected : When archived file is not compressed (0% compression), the
+      extract method fails.
+
+  Corrected in Version 1.1 :
+
+    - Corrected : Adding a complete tree of folder may result in a bad archive
+      creation.
+
+  Corrected in Version 1.0.1 :
+
+    - Corrected : Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
+
+
+4 - Known bugs or limitations
+=============================
+
+  Please publish bugs reports in SourceForge :
+    http://sourceforge.net/tracker/?group_id=40254&atid=427564
+
+  In Version 2.x :
+    - PclZip does only support file uncompressed or compressed with deflate (compression method 8)
+    - PclZip does not support password protected zip archive
+    - Some concern were seen when changing mtime of a file while archiving. 
+      Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
+
+  In Version 1.2 :
+
+    - merge() methods does not check for duplicate files or last date of modifications.
+
+  In Version 1.1 :
+
+    - Limitation : Using 'extract' fields in the file header in the zip archive is not supported.
+    - WinZip is unable to delete a single file in a PclZip created archive. It is also unable to
+      add a file in a PclZip created archive. (Corrected in v.1.2)
+
+  In Version 1.0.1 :
+
+    - Adding a complete tree of folder may result in a bad archive
+      creation. (Corrected in V.1.1).
+    - Path given to methods must be in the unix format (/) and not the Windows format (\).
+      Workaround : Use only / directory separators.
+    - PclZip is using temporary files that are sometime the name of the file with a .tmp or .gz
+      added suffix. Files with these names may already exist and may be overwritten.
+      Workaround : none.
+    - PclZip does not check if the zlib extension is present. If it is absent, the zip
+      file is not created and the lib abort without warning.
+      Workaround : enable the zlib extension on the php install
+
+  In Version 1.0 :
+
+    - Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
+      (Corrected in v.1.0.1)
+    - Limitation : Multi-disk zip archive are not supported.
+
+
+5 - License
+===========
+
+  Since version 1.1.2, PclZip Library is released under GNU/LGPL license.
+  This library is free, so you can use it at no cost.
+
+  HOWEVER, if you release a script, an application, a library or any kind of
+  code using PclZip library (or a part of it), YOU MUST :
+  - Indicate in the documentation (or a readme file), that your work
+    uses PclZip Library, and make a reference to the author and the web site
+    http://www.phpconcept.net
+  - Gives the ability to the final user to update the PclZip libary.
+
+  I will also appreciate that you send me a mail (vincent@phpconcept.net), just to
+  be aware that someone is using PclZip.
+
+  For more information about GNU/LGPL license : http://www.gnu.org
+
+6 - Warning
+=================
+
+  This library and the associated files are non commercial, non professional work.
+  It should not have unexpected results. However if any damage is caused by this software
+  the author can not be responsible.
+  The use of this software is at the risk of the user.
+
+7 - Documentation
+=================
+  PclZip User Manuel is available in English on PhpConcept : http://www.phpconcept.net/pclzip/man/en/index.php
+  A Russian translation was done by Feskov Kuzma : http://php.russofile.ru/ru/authors/unsort/zip/
+
+8 - Author
+==========
+
+  This software was written by Vincent Blavet (vincent@phpconcept.net) on its leasure time.
+
+9 - Contribute
+==============
+  If you want to contribute to the development of PclZip, please contact vincent@phpconcept.net.
+  If you can help in financing PhpConcept hosting service, please go to
+  http://www.phpconcept.net/soutien.php
diff --git a/lib/PHPExcel/Shared/PasswordHasher.php b/lib/PHPExcel/Shared/PasswordHasher.php
new file mode 100644
index 000000000..946742bf6
--- /dev/null
+++ b/lib/PHPExcel/Shared/PasswordHasher.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Shared_PasswordHasher
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Shared_PasswordHasher
+{
+    /**
+     * Create a password hash from a given string.
+     *
+     * This method is based on the algorithm provided by
+     * Daniel Rentz of OpenOffice and the PEAR package
+     * Spreadsheet_Excel_Writer by Xavier Noguer <xnoguer@rezebra.com>.
+     *
+     * @param     string    $pPassword    Password to hash
+     * @return     string                Hashed password
+     */
+    public static function hashPassword($pPassword = '')
+    {
+        $password   = 0x0000;
+        $charPos    = 1;       // char position
+
+        // split the plain text password in its component characters
+        $chars = preg_split('//', $pPassword, -1, PREG_SPLIT_NO_EMPTY);
+        foreach ($chars as $char) {
+            $value            = ord($char) << $charPos++;    // shifted ASCII value
+            $rotated_bits    = $value >> 15;                // rotated bits beyond bit 15
+            $value            &= 0x7fff;                    // first 15 bits
+            $password        ^= ($value | $rotated_bits);
+        }
+
+        $password ^= strlen($pPassword);
+        $password ^= 0xCE4B;
+
+        return(strtoupper(dechex($password)));
+    }
+}
diff --git a/lib/PHPExcel/Shared/String.php b/lib/PHPExcel/Shared/String.php
new file mode 100644
index 000000000..10e38d20d
--- /dev/null
+++ b/lib/PHPExcel/Shared/String.php
@@ -0,0 +1,819 @@
+<?php
+
+/**
+ * PHPExcel_Shared_String
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_String
+{
+    /**    Constants                */
+    /**    Regular Expressions        */
+    //    Fraction
+    const STRING_REGEXP_FRACTION    = '(-?)(\d+)\s+(\d+\/\d+)';
+
+
+    /**
+     * Control characters array
+     *
+     * @var string[]
+     */
+    private static $controlCharacters = array();
+
+    /**
+     * SYLK Characters array
+     *
+     * $var array
+     */
+    private static $SYLKCharacters = array();
+
+    /**
+     * Decimal separator
+     *
+     * @var string
+     */
+    private static $decimalSeparator;
+
+    /**
+     * Thousands separator
+     *
+     * @var string
+     */
+    private static $thousandsSeparator;
+
+    /**
+     * Currency code
+     *
+     * @var string
+     */
+    private static $currencyCode;
+
+    /**
+     * Is mbstring extension avalable?
+     *
+     * @var boolean
+     */
+    private static $isMbstringEnabled;
+
+    /**
+     * Is iconv extension avalable?
+     *
+     * @var boolean
+     */
+    private static $isIconvEnabled;
+
+    /**
+     * Build control characters array
+     */
+    private static function buildControlCharacters()
+    {
+        for ($i = 0; $i <= 31; ++$i) {
+            if ($i != 9 && $i != 10 && $i != 13) {
+                $find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_';
+                $replace = chr($i);
+                self::$controlCharacters[$find] = $replace;
+            }
+        }
+    }
+
+    /**
+     * Build SYLK characters array
+     */
+    private static function buildSYLKCharacters()
+    {
+        self::$SYLKCharacters = array(
+            "\x1B 0"  => chr(0),
+            "\x1B 1"  => chr(1),
+            "\x1B 2"  => chr(2),
+            "\x1B 3"  => chr(3),
+            "\x1B 4"  => chr(4),
+            "\x1B 5"  => chr(5),
+            "\x1B 6"  => chr(6),
+            "\x1B 7"  => chr(7),
+            "\x1B 8"  => chr(8),
+            "\x1B 9"  => chr(9),
+            "\x1B :"  => chr(10),
+            "\x1B ;"  => chr(11),
+            "\x1B <"  => chr(12),
+            "\x1B :"  => chr(13),
+            "\x1B >"  => chr(14),
+            "\x1B ?"  => chr(15),
+            "\x1B!0"  => chr(16),
+            "\x1B!1"  => chr(17),
+            "\x1B!2"  => chr(18),
+            "\x1B!3"  => chr(19),
+            "\x1B!4"  => chr(20),
+            "\x1B!5"  => chr(21),
+            "\x1B!6"  => chr(22),
+            "\x1B!7"  => chr(23),
+            "\x1B!8"  => chr(24),
+            "\x1B!9"  => chr(25),
+            "\x1B!:"  => chr(26),
+            "\x1B!;"  => chr(27),
+            "\x1B!<"  => chr(28),
+            "\x1B!="  => chr(29),
+            "\x1B!>"  => chr(30),
+            "\x1B!?"  => chr(31),
+            "\x1B'?"  => chr(127),
+            "\x1B(0"  => '€', // 128 in CP1252
+            "\x1B(2"  => '‚', // 130 in CP1252
+            "\x1B(3"  => 'ƒ', // 131 in CP1252
+            "\x1B(4"  => '„', // 132 in CP1252
+            "\x1B(5"  => '…', // 133 in CP1252
+            "\x1B(6"  => '†', // 134 in CP1252
+            "\x1B(7"  => '‡', // 135 in CP1252
+            "\x1B(8"  => 'ˆ', // 136 in CP1252
+            "\x1B(9"  => '‰', // 137 in CP1252
+            "\x1B(:"  => 'Š', // 138 in CP1252
+            "\x1B(;"  => '‹', // 139 in CP1252
+            "\x1BNj"  => 'Œ', // 140 in CP1252
+            "\x1B(>"  => 'Ž', // 142 in CP1252
+            "\x1B)1"  => '‘', // 145 in CP1252
+            "\x1B)2"  => '’', // 146 in CP1252
+            "\x1B)3"  => '“', // 147 in CP1252
+            "\x1B)4"  => '”', // 148 in CP1252
+            "\x1B)5"  => '•', // 149 in CP1252
+            "\x1B)6"  => '–', // 150 in CP1252
+            "\x1B)7"  => '—', // 151 in CP1252
+            "\x1B)8"  => '˜', // 152 in CP1252
+            "\x1B)9"  => '™', // 153 in CP1252
+            "\x1B):"  => 'š', // 154 in CP1252
+            "\x1B);"  => '›', // 155 in CP1252
+            "\x1BNz"  => 'œ', // 156 in CP1252
+            "\x1B)>"  => 'ž', // 158 in CP1252
+            "\x1B)?"  => 'Ÿ', // 159 in CP1252
+            "\x1B*0"  => ' ', // 160 in CP1252
+            "\x1BN!"  => '¡', // 161 in CP1252
+            "\x1BN\"" => '¢', // 162 in CP1252
+            "\x1BN#"  => '£', // 163 in CP1252
+            "\x1BN("  => '¤', // 164 in CP1252
+            "\x1BN%"  => '¥', // 165 in CP1252
+            "\x1B*6"  => '¦', // 166 in CP1252
+            "\x1BN'"  => '§', // 167 in CP1252
+            "\x1BNH " => '¨', // 168 in CP1252
+            "\x1BNS"  => '©', // 169 in CP1252
+            "\x1BNc"  => 'ª', // 170 in CP1252
+            "\x1BN+"  => '«', // 171 in CP1252
+            "\x1B*<"  => '¬', // 172 in CP1252
+            "\x1B*="  => '­', // 173 in CP1252
+            "\x1BNR"  => '®', // 174 in CP1252
+            "\x1B*?"  => '¯', // 175 in CP1252
+            "\x1BN0"  => '°', // 176 in CP1252
+            "\x1BN1"  => '±', // 177 in CP1252
+            "\x1BN2"  => '²', // 178 in CP1252
+            "\x1BN3"  => '³', // 179 in CP1252
+            "\x1BNB " => '´', // 180 in CP1252
+            "\x1BN5"  => 'µ', // 181 in CP1252
+            "\x1BN6"  => '¶', // 182 in CP1252
+            "\x1BN7"  => '·', // 183 in CP1252
+            "\x1B+8"  => '¸', // 184 in CP1252
+            "\x1BNQ"  => '¹', // 185 in CP1252
+            "\x1BNk"  => 'º', // 186 in CP1252
+            "\x1BN;"  => '»', // 187 in CP1252
+            "\x1BN<"  => '¼', // 188 in CP1252
+            "\x1BN="  => '½', // 189 in CP1252
+            "\x1BN>"  => '¾', // 190 in CP1252
+            "\x1BN?"  => '¿', // 191 in CP1252
+            "\x1BNAA" => 'À', // 192 in CP1252
+            "\x1BNBA" => 'Á', // 193 in CP1252
+            "\x1BNCA" => 'Â', // 194 in CP1252
+            "\x1BNDA" => 'Ã', // 195 in CP1252
+            "\x1BNHA" => 'Ä', // 196 in CP1252
+            "\x1BNJA" => 'Å', // 197 in CP1252
+            "\x1BNa"  => 'Æ', // 198 in CP1252
+            "\x1BNKC" => 'Ç', // 199 in CP1252
+            "\x1BNAE" => 'È', // 200 in CP1252
+            "\x1BNBE" => 'É', // 201 in CP1252
+            "\x1BNCE" => 'Ê', // 202 in CP1252
+            "\x1BNHE" => 'Ë', // 203 in CP1252
+            "\x1BNAI" => 'Ì', // 204 in CP1252
+            "\x1BNBI" => 'Í', // 205 in CP1252
+            "\x1BNCI" => 'Î', // 206 in CP1252
+            "\x1BNHI" => 'Ï', // 207 in CP1252
+            "\x1BNb"  => 'Ð', // 208 in CP1252
+            "\x1BNDN" => 'Ñ', // 209 in CP1252
+            "\x1BNAO" => 'Ò', // 210 in CP1252
+            "\x1BNBO" => 'Ó', // 211 in CP1252
+            "\x1BNCO" => 'Ô', // 212 in CP1252
+            "\x1BNDO" => 'Õ', // 213 in CP1252
+            "\x1BNHO" => 'Ö', // 214 in CP1252
+            "\x1B-7"  => '×', // 215 in CP1252
+            "\x1BNi"  => 'Ø', // 216 in CP1252
+            "\x1BNAU" => 'Ù', // 217 in CP1252
+            "\x1BNBU" => 'Ú', // 218 in CP1252
+            "\x1BNCU" => 'Û', // 219 in CP1252
+            "\x1BNHU" => 'Ü', // 220 in CP1252
+            "\x1B-="  => 'Ý', // 221 in CP1252
+            "\x1BNl"  => 'Þ', // 222 in CP1252
+            "\x1BN{"  => 'ß', // 223 in CP1252
+            "\x1BNAa" => 'à', // 224 in CP1252
+            "\x1BNBa" => 'á', // 225 in CP1252
+            "\x1BNCa" => 'â', // 226 in CP1252
+            "\x1BNDa" => 'ã', // 227 in CP1252
+            "\x1BNHa" => 'ä', // 228 in CP1252
+            "\x1BNJa" => 'å', // 229 in CP1252
+            "\x1BNq"  => 'æ', // 230 in CP1252
+            "\x1BNKc" => 'ç', // 231 in CP1252
+            "\x1BNAe" => 'è', // 232 in CP1252
+            "\x1BNBe" => 'é', // 233 in CP1252
+            "\x1BNCe" => 'ê', // 234 in CP1252
+            "\x1BNHe" => 'ë', // 235 in CP1252
+            "\x1BNAi" => 'ì', // 236 in CP1252
+            "\x1BNBi" => 'í', // 237 in CP1252
+            "\x1BNCi" => 'î', // 238 in CP1252
+            "\x1BNHi" => 'ï', // 239 in CP1252
+            "\x1BNs"  => 'ð', // 240 in CP1252
+            "\x1BNDn" => 'ñ', // 241 in CP1252
+            "\x1BNAo" => 'ò', // 242 in CP1252
+            "\x1BNBo" => 'ó', // 243 in CP1252
+            "\x1BNCo" => 'ô', // 244 in CP1252
+            "\x1BNDo" => 'õ', // 245 in CP1252
+            "\x1BNHo" => 'ö', // 246 in CP1252
+            "\x1B/7"  => '÷', // 247 in CP1252
+            "\x1BNy"  => 'ø', // 248 in CP1252
+            "\x1BNAu" => 'ù', // 249 in CP1252
+            "\x1BNBu" => 'ú', // 250 in CP1252
+            "\x1BNCu" => 'û', // 251 in CP1252
+            "\x1BNHu" => 'ü', // 252 in CP1252
+            "\x1B/="  => 'ý', // 253 in CP1252
+            "\x1BN|"  => 'þ', // 254 in CP1252
+            "\x1BNHy" => 'ÿ', // 255 in CP1252
+        );
+    }
+
+    /**
+     * Get whether mbstring extension is available
+     *
+     * @return boolean
+     */
+    public static function getIsMbstringEnabled()
+    {
+        if (isset(self::$isMbstringEnabled)) {
+            return self::$isMbstringEnabled;
+        }
+
+        self::$isMbstringEnabled = function_exists('mb_convert_encoding') ?
+            true : false;
+
+        return self::$isMbstringEnabled;
+    }
+
+    /**
+     * Get whether iconv extension is available
+     *
+     * @return boolean
+     */
+    public static function getIsIconvEnabled()
+    {
+        if (isset(self::$isIconvEnabled)) {
+            return self::$isIconvEnabled;
+        }
+
+        // Fail if iconv doesn't exist
+        if (!function_exists('iconv')) {
+            self::$isIconvEnabled = false;
+            return false;
+        }
+
+        // Sometimes iconv is not working, and e.g. iconv('UTF-8', 'UTF-16LE', 'x') just returns false,
+        if (!@iconv('UTF-8', 'UTF-16LE', 'x')) {
+            self::$isIconvEnabled = false;
+            return false;
+        }
+
+        // Sometimes iconv_substr('A', 0, 1, 'UTF-8') just returns false in PHP 5.2.0
+        // we cannot use iconv in that case either (http://bugs.php.net/bug.php?id=37773)
+        if (!@iconv_substr('A', 0, 1, 'UTF-8')) {
+            self::$isIconvEnabled = false;
+            return false;
+        }
+
+        // CUSTOM: IBM AIX iconv() does not work
+        if (defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
+            self::$isIconvEnabled = false;
+            return false;
+        }
+
+        // If we reach here no problems were detected with iconv
+        self::$isIconvEnabled = true;
+        return true;
+    }
+
+    public static function buildCharacterSets()
+    {
+        if (empty(self::$controlCharacters)) {
+            self::buildControlCharacters();
+        }
+        if (empty(self::$SYLKCharacters)) {
+            self::buildSYLKCharacters();
+        }
+    }
+
+    /**
+     * Convert from OpenXML escaped control character to PHP control character
+     *
+     * Excel 2007 team:
+     * ----------------
+     * That's correct, control characters are stored directly in the shared-strings table.
+     * We do encode characters that cannot be represented in XML using the following escape sequence:
+     * _xHHHH_ where H represents a hexadecimal character in the character's value...
+     * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
+     * element or in the shared string <t> element.
+     *
+     * @param     string    $value    Value to unescape
+     * @return     string
+     */
+    public static function ControlCharacterOOXML2PHP($value = '')
+    {
+        return str_replace(array_keys(self::$controlCharacters), array_values(self::$controlCharacters), $value);
+    }
+
+    /**
+     * Convert from PHP control character to OpenXML escaped control character
+     *
+     * Excel 2007 team:
+     * ----------------
+     * That's correct, control characters are stored directly in the shared-strings table.
+     * We do encode characters that cannot be represented in XML using the following escape sequence:
+     * _xHHHH_ where H represents a hexadecimal character in the character's value...
+     * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
+     * element or in the shared string <t> element.
+     *
+     * @param     string    $value    Value to escape
+     * @return     string
+     */
+    public static function ControlCharacterPHP2OOXML($value = '')
+    {
+        return str_replace(array_values(self::$controlCharacters), array_keys(self::$controlCharacters), $value);
+    }
+
+    /**
+     * Try to sanitize UTF8, stripping invalid byte sequences. Not perfect. Does not surrogate characters.
+     *
+     * @param string $value
+     * @return string
+     */
+    public static function SanitizeUTF8($value)
+    {
+        if (self::getIsIconvEnabled()) {
+            $value = @iconv('UTF-8', 'UTF-8', $value);
+            return $value;
+        }
+
+        if (self::getIsMbstringEnabled()) {
+            $value = mb_convert_encoding($value, 'UTF-8', 'UTF-8');
+            return $value;
+        }
+
+        // else, no conversion
+        return $value;
+    }
+
+    /**
+     * Check if a string contains UTF8 data
+     *
+     * @param string $value
+     * @return boolean
+     */
+    public static function IsUTF8($value = '')
+    {
+        return $value === '' || preg_match('/^./su', $value) === 1;
+    }
+
+    /**
+     * Formats a numeric value as a string for output in various output writers forcing
+     * point as decimal separator in case locale is other than English.
+     *
+     * @param mixed $value
+     * @return string
+     */
+    public static function FormatNumber($value)
+    {
+        if (is_float($value)) {
+            return str_replace(',', '.', $value);
+        }
+        return (string) $value;
+    }
+
+    /**
+     * Converts a UTF-8 string into BIFF8 Unicode string data (8-bit string length)
+     * Writes the string using uncompressed notation, no rich text, no Asian phonetics
+     * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
+     * although this will give wrong results for non-ASCII strings
+     * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3
+     *
+     * @param string  $value    UTF-8 encoded string
+     * @param mixed[] $arrcRuns Details of rich text runs in $value
+     * @return string
+     */
+    public static function UTF8toBIFF8UnicodeShort($value, $arrcRuns = array())
+    {
+        // character count
+        $ln = self::CountCharacters($value, 'UTF-8');
+        // option flags
+        if (empty($arrcRuns)) {
+            $opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
+                0x0001 : 0x0000;
+            $data = pack('CC', $ln, $opt);
+            // characters
+            $data .= self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
+        } else {
+            $data = pack('vC', $ln, 0x09);
+            $data .= pack('v', count($arrcRuns));
+            // characters
+            $data .= self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
+            foreach ($arrcRuns as $cRun) {
+                $data .= pack('v', $cRun['strlen']);
+                $data .= pack('v', $cRun['fontidx']);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Converts a UTF-8 string into BIFF8 Unicode string data (16-bit string length)
+     * Writes the string using uncompressed notation, no rich text, no Asian phonetics
+     * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
+     * although this will give wrong results for non-ASCII strings
+     * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3
+     *
+     * @param string $value UTF-8 encoded string
+     * @return string
+     */
+    public static function UTF8toBIFF8UnicodeLong($value)
+    {
+        // character count
+        $ln = self::CountCharacters($value, 'UTF-8');
+
+        // option flags
+        $opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
+            0x0001 : 0x0000;
+
+        // characters
+        $chars = self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
+
+        $data = pack('vC', $ln, $opt) . $chars;
+        return $data;
+    }
+
+    /**
+     * Convert string from one encoding to another. First try mbstring, then iconv, finally strlen
+     *
+     * @param string $value
+     * @param string $to Encoding to convert to, e.g. 'UTF-8'
+     * @param string $from Encoding to convert from, e.g. 'UTF-16LE'
+     * @return string
+     */
+    public static function ConvertEncoding($value, $to, $from)
+    {
+        if (self::getIsIconvEnabled()) {
+            return iconv($from, $to, $value);
+        }
+
+        if (self::getIsMbstringEnabled()) {
+            return mb_convert_encoding($value, $to, $from);
+        }
+
+        if ($from == 'UTF-16LE') {
+            return self::utf16_decode($value, false);
+        } elseif ($from == 'UTF-16BE') {
+            return self::utf16_decode($value);
+        }
+        // else, no conversion
+        return $value;
+    }
+
+    /**
+     * Decode UTF-16 encoded strings.
+     *
+     * Can handle both BOM'ed data and un-BOM'ed data.
+     * Assumes Big-Endian byte order if no BOM is available.
+     * This function was taken from http://php.net/manual/en/function.utf8-decode.php
+     * and $bom_be parameter added.
+     *
+     * @param   string  $str  UTF-16 encoded data to decode.
+     * @return  string  UTF-8 / ISO encoded data.
+     * @access  public
+     * @version 0.2 / 2010-05-13
+     * @author  Rasmus Andersson {@link http://rasmusandersson.se/}
+     * @author vadik56
+     */
+    public static function utf16_decode($str, $bom_be = true)
+    {
+        if (strlen($str) < 2) {
+            return $str;
+        }
+        $c0 = ord($str[0]);
+        $c1 = ord($str[1]);
+        if ($c0 == 0xfe && $c1 == 0xff) {
+            $str = substr($str, 2);
+        } elseif ($c0 == 0xff && $c1 == 0xfe) {
+            $str = substr($str, 2);
+            $bom_be = false;
+        }
+        $len = strlen($str);
+        $newstr = '';
+        for ($i=0; $i<$len; $i+=2) {
+            if ($bom_be) {
+                $val = ord($str[$i])   << 4;
+                $val += ord($str[$i+1]);
+            } else {
+                $val = ord($str[$i+1]) << 4;
+                $val += ord($str[$i]);
+            }
+            $newstr .= ($val == 0x228) ? "\n" : chr($val);
+        }
+        return $newstr;
+    }
+
+    /**
+     * Get character count. First try mbstring, then iconv, finally strlen
+     *
+     * @param string $value
+     * @param string $enc Encoding
+     * @return int Character count
+     */
+    public static function CountCharacters($value, $enc = 'UTF-8')
+    {
+        if (self::getIsMbstringEnabled()) {
+            return mb_strlen($value, $enc);
+        }
+
+        if (self::getIsIconvEnabled()) {
+            return iconv_strlen($value, $enc);
+        }
+
+        // else strlen
+        return strlen($value);
+    }
+
+    /**
+     * Get a substring of a UTF-8 encoded string. First try mbstring, then iconv, finally strlen
+     *
+     * @param string $pValue UTF-8 encoded string
+     * @param int $pStart Start offset
+     * @param int $pLength Maximum number of characters in substring
+     * @return string
+     */
+    public static function Substring($pValue = '', $pStart = 0, $pLength = 0)
+    {
+        if (self::getIsMbstringEnabled()) {
+            return mb_substr($pValue, $pStart, $pLength, 'UTF-8');
+        }
+
+        if (self::getIsIconvEnabled()) {
+            return iconv_substr($pValue, $pStart, $pLength, 'UTF-8');
+        }
+
+        // else substr
+        return substr($pValue, $pStart, $pLength);
+    }
+
+    /**
+     * Convert a UTF-8 encoded string to upper case
+     *
+     * @param string $pValue UTF-8 encoded string
+     * @return string
+     */
+    public static function StrToUpper($pValue = '')
+    {
+        if (function_exists('mb_convert_case')) {
+            return mb_convert_case($pValue, MB_CASE_UPPER, "UTF-8");
+        }
+        return strtoupper($pValue);
+    }
+
+    /**
+     * Convert a UTF-8 encoded string to lower case
+     *
+     * @param string $pValue UTF-8 encoded string
+     * @return string
+     */
+    public static function StrToLower($pValue = '')
+    {
+        if (function_exists('mb_convert_case')) {
+            return mb_convert_case($pValue, MB_CASE_LOWER, "UTF-8");
+        }
+        return strtolower($pValue);
+    }
+
+    /**
+     * Convert a UTF-8 encoded string to title/proper case
+     *    (uppercase every first character in each word, lower case all other characters)
+     *
+     * @param string $pValue UTF-8 encoded string
+     * @return string
+     */
+    public static function StrToTitle($pValue = '')
+    {
+        if (function_exists('mb_convert_case')) {
+            return mb_convert_case($pValue, MB_CASE_TITLE, "UTF-8");
+        }
+        return ucwords($pValue);
+    }
+
+    public static function mb_is_upper($char)
+    {
+        return mb_strtolower($char, "UTF-8") != $char;
+    }
+
+    public static function mb_str_split($string)
+    {
+        # Split at all position not after the start: ^
+        # and not before the end: $
+        return preg_split('/(?<!^)(?!$)/u', $string);
+    }
+
+    /**
+     * Reverse the case of a string, so that all uppercase characters become lowercase
+     *    and all lowercase characters become uppercase
+     *
+     * @param string $pValue UTF-8 encoded string
+     * @return string
+     */
+    public static function StrCaseReverse($pValue = '')
+    {
+        if (self::getIsMbstringEnabled()) {
+            $characters = self::mb_str_split($pValue);
+            foreach ($characters as &$character) {
+                if (self::mb_is_upper($character)) {
+                    $character = mb_strtolower($character, 'UTF-8');
+                } else {
+                    $character = mb_strtoupper($character, 'UTF-8');
+                }
+            }
+            return implode('', $characters);
+        }
+        return strtolower($pValue) ^ strtoupper($pValue) ^ $pValue;
+    }
+
+    /**
+     * Identify whether a string contains a fractional numeric value,
+     *    and convert it to a numeric if it is
+     *
+     * @param string &$operand string value to test
+     * @return boolean
+     */
+    public static function convertToNumberIfFraction(&$operand)
+    {
+        if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) {
+            $sign = ($match[1] == '-') ? '-' : '+';
+            $fractionFormula = '='.$sign.$match[2].$sign.$match[3];
+            $operand = PHPExcel_Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
+            return true;
+        }
+        return false;
+    }    //    function convertToNumberIfFraction()
+
+    /**
+     * Get the decimal separator. If it has not yet been set explicitly, try to obtain number
+     * formatting information from locale.
+     *
+     * @return string
+     */
+    public static function getDecimalSeparator()
+    {
+        if (!isset(self::$decimalSeparator)) {
+            $localeconv = localeconv();
+            self::$decimalSeparator = ($localeconv['decimal_point'] != '')
+                ? $localeconv['decimal_point'] : $localeconv['mon_decimal_point'];
+
+            if (self::$decimalSeparator == '') {
+                // Default to .
+                self::$decimalSeparator = '.';
+            }
+        }
+        return self::$decimalSeparator;
+    }
+
+    /**
+     * Set the decimal separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
+     * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
+     *
+     * @param string $pValue Character for decimal separator
+     */
+    public static function setDecimalSeparator($pValue = '.')
+    {
+        self::$decimalSeparator = $pValue;
+    }
+
+    /**
+     * Get the thousands separator. If it has not yet been set explicitly, try to obtain number
+     * formatting information from locale.
+     *
+     * @return string
+     */
+    public static function getThousandsSeparator()
+    {
+        if (!isset(self::$thousandsSeparator)) {
+            $localeconv = localeconv();
+            self::$thousandsSeparator = ($localeconv['thousands_sep'] != '')
+                ? $localeconv['thousands_sep'] : $localeconv['mon_thousands_sep'];
+
+            if (self::$thousandsSeparator == '') {
+                // Default to .
+                self::$thousandsSeparator = ',';
+            }
+        }
+        return self::$thousandsSeparator;
+    }
+
+    /**
+     * Set the thousands separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
+     * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
+     *
+     * @param string $pValue Character for thousands separator
+     */
+    public static function setThousandsSeparator($pValue = ',')
+    {
+        self::$thousandsSeparator = $pValue;
+    }
+
+    /**
+     *    Get the currency code. If it has not yet been set explicitly, try to obtain the
+     *        symbol information from locale.
+     *
+     * @return string
+     */
+    public static function getCurrencyCode()
+    {
+        if (!isset(self::$currencyCode)) {
+            $localeconv = localeconv();
+            self::$currencyCode = ($localeconv['currency_symbol'] != '')
+                ? $localeconv['currency_symbol'] : $localeconv['int_curr_symbol'];
+
+            if (self::$currencyCode == '') {
+                // Default to $
+                self::$currencyCode = '$';
+            }
+        }
+        return self::$currencyCode;
+    }
+
+    /**
+     * Set the currency code. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
+     *        to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
+     *
+     * @param string $pValue Character for currency code
+     */
+    public static function setCurrencyCode($pValue = '$')
+    {
+        self::$currencyCode = $pValue;
+    }
+
+    /**
+     * Convert SYLK encoded string to UTF-8
+     *
+     * @param string $pValue
+     * @return string UTF-8 encoded string
+     */
+    public static function SYLKtoUTF8($pValue = '')
+    {
+        // If there is no escape character in the string there is nothing to do
+        if (strpos($pValue, '') === false) {
+            return $pValue;
+        }
+
+        foreach (self::$SYLKCharacters as $k => $v) {
+            $pValue = str_replace($k, $v, $pValue);
+        }
+
+        return $pValue;
+    }
+
+    /**
+     * Retrieve any leading numeric part of a string, or return the full string if no leading numeric
+     *    (handles basic integer or float, but not exponent or non decimal)
+     *
+     * @param    string    $value
+     * @return    mixed    string or only the leading numeric part of the string
+     */
+    public static function testStringAsNumeric($value)
+    {
+        if (is_numeric($value)) {
+            return $value;
+        }
+        $v = floatval($value);
+        return (is_numeric(substr($value, 0, strlen($v)))) ? $v : $value;
+    }
+}
diff --git a/lib/PHPExcel/Shared/TimeZone.php b/lib/PHPExcel/Shared/TimeZone.php
new file mode 100644
index 000000000..73373e042
--- /dev/null
+++ b/lib/PHPExcel/Shared/TimeZone.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Shared_TimeZone
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Shared_TimeZone
+{
+    /*
+     * Default Timezone used for date/time conversions
+     *
+     * @private
+     * @var    string
+     */
+    protected static $timezone    = 'UTC';
+
+    /**
+     * Validate a Timezone name
+     *
+     * @param     string        $timezone            Time zone (e.g. 'Europe/London')
+     * @return     boolean                        Success or failure
+     */
+    public static function _validateTimeZone($timezone)
+    {
+        if (in_array($timezone, DateTimeZone::listIdentifiers())) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set the Default Timezone used for date/time conversions
+     *
+     * @param     string        $timezone            Time zone (e.g. 'Europe/London')
+     * @return     boolean                        Success or failure
+     */
+    public static function setTimeZone($timezone)
+    {
+        if (self::_validateTimezone($timezone)) {
+            self::$timezone = $timezone;
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Return the Default Timezone used for date/time conversions
+     *
+     * @return     string        Timezone (e.g. 'Europe/London')
+     */
+    public static function getTimeZone()
+    {
+        return self::$timezone;
+    }
+
+
+    /**
+     *    Return the Timezone transition for the specified timezone and timestamp
+     *
+     *    @param        DateTimeZone         $objTimezone    The timezone for finding the transitions
+     *    @param        integer                 $timestamp        PHP date/time value for finding the current transition
+     *    @return         array                The current transition details
+     */
+    private static function getTimezoneTransitions($objTimezone, $timestamp)
+    {
+        $allTransitions = $objTimezone->getTransitions();
+        $transitions = array();
+        foreach ($allTransitions as $key => $transition) {
+            if ($transition['ts'] > $timestamp) {
+                $transitions[] = ($key > 0) ? $allTransitions[$key - 1] : $transition;
+                break;
+            }
+            if (empty($transitions)) {
+                $transitions[] = end($allTransitions);
+            }
+        }
+
+        return $transitions;
+    }
+
+    /**
+     *    Return the Timezone offset used for date/time conversions to/from UST
+     *    This requires both the timezone and the calculated date/time to allow for local DST
+     *
+     *    @param        string                 $timezone        The timezone for finding the adjustment to UST
+     *    @param        integer                 $timestamp        PHP date/time value
+     *    @return         integer                Number of seconds for timezone adjustment
+     *    @throws        PHPExcel_Exception
+     */
+    public static function getTimeZoneAdjustment($timezone, $timestamp)
+    {
+        if ($timezone !== null) {
+            if (!self::_validateTimezone($timezone)) {
+                throw new PHPExcel_Exception("Invalid timezone " . $timezone);
+            }
+        } else {
+            $timezone = self::$timezone;
+        }
+
+        if ($timezone == 'UST') {
+            return 0;
+        }
+
+        $objTimezone = new DateTimeZone($timezone);
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+            $transitions = $objTimezone->getTransitions($timestamp, $timestamp);
+        } else {
+            $transitions = self::getTimezoneTransitions($objTimezone, $timestamp);
+        }
+
+        return (count($transitions) > 0) ? $transitions[0]['offset'] : 0;
+    }
+}
diff --git a/lib/PHPExcel/Shared/XMLWriter.php b/lib/PHPExcel/Shared/XMLWriter.php
new file mode 100644
index 000000000..1dc119b50
--- /dev/null
+++ b/lib/PHPExcel/Shared/XMLWriter.php
@@ -0,0 +1,124 @@
+<?php
+
+if (!defined('DATE_W3C')) {
+    define('DATE_W3C', 'Y-m-d\TH:i:sP');
+}
+
+if (!defined('DEBUGMODE_ENABLED')) {
+    define('DEBUGMODE_ENABLED', false);
+}
+
+/**
+ * PHPExcel_Shared_XMLWriter
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_XMLWriter extends XMLWriter
+{
+    /** Temporary storage method */
+    const STORAGE_MEMORY    = 1;
+    const STORAGE_DISK      = 2;
+
+    /**
+     * Temporary filename
+     *
+     * @var string
+     */
+    private $tempFileName  = '';
+
+    /**
+     * Create a new PHPExcel_Shared_XMLWriter instance
+     *
+     * @param int      $pTemporaryStorage        Temporary storage location
+     * @param string   $pTemporaryStorageFolder  Temporary storage folder
+     */
+    public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = null)
+    {
+        // Open temporary storage
+        if ($pTemporaryStorage == self::STORAGE_MEMORY) {
+            $this->openMemory();
+        } else {
+            // Create temporary filename
+            if ($pTemporaryStorageFolder === null) {
+                $pTemporaryStorageFolder = PHPExcel_Shared_File::sys_get_temp_dir();
+            }
+            $this->tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
+
+            // Open storage
+            if ($this->openUri($this->tempFileName) === false) {
+                // Fallback to memory...
+                $this->openMemory();
+            }
+        }
+
+        // Set default values
+        if (DEBUGMODE_ENABLED) {
+            $this->setIndent(true);
+        }
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        // Unlink temporary files
+        if ($this->tempFileName != '') {
+            @unlink($this->tempFileName);
+        }
+    }
+
+    /**
+     * Get written data
+     *
+     * @return $data
+     */
+    public function getData()
+    {
+        if ($this->tempFileName == '') {
+            return $this->outputMemory(true);
+        } else {
+            $this->flush();
+            return file_get_contents($this->tempFileName);
+        }
+    }
+
+    /**
+     * Fallback method for writeRaw, introduced in PHP 5.2
+     *
+     * @param string $text
+     * @return string
+     */
+    public function writeRawData($text)
+    {
+        if (is_array($text)) {
+            $text = implode("\n", $text);
+        }
+
+        if (method_exists($this, 'writeRaw')) {
+            return $this->writeRaw(htmlspecialchars($text));
+        }
+
+        return $this->text($text);
+    }
+}
diff --git a/lib/PHPExcel/Shared/ZipArchive.php b/lib/PHPExcel/Shared/ZipArchive.php
new file mode 100644
index 000000000..9eac8cae0
--- /dev/null
+++ b/lib/PHPExcel/Shared/ZipArchive.php
@@ -0,0 +1,163 @@
+<?php
+
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', PHPExcel_Shared_File::sys_get_temp_dir() . DIRECTORY_SEPARATOR);
+}
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PCLZip/pclzip.lib.php';
+
+/**
+ * PHPExcel_Shared_ZipArchive
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_ZipArchive
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_ZipArchive
+{
+
+    /**    constants */
+    const OVERWRITE = 'OVERWRITE';
+    const CREATE    = 'CREATE';
+
+
+    /**
+     * Temporary storage directory
+     *
+     * @var string
+     */
+    private $tempDir;
+
+    /**
+     * Zip Archive Stream Handle
+     *
+     * @var string
+     */
+    private $zip;
+
+
+    /**
+     * Open a new zip archive
+     *
+     * @param    string    $fileName    Filename for the zip archive
+     * @return    boolean
+     */
+    public function open($fileName)
+    {
+        $this->tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+        $this->zip = new PclZip($fileName);
+
+        return true;
+    }
+
+
+    /**
+     * Close this zip archive
+     *
+     */
+    public function close()
+    {
+    }
+
+
+    /**
+     * Add a new file to the zip archive from a string of raw data.
+     *
+     * @param    string    $localname        Directory/Name of the file to add to the zip archive
+     * @param    string    $contents        String of data to add to the zip archive
+     */
+    public function addFromString($localname, $contents)
+    {
+        $filenameParts = pathinfo($localname);
+
+        $handle = fopen($this->tempDir.'/'.$filenameParts["basename"], "wb");
+        fwrite($handle, $contents);
+        fclose($handle);
+
+        $res = $this->zip->add($this->tempDir.'/'.$filenameParts["basename"], PCLZIP_OPT_REMOVE_PATH, $this->tempDir, PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]);
+        if ($res == 0) {
+            throw new PHPExcel_Writer_Exception("Error zipping files : " . $this->zip->errorInfo(true));
+        }
+
+        unlink($this->tempDir.'/'.$filenameParts["basename"]);
+    }
+
+    /**
+     * Find if given fileName exist in archive (Emulate ZipArchive locateName())
+     *
+     * @param        string        $fileName        Filename for the file in zip archive
+     * @return        boolean
+     */
+    public function locateName($fileName)
+    {
+        $fileName = strtolower($fileName);
+
+        $list = $this->zip->listContent();
+        $listCount = count($list);
+        $index = -1;
+        for ($i = 0; $i < $listCount; ++$i) {
+            if (strtolower($list[$i]["filename"]) == $fileName ||
+                strtolower($list[$i]["stored_filename"]) == $fileName) {
+                $index = $i;
+                break;
+            }
+        }
+        return ($index > -1) ? $index : false;
+    }
+
+    /**
+     * Extract file from archive by given fileName (Emulate ZipArchive getFromName())
+     *
+     * @param        string        $fileName        Filename for the file in zip archive
+     * @return        string  $contents        File string contents
+     */
+    public function getFromName($fileName)
+    {
+        $index = $this->locateName($fileName);
+
+        if ($index !== false) {
+            $extracted = $this->getFromIndex($index);
+        } else {
+            $fileName = substr($fileName, 1);
+            $index = $this->locateName($fileName);
+            if ($index === false) {
+                return false;
+            }
+            $extracted = $this->zip->getFromIndex($index);
+        }
+
+        $contents = $extracted;
+        if ((is_array($extracted)) && ($extracted != 0)) {
+            $contents = $extracted[0]["content"];
+        }
+
+        return $contents;
+    }
+    
+    public function getFromIndex($index) {
+        $extracted = $this->zip->extractByIndex($index, PCLZIP_OPT_EXTRACT_AS_STRING);
+        $contents = '';
+        if ((is_array($extracted)) && ($extracted != 0)) {
+            $contents = $extracted[0]["content"];
+        }
+
+        return $contents;
+    }
+}
diff --git a/lib/PHPExcel/Shared/ZipStreamWrapper.php b/lib/PHPExcel/Shared/ZipStreamWrapper.php
new file mode 100644
index 000000000..c6cbd0dd8
--- /dev/null
+++ b/lib/PHPExcel/Shared/ZipStreamWrapper.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * PHPExcel_Shared_ZipStreamWrapper
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Shared_ZipStreamWrapper
+{
+    /**
+     * Internal ZipAcrhive
+     *
+     * @var ZipArchive
+     */
+    private $archive;
+
+    /**
+     * Filename in ZipAcrhive
+     *
+     * @var string
+     */
+    private $fileNameInArchive = '';
+
+    /**
+     * Position in file
+     *
+     * @var int
+     */
+    private $position = 0;
+
+    /**
+     * Data
+     *
+     * @var mixed
+     */
+    private $data = '';
+
+    /**
+     * Register wrapper
+     */
+    public static function register()
+    {
+        @stream_wrapper_unregister('zip');
+        @stream_wrapper_register('zip', __CLASS__);
+    }
+
+    /**
+     * Implements support for fopen().
+     *
+     * @param    string    $path            resource name including scheme, e.g.
+     * @param    string    $mode            only "r" is supported
+     * @param    int        $options        mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
+     * @param    string  &$openedPath    absolute path of the opened stream (out parameter)
+     * @return    bool    true on success
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        // Check for mode
+        if ($mode[0] != 'r') {
+            throw new PHPExcel_Reader_Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
+        }
+
+        $pos = strrpos($path, '#');
+        $url['host'] = substr($path, 6, $pos - 6); // 6: strlen('zip://')
+        $url['fragment'] = substr($path, $pos + 1);
+
+        // Open archive
+        $this->archive = new ZipArchive();
+        $this->archive->open($url['host']);
+
+        $this->fileNameInArchive = $url['fragment'];
+        $this->position = 0;
+        $this->data = $this->archive->getFromName($this->fileNameInArchive);
+
+        return true;
+    }
+
+    /**
+     * Implements support for fstat().
+     *
+     * @return  boolean
+     */
+    public function statName()
+    {
+        return $this->fileNameInArchive;
+    }
+
+    /**
+     * Implements support for fstat().
+     *
+     * @return  boolean
+     */
+    public function url_stat()
+    {
+        return $this->statName($this->fileNameInArchive);
+    }
+
+    /**
+     * Implements support for fstat().
+     *
+     * @return  boolean
+     */
+    public function stream_stat()
+    {
+        return $this->archive->statName($this->fileNameInArchive);
+    }
+
+    /**
+     * Implements support for fread(), fgets() etc.
+     *
+     * @param   int        $count    maximum number of bytes to read
+     * @return  string
+     */
+    public function stream_read($count)
+    {
+        $ret = substr($this->data, $this->position, $count);
+        $this->position += strlen($ret);
+        return $ret;
+    }
+
+    /**
+     * Returns the position of the file pointer, i.e. its offset into the file
+     * stream. Implements support for ftell().
+     *
+     * @return  int
+     */
+    public function stream_tell()
+    {
+        return $this->position;
+    }
+
+    /**
+     * EOF stream
+     *
+     * @return    bool
+     */
+    public function stream_eof()
+    {
+        return $this->position >= strlen($this->data);
+    }
+
+    /**
+     * Seek stream
+     *
+     * @param    int        $offset    byte offset
+     * @param    int        $whence    SEEK_SET, SEEK_CUR or SEEK_END
+     * @return    bool
+     */
+    public function stream_seek($offset, $whence)
+    {
+        switch ($whence) {
+            case SEEK_SET:
+                if ($offset < strlen($this->data) && $offset >= 0) {
+                     $this->position = $offset;
+                     return true;
+                } else {
+                     return false;
+                }
+                break;
+            case SEEK_CUR:
+                if ($offset >= 0) {
+                     $this->position += $offset;
+                     return true;
+                } else {
+                     return false;
+                }
+                break;
+            case SEEK_END:
+                if (strlen($this->data) + $offset >= 0) {
+                     $this->position = strlen($this->data) + $offset;
+                     return true;
+                } else {
+                     return false;
+                }
+                break;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/bestFitClass.php b/lib/PHPExcel/Shared/trend/bestFitClass.php
new file mode 100644
index 000000000..2de029f96
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/bestFitClass.php
@@ -0,0 +1,425 @@
+<?php
+
+/**
+ * PHPExcel_Best_Fit
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Best_Fit
+{
+    /**
+     * Indicator flag for a calculation error
+     *
+     * @var    boolean
+     **/
+    protected $error = false;
+
+    /**
+     * Algorithm type to use for best-fit
+     *
+     * @var    string
+     **/
+    protected $bestFitType = 'undetermined';
+
+    /**
+     * Number of entries in the sets of x- and y-value arrays
+     *
+     * @var    int
+     **/
+    protected $valueCount = 0;
+
+    /**
+     * X-value dataseries of values
+     *
+     * @var    float[]
+     **/
+    protected $xValues = array();
+
+    /**
+     * Y-value dataseries of values
+     *
+     * @var    float[]
+     **/
+    protected $yValues = array();
+
+    /**
+     * Flag indicating whether values should be adjusted to Y=0
+     *
+     * @var    boolean
+     **/
+    protected $adjustToZero = false;
+
+    /**
+     * Y-value series of best-fit values
+     *
+     * @var    float[]
+     **/
+    protected $yBestFitValues = array();
+
+    protected $goodnessOfFit = 1;
+
+    protected $stdevOfResiduals = 0;
+
+    protected $covariance = 0;
+
+    protected $correlation = 0;
+
+    protected $SSRegression = 0;
+
+    protected $SSResiduals = 0;
+
+    protected $DFResiduals = 0;
+
+    protected $f = 0;
+
+    protected $slope = 0;
+
+    protected $slopeSE = 0;
+
+    protected $intersect = 0;
+
+    protected $intersectSE = 0;
+
+    protected $xOffset = 0;
+
+    protected $yOffset = 0;
+
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+
+    public function getBestFitType()
+    {
+        return $this->bestFitType;
+    }
+
+    /**
+     * Return the Y-Value for a specified value of X
+     *
+     * @param     float        $xValue            X-Value
+     * @return     float                        Y-Value
+     */
+    public function getValueOfYForX($xValue)
+    {
+        return false;
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y
+     *
+     * @param     float        $yValue            Y-Value
+     * @return     float                        X-Value
+     */
+    public function getValueOfXForY($yValue)
+    {
+        return false;
+    }
+
+    /**
+     * Return the original set of X-Values
+     *
+     * @return     float[]                X-Values
+     */
+    public function getXValues()
+    {
+        return $this->xValues;
+    }
+
+    /**
+     * Return the Equation of the best-fit line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     */
+    public function getEquation($dp = 0)
+    {
+        return false;
+    }
+
+    /**
+     * Return the Slope of the line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     */
+    public function getSlope($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->slope, $dp);
+        }
+        return $this->slope;
+    }
+
+    /**
+     * Return the standard error of the Slope
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     */
+    public function getSlopeSE($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->slopeSE, $dp);
+        }
+        return $this->slopeSE;
+    }
+
+    /**
+     * Return the Value of X where it intersects Y = 0
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     */
+    public function getIntersect($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->intersect, $dp);
+        }
+        return $this->intersect;
+    }
+
+    /**
+     * Return the standard error of the Intersect
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     */
+    public function getIntersectSE($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->intersectSE, $dp);
+        }
+        return $this->intersectSE;
+    }
+
+    /**
+     * Return the goodness of fit for this regression
+     *
+     * @param     int        $dp        Number of places of decimal precision to return
+     * @return     float
+     */
+    public function getGoodnessOfFit($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->goodnessOfFit, $dp);
+        }
+        return $this->goodnessOfFit;
+    }
+
+    public function getGoodnessOfFitPercent($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->goodnessOfFit * 100, $dp);
+        }
+        return $this->goodnessOfFit * 100;
+    }
+
+    /**
+     * Return the standard deviation of the residuals for this regression
+     *
+     * @param     int        $dp        Number of places of decimal precision to return
+     * @return     float
+     */
+    public function getStdevOfResiduals($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->stdevOfResiduals, $dp);
+        }
+        return $this->stdevOfResiduals;
+    }
+
+    public function getSSRegression($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->SSRegression, $dp);
+        }
+        return $this->SSRegression;
+    }
+
+    public function getSSResiduals($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->SSResiduals, $dp);
+        }
+        return $this->SSResiduals;
+    }
+
+    public function getDFResiduals($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->DFResiduals, $dp);
+        }
+        return $this->DFResiduals;
+    }
+
+    public function getF($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->f, $dp);
+        }
+        return $this->f;
+    }
+
+    public function getCovariance($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->covariance, $dp);
+        }
+        return $this->covariance;
+    }
+
+    public function getCorrelation($dp = 0)
+    {
+        if ($dp != 0) {
+            return round($this->correlation, $dp);
+        }
+        return $this->correlation;
+    }
+
+    public function getYBestFitValues()
+    {
+        return $this->yBestFitValues;
+    }
+
+    protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const)
+    {
+        $SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
+        foreach ($this->xValues as $xKey => $xValue) {
+            $bestFitY = $this->yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
+
+            $SSres += ($this->yValues[$xKey] - $bestFitY) * ($this->yValues[$xKey] - $bestFitY);
+            if ($const) {
+                $SStot += ($this->yValues[$xKey] - $meanY) * ($this->yValues[$xKey] - $meanY);
+            } else {
+                $SStot += $this->yValues[$xKey] * $this->yValues[$xKey];
+            }
+            $SScov += ($this->xValues[$xKey] - $meanX) * ($this->yValues[$xKey] - $meanY);
+            if ($const) {
+                $SSsex += ($this->xValues[$xKey] - $meanX) * ($this->xValues[$xKey] - $meanX);
+            } else {
+                $SSsex += $this->xValues[$xKey] * $this->xValues[$xKey];
+            }
+        }
+
+        $this->SSResiduals = $SSres;
+        $this->DFResiduals = $this->valueCount - 1 - $const;
+
+        if ($this->DFResiduals == 0.0) {
+            $this->stdevOfResiduals = 0.0;
+        } else {
+            $this->stdevOfResiduals = sqrt($SSres / $this->DFResiduals);
+        }
+        if (($SStot == 0.0) || ($SSres == $SStot)) {
+            $this->goodnessOfFit = 1;
+        } else {
+            $this->goodnessOfFit = 1 - ($SSres / $SStot);
+        }
+
+        $this->SSRegression = $this->goodnessOfFit * $SStot;
+        $this->covariance = $SScov / $this->valueCount;
+        $this->correlation = ($this->valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->valueCount * $sumX2 - pow($sumX, 2)) * ($this->valueCount * $sumY2 - pow($sumY, 2)));
+        $this->slopeSE = $this->stdevOfResiduals / sqrt($SSsex);
+        $this->intersectSE = $this->stdevOfResiduals * sqrt(1 / ($this->valueCount - ($sumX * $sumX) / $sumX2));
+        if ($this->SSResiduals != 0.0) {
+            if ($this->DFResiduals == 0.0) {
+                $this->f = 0.0;
+            } else {
+                $this->f = $this->SSRegression / ($this->SSResiduals / $this->DFResiduals);
+            }
+        } else {
+            if ($this->DFResiduals == 0.0) {
+                $this->f = 0.0;
+            } else {
+                $this->f = $this->SSRegression / $this->DFResiduals;
+            }
+        }
+    }
+
+    protected function leastSquareFit($yValues, $xValues, $const)
+    {
+        // calculate sums
+        $x_sum = array_sum($xValues);
+        $y_sum = array_sum($yValues);
+        $meanX = $x_sum / $this->valueCount;
+        $meanY = $y_sum / $this->valueCount;
+        $mBase = $mDivisor = $xx_sum = $xy_sum = $yy_sum = 0.0;
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            $xy_sum += $xValues[$i] * $yValues[$i];
+            $xx_sum += $xValues[$i] * $xValues[$i];
+            $yy_sum += $yValues[$i] * $yValues[$i];
+
+            if ($const) {
+                $mBase += ($xValues[$i] - $meanX) * ($yValues[$i] - $meanY);
+                $mDivisor += ($xValues[$i] - $meanX) * ($xValues[$i] - $meanX);
+            } else {
+                $mBase += $xValues[$i] * $yValues[$i];
+                $mDivisor += $xValues[$i] * $xValues[$i];
+            }
+        }
+
+        // calculate slope
+//        $this->slope = (($this->valueCount * $xy_sum) - ($x_sum * $y_sum)) / (($this->valueCount * $xx_sum) - ($x_sum * $x_sum));
+        $this->slope = $mBase / $mDivisor;
+
+        // calculate intersect
+//        $this->intersect = ($y_sum - ($this->slope * $x_sum)) / $this->valueCount;
+        if ($const) {
+            $this->intersect = $meanY - ($this->slope * $meanX);
+        } else {
+            $this->intersect = 0;
+        }
+
+        $this->calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum, $meanX, $meanY, $const);
+    }
+
+    /**
+     * Define the regression
+     *
+     * @param    float[]        $yValues    The set of Y-values for this regression
+     * @param    float[]        $xValues    The set of X-values for this regression
+     * @param    boolean        $const
+     */
+    public function __construct($yValues, $xValues = array(), $const = true)
+    {
+        //    Calculate number of points
+        $nY = count($yValues);
+        $nX = count($xValues);
+
+        //    Define X Values if necessary
+        if ($nX == 0) {
+            $xValues = range(1, $nY);
+            $nX = $nY;
+        } elseif ($nY != $nX) {
+            //    Ensure both arrays of points are the same size
+            $this->error = true;
+            return false;
+        }
+
+        $this->valueCount = $nY;
+        $this->xValues = $xValues;
+        $this->yValues = $yValues;
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/exponentialBestFitClass.php b/lib/PHPExcel/Shared/trend/exponentialBestFitClass.php
new file mode 100644
index 000000000..444873525
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/exponentialBestFitClass.php
@@ -0,0 +1,138 @@
+<?php
+
+require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
+
+/**
+ * PHPExcel_Exponential_Best_Fit
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this trend class)
+     *
+     * @var    string
+     **/
+    protected $bestFitType        = 'exponential';
+
+    /**
+     * Return the Y-Value for a specified value of X
+     *
+     * @param     float        $xValue            X-Value
+     * @return     float                        Y-Value
+     **/
+    public function getValueOfYForX($xValue)
+    {
+        return $this->getIntersect() * pow($this->getSlope(), ($xValue - $this->xOffset));
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y
+     *
+     * @param     float        $yValue            Y-Value
+     * @return     float                        X-Value
+     **/
+    public function getValueOfXForY($yValue)
+    {
+        return log(($yValue + $this->yOffset) / $this->getIntersect()) / log($this->getSlope());
+    }
+
+    /**
+     * Return the Equation of the best-fit line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getEquation($dp = 0)
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $intersect . ' * ' . $slope . '^X';
+    }
+
+    /**
+     * Return the Slope of the line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getSlope($dp = 0)
+    {
+        if ($dp != 0) {
+            return round(exp($this->_slope), $dp);
+        }
+        return exp($this->_slope);
+    }
+
+    /**
+     * Return the Value of X where it intersects Y = 0
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getIntersect($dp = 0)
+    {
+        if ($dp != 0) {
+            return round(exp($this->intersect), $dp);
+        }
+        return exp($this->intersect);
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param     float[]    $yValues    The set of Y-values for this regression
+     * @param     float[]    $xValues    The set of X-values for this regression
+     * @param     boolean    $const
+     */
+    private function exponentialRegression($yValues, $xValues, $const)
+    {
+        foreach ($yValues as &$value) {
+            if ($value < 0.0) {
+                $value = 0 - log(abs($value));
+            } elseif ($value > 0.0) {
+                $value = log($value);
+            }
+        }
+        unset($value);
+
+        $this->leastSquareFit($yValues, $xValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param    float[]        $yValues    The set of Y-values for this regression
+     * @param    float[]        $xValues    The set of X-values for this regression
+     * @param    boolean        $const
+     */
+    public function __construct($yValues, $xValues = array(), $const = true)
+    {
+        if (parent::__construct($yValues, $xValues) !== false) {
+            $this->exponentialRegression($yValues, $xValues, $const);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/linearBestFitClass.php b/lib/PHPExcel/Shared/trend/linearBestFitClass.php
new file mode 100644
index 000000000..76b55b3e7
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/linearBestFitClass.php
@@ -0,0 +1,102 @@
+<?php
+
+require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
+
+/**
+ * PHPExcel_Linear_Best_Fit
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this trend class)
+     *
+     * @var    string
+     **/
+    protected $bestFitType        = 'linear';
+
+    /**
+     * Return the Y-Value for a specified value of X
+     *
+     * @param     float        $xValue            X-Value
+     * @return     float                        Y-Value
+     **/
+    public function getValueOfYForX($xValue)
+    {
+        return $this->getIntersect() + $this->getSlope() * $xValue;
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y
+     *
+     * @param     float        $yValue            Y-Value
+     * @return     float                        X-Value
+     **/
+    public function getValueOfXForY($yValue)
+    {
+        return ($yValue - $this->getIntersect()) / $this->getSlope();
+    }
+
+
+    /**
+     * Return the Equation of the best-fit line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getEquation($dp = 0)
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $intersect . ' + ' . $slope . ' * X';
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param     float[]    $yValues    The set of Y-values for this regression
+     * @param     float[]    $xValues    The set of X-values for this regression
+     * @param     boolean    $const
+     */
+    private function linearRegression($yValues, $xValues, $const)
+    {
+        $this->leastSquareFit($yValues, $xValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param    float[]        $yValues    The set of Y-values for this regression
+     * @param    float[]        $xValues    The set of X-values for this regression
+     * @param    boolean        $const
+     */
+    public function __construct($yValues, $xValues = array(), $const = true)
+    {
+        if (parent::__construct($yValues, $xValues) !== false) {
+            $this->linearRegression($yValues, $xValues, $const);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/lib/PHPExcel/Shared/trend/logarithmicBestFitClass.php
new file mode 100644
index 000000000..221c53869
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/logarithmicBestFitClass.php
@@ -0,0 +1,110 @@
+<?php
+
+require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
+
+/**
+ * PHPExcel_Logarithmic_Best_Fit
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this trend class)
+     *
+     * @var    string
+     **/
+    protected $bestFitType        = 'logarithmic';
+
+    /**
+     * Return the Y-Value for a specified value of X
+     *
+     * @param     float        $xValue            X-Value
+     * @return     float                        Y-Value
+     **/
+    public function getValueOfYForX($xValue)
+    {
+        return $this->getIntersect() + $this->getSlope() * log($xValue - $this->xOffset);
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y
+     *
+     * @param     float        $yValue            Y-Value
+     * @return     float                        X-Value
+     **/
+    public function getValueOfXForY($yValue)
+    {
+        return exp(($yValue - $this->getIntersect()) / $this->getSlope());
+    }
+
+    /**
+     * Return the Equation of the best-fit line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getEquation($dp = 0)
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = '.$intersect.' + '.$slope.' * log(X)';
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param     float[]    $yValues    The set of Y-values for this regression
+     * @param     float[]    $xValues    The set of X-values for this regression
+     * @param     boolean    $const
+     */
+    private function logarithmicRegression($yValues, $xValues, $const)
+    {
+        foreach ($xValues as &$value) {
+            if ($value < 0.0) {
+                $value = 0 - log(abs($value));
+            } elseif ($value > 0.0) {
+                $value = log($value);
+            }
+        }
+        unset($value);
+
+        $this->leastSquareFit($yValues, $xValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param    float[]        $yValues    The set of Y-values for this regression
+     * @param    float[]        $xValues    The set of X-values for this regression
+     * @param    boolean        $const
+     */
+    public function __construct($yValues, $xValues = array(), $const = true)
+    {
+        if (parent::__construct($yValues, $xValues) !== false) {
+            $this->logarithmicRegression($yValues, $xValues, $const);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/polynomialBestFitClass.php b/lib/PHPExcel/Shared/trend/polynomialBestFitClass.php
new file mode 100644
index 000000000..8a882b743
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/polynomialBestFitClass.php
@@ -0,0 +1,222 @@
+<?php
+
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/JAMA/Matrix.php';
+
+/**
+ * PHPExcel_Polynomial_Best_Fit
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this trend class)
+     *
+     * @var    string
+     **/
+    protected $bestFitType = 'polynomial';
+
+    /**
+     * Polynomial order
+     *
+     * @protected
+     * @var    int
+     **/
+    protected $order = 0;
+
+
+    /**
+     * Return the order of this polynomial
+     *
+     * @return     int
+     **/
+    public function getOrder()
+    {
+        return $this->order;
+    }
+
+
+    /**
+     * Return the Y-Value for a specified value of X
+     *
+     * @param     float        $xValue            X-Value
+     * @return     float                        Y-Value
+     **/
+    public function getValueOfYForX($xValue)
+    {
+        $retVal = $this->getIntersect();
+        $slope = $this->getSlope();
+        foreach ($slope as $key => $value) {
+            if ($value != 0.0) {
+                $retVal += $value * pow($xValue, $key + 1);
+            }
+        }
+        return $retVal;
+    }
+
+
+    /**
+     * Return the X-Value for a specified value of Y
+     *
+     * @param     float        $yValue            Y-Value
+     * @return     float                        X-Value
+     **/
+    public function getValueOfXForY($yValue)
+    {
+        return ($yValue - $this->getIntersect()) / $this->getSlope();
+    }
+
+
+    /**
+     * Return the Equation of the best-fit line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getEquation($dp = 0)
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        $equation = 'Y = ' . $intersect;
+        foreach ($slope as $key => $value) {
+            if ($value != 0.0) {
+                $equation .= ' + ' . $value . ' * X';
+                if ($key > 0) {
+                    $equation .= '^' . ($key + 1);
+                }
+            }
+        }
+        return $equation;
+    }
+
+
+    /**
+     * Return the Slope of the line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getSlope($dp = 0)
+    {
+        if ($dp != 0) {
+            $coefficients = array();
+            foreach ($this->_slope as $coefficient) {
+                $coefficients[] = round($coefficient, $dp);
+            }
+            return $coefficients;
+        }
+        return $this->_slope;
+    }
+
+
+    public function getCoefficients($dp = 0)
+    {
+        return array_merge(array($this->getIntersect($dp)), $this->getSlope($dp));
+    }
+
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param    int            $order        Order of Polynomial for this regression
+     * @param    float[]        $yValues    The set of Y-values for this regression
+     * @param    float[]        $xValues    The set of X-values for this regression
+     * @param    boolean        $const
+     */
+    private function polynomialRegression($order, $yValues, $xValues, $const)
+    {
+        // calculate sums
+        $x_sum = array_sum($xValues);
+        $y_sum = array_sum($yValues);
+        $xx_sum = $xy_sum = 0;
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            $xy_sum += $xValues[$i] * $yValues[$i];
+            $xx_sum += $xValues[$i] * $xValues[$i];
+            $yy_sum += $yValues[$i] * $yValues[$i];
+        }
+        /*
+         *    This routine uses logic from the PHP port of polyfit version 0.1
+         *    written by Michael Bommarito and Paul Meagher
+         *
+         *    The function fits a polynomial function of order $order through
+         *    a series of x-y data points using least squares.
+         *
+         */
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            for ($j = 0; $j <= $order; ++$j) {
+                $A[$i][$j] = pow($xValues[$i], $j);
+            }
+        }
+        for ($i=0; $i < $this->valueCount; ++$i) {
+            $B[$i] = array($yValues[$i]);
+        }
+        $matrixA = new Matrix($A);
+        $matrixB = new Matrix($B);
+        $C = $matrixA->solve($matrixB);
+
+        $coefficients = array();
+        for ($i = 0; $i < $C->m; ++$i) {
+            $r = $C->get($i, 0);
+            if (abs($r) <= pow(10, -9)) {
+                $r = 0;
+            }
+            $coefficients[] = $r;
+        }
+
+        $this->intersect = array_shift($coefficients);
+        $this->_slope = $coefficients;
+
+        $this->calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum);
+        foreach ($this->xValues as $xKey => $xValue) {
+            $this->yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
+        }
+    }
+
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param    int            $order        Order of Polynomial for this regression
+     * @param    float[]        $yValues    The set of Y-values for this regression
+     * @param    float[]        $xValues    The set of X-values for this regression
+     * @param    boolean        $const
+     */
+    public function __construct($order, $yValues, $xValues = array(), $const = true)
+    {
+        if (parent::__construct($yValues, $xValues) !== false) {
+            if ($order < $this->valueCount) {
+                $this->bestFitType .= '_'.$order;
+                $this->order = $order;
+                $this->polynomialRegression($order, $yValues, $xValues, $const);
+                if (($this->getGoodnessOfFit() < 0.0) || ($this->getGoodnessOfFit() > 1.0)) {
+                    $this->_error = true;
+                }
+            } else {
+                $this->_error = true;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/powerBestFitClass.php b/lib/PHPExcel/Shared/trend/powerBestFitClass.php
new file mode 100644
index 000000000..77c473429
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/powerBestFitClass.php
@@ -0,0 +1,138 @@
+<?php
+
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
+
+/**
+ * PHPExcel_Power_Best_Fit
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this trend class)
+     *
+     * @var    string
+     **/
+    protected $bestFitType        = 'power';
+
+
+    /**
+     * Return the Y-Value for a specified value of X
+     *
+     * @param     float        $xValue            X-Value
+     * @return     float                        Y-Value
+     **/
+    public function getValueOfYForX($xValue)
+    {
+        return $this->getIntersect() * pow(($xValue - $this->xOffset), $this->getSlope());
+    }
+
+
+    /**
+     * Return the X-Value for a specified value of Y
+     *
+     * @param     float        $yValue            Y-Value
+     * @return     float                        X-Value
+     **/
+    public function getValueOfXForY($yValue)
+    {
+        return pow((($yValue + $this->yOffset) / $this->getIntersect()), (1 / $this->getSlope()));
+    }
+
+
+    /**
+     * Return the Equation of the best-fit line
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getEquation($dp = 0)
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $intersect . ' * X^' . $slope;
+    }
+
+
+    /**
+     * Return the Value of X where it intersects Y = 0
+     *
+     * @param     int        $dp        Number of places of decimal precision to display
+     * @return     string
+     **/
+    public function getIntersect($dp = 0)
+    {
+        if ($dp != 0) {
+            return round(exp($this->intersect), $dp);
+        }
+        return exp($this->intersect);
+    }
+
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param     float[]    $yValues    The set of Y-values for this regression
+     * @param     float[]    $xValues    The set of X-values for this regression
+     * @param     boolean    $const
+     */
+    private function powerRegression($yValues, $xValues, $const)
+    {
+        foreach ($xValues as &$value) {
+            if ($value < 0.0) {
+                $value = 0 - log(abs($value));
+            } elseif ($value > 0.0) {
+                $value = log($value);
+            }
+        }
+        unset($value);
+        foreach ($yValues as &$value) {
+            if ($value < 0.0) {
+                $value = 0 - log(abs($value));
+            } elseif ($value > 0.0) {
+                $value = log($value);
+            }
+        }
+        unset($value);
+
+        $this->leastSquareFit($yValues, $xValues, $const);
+    }
+
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values
+     *
+     * @param     float[]    $yValues    The set of Y-values for this regression
+     * @param     float[]    $xValues    The set of X-values for this regression
+     * @param     boolean    $const
+     */
+    public function __construct($yValues, $xValues = array(), $const = true)
+    {
+        if (parent::__construct($yValues, $xValues) !== false) {
+            $this->powerRegression($yValues, $xValues, $const);
+        }
+    }
+}
diff --git a/lib/PHPExcel/Shared/trend/trendClass.php b/lib/PHPExcel/Shared/trend/trendClass.php
new file mode 100644
index 000000000..715cd4124
--- /dev/null
+++ b/lib/PHPExcel/Shared/trend/trendClass.php
@@ -0,0 +1,147 @@
+<?php
+
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/linearBestFitClass.php';
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/logarithmicBestFitClass.php';
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/exponentialBestFitClass.php';
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/powerBestFitClass.php';
+require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/polynomialBestFitClass.php';
+
+/**
+ * PHPExcel_trendClass
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class trendClass
+{
+    const TREND_LINEAR            = 'Linear';
+    const TREND_LOGARITHMIC       = 'Logarithmic';
+    const TREND_EXPONENTIAL       = 'Exponential';
+    const TREND_POWER             = 'Power';
+    const TREND_POLYNOMIAL_2      = 'Polynomial_2';
+    const TREND_POLYNOMIAL_3      = 'Polynomial_3';
+    const TREND_POLYNOMIAL_4      = 'Polynomial_4';
+    const TREND_POLYNOMIAL_5      = 'Polynomial_5';
+    const TREND_POLYNOMIAL_6      = 'Polynomial_6';
+    const TREND_BEST_FIT          = 'Bestfit';
+    const TREND_BEST_FIT_NO_POLY  = 'Bestfit_no_Polynomials';
+
+    /**
+     * Names of the best-fit trend analysis methods
+     *
+     * @var string[]
+     **/
+    private static $trendTypes = array(
+        self::TREND_LINEAR,
+        self::TREND_LOGARITHMIC,
+        self::TREND_EXPONENTIAL,
+        self::TREND_POWER
+    );
+
+    /**
+     * Names of the best-fit trend polynomial orders
+     *
+     * @var string[]
+     **/
+    private static $trendTypePolynomialOrders = array(
+        self::TREND_POLYNOMIAL_2,
+        self::TREND_POLYNOMIAL_3,
+        self::TREND_POLYNOMIAL_4,
+        self::TREND_POLYNOMIAL_5,
+        self::TREND_POLYNOMIAL_6
+    );
+
+    /**
+     * Cached results for each method when trying to identify which provides the best fit
+     *
+     * @var PHPExcel_Best_Fit[]
+     **/
+    private static $trendCache = array();
+
+
+    public static function calculate($trendType = self::TREND_BEST_FIT, $yValues, $xValues = array(), $const = true)
+    {
+        //    Calculate number of points in each dataset
+        $nY = count($yValues);
+        $nX = count($xValues);
+
+        //    Define X Values if necessary
+        if ($nX == 0) {
+            $xValues = range(1, $nY);
+            $nX = $nY;
+        } elseif ($nY != $nX) {
+            //    Ensure both arrays of points are the same size
+            trigger_error("trend(): Number of elements in coordinate arrays do not match.", E_USER_ERROR);
+        }
+
+        $key = md5($trendType.$const.serialize($yValues).serialize($xValues));
+        //    Determine which trend method has been requested
+        switch ($trendType) {
+            //    Instantiate and return the class for the requested trend method
+            case self::TREND_LINEAR:
+            case self::TREND_LOGARITHMIC:
+            case self::TREND_EXPONENTIAL:
+            case self::TREND_POWER:
+                if (!isset(self::$trendCache[$key])) {
+                    $className = 'PHPExcel_'.$trendType.'_Best_Fit';
+                    self::$trendCache[$key] = new $className($yValues, $xValues, $const);
+                }
+                return self::$trendCache[$key];
+            case self::TREND_POLYNOMIAL_2:
+            case self::TREND_POLYNOMIAL_3:
+            case self::TREND_POLYNOMIAL_4:
+            case self::TREND_POLYNOMIAL_5:
+            case self::TREND_POLYNOMIAL_6:
+                if (!isset(self::$trendCache[$key])) {
+                    $order = substr($trendType, -1);
+                    self::$trendCache[$key] = new PHPExcel_Polynomial_Best_Fit($order, $yValues, $xValues, $const);
+                }
+                return self::$trendCache[$key];
+            case self::TREND_BEST_FIT:
+            case self::TREND_BEST_FIT_NO_POLY:
+                //    If the request is to determine the best fit regression, then we test each trend line in turn
+                //    Start by generating an instance of each available trend method
+                foreach (self::$trendTypes as $trendMethod) {
+                    $className = 'PHPExcel_'.$trendMethod.'BestFit';
+                    $bestFit[$trendMethod] = new $className($yValues, $xValues, $const);
+                    $bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
+                }
+                if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
+                    foreach (self::$trendTypePolynomialOrders as $trendMethod) {
+                        $order = substr($trendMethod, -1);
+                        $bestFit[$trendMethod] = new PHPExcel_Polynomial_Best_Fit($order, $yValues, $xValues, $const);
+                        if ($bestFit[$trendMethod]->getError()) {
+                            unset($bestFit[$trendMethod]);
+                        } else {
+                            $bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
+                        }
+                    }
+                }
+                //    Determine which of our trend lines is the best fit, and then we return the instance of that trend class
+                arsort($bestFitValue);
+                $bestFitType = key($bestFitValue);
+                return $bestFit[$bestFitType];
+            default:
+                return false;
+        }
+    }
+}
diff --git a/lib/PHPExcel/Style.php b/lib/PHPExcel/Style.php
new file mode 100644
index 000000000..6b952ef94
--- /dev/null
+++ b/lib/PHPExcel/Style.php
@@ -0,0 +1,644 @@
+<?php
+
+/**
+ * PHPExcel_Style
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /**
+     * Font
+     *
+     * @var PHPExcel_Style_Font
+     */
+    protected $font;
+
+    /**
+     * Fill
+     *
+     * @var PHPExcel_Style_Fill
+     */
+    protected $fill;
+
+    /**
+     * Borders
+     *
+     * @var PHPExcel_Style_Borders
+     */
+    protected $borders;
+
+    /**
+     * Alignment
+     *
+     * @var PHPExcel_Style_Alignment
+     */
+    protected $alignment;
+
+    /**
+     * Number Format
+     *
+     * @var PHPExcel_Style_NumberFormat
+     */
+    protected $numberFormat;
+
+    /**
+     * Conditional styles
+     *
+     * @var PHPExcel_Style_Conditional[]
+     */
+    protected $conditionalStyles;
+
+    /**
+     * Protection
+     *
+     * @var PHPExcel_Style_Protection
+     */
+    protected $protection;
+
+    /**
+     * Index of style in collection. Only used for real style.
+     *
+     * @var int
+     */
+    protected $index;
+
+    /**
+     * Use Quote Prefix when displaying in cell editor. Only used for real style.
+     *
+     * @var boolean
+     */
+    protected $quotePrefix = false;
+
+    /**
+     * Create a new PHPExcel_Style
+     *
+     * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
+     *         Leave this value at default unless you understand exactly what
+     *    its ramifications are
+     * @param boolean $isConditional Flag indicating if this is a conditional style or not
+     *       Leave this value at default unless you understand exactly what
+     *    its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        $this->isSupervisor = $isSupervisor;
+
+        // Initialise values
+        $this->conditionalStyles = array();
+        $this->font         = new PHPExcel_Style_Font($isSupervisor, $isConditional);
+        $this->fill         = new PHPExcel_Style_Fill($isSupervisor, $isConditional);
+        $this->borders      = new PHPExcel_Style_Borders($isSupervisor, $isConditional);
+        $this->alignment    = new PHPExcel_Style_Alignment($isSupervisor, $isConditional);
+        $this->numberFormat = new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional);
+        $this->protection   = new PHPExcel_Style_Protection($isSupervisor, $isConditional);
+
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->font->bindParent($this);
+            $this->fill->bindParent($this);
+            $this->borders->bindParent($this);
+            $this->alignment->bindParent($this);
+            $this->numberFormat->bindParent($this);
+            $this->protection->bindParent($this);
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style
+     */
+    public function getSharedComponent()
+    {
+        $activeSheet = $this->getActiveSheet();
+        $selectedCell = $this->getActiveCell(); // e.g. 'A1'
+
+        if ($activeSheet->cellExists($selectedCell)) {
+            $xfIndex = $activeSheet->getCell($selectedCell)->getXfIndex();
+        } else {
+            $xfIndex = 0;
+        }
+
+        return $this->parent->getCellXfByIndex($xfIndex);
+    }
+
+    /**
+     * Get parent. Only used for style supervisor
+     *
+     * @return PHPExcel
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('quotePrefix' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->applyFromArray(
+     *         array(
+     *             'font'    => array(
+     *                 'name'      => 'Arial',
+     *                 'bold'      => true,
+     *                 'italic'    => false,
+     *                 'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
+     *                 'strike'    => false,
+     *                 'color'     => array(
+     *                     'rgb' => '808080'
+     *                 )
+     *             ),
+     *             'borders' => array(
+     *                 'bottom'     => array(
+     *                     'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+     *                     'color' => array(
+     *                         'rgb' => '808080'
+     *                     )
+     *                 ),
+     *                 'top'     => array(
+     *                     'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+     *                     'color' => array(
+     *                         'rgb' => '808080'
+     *                     )
+     *                 )
+     *             ),
+     *             'quotePrefix'    => true
+     *         )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @param     boolean        $pAdvanced    Advanced mode for setting borders.
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style
+     */
+    public function applyFromArray($pStyles = null, $pAdvanced = true)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $pRange = $this->getSelectedCells();
+
+                // Uppercase coordinate
+                $pRange = strtoupper($pRange);
+
+                // Is it a cell range or a single cell?
+                if (strpos($pRange, ':') === false) {
+                    $rangeA = $pRange;
+                    $rangeB = $pRange;
+                } else {
+                    list($rangeA, $rangeB) = explode(':', $pRange);
+                }
+
+                // Calculate range outer borders
+                $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
+                $rangeEnd   = PHPExcel_Cell::coordinateFromString($rangeB);
+
+                // Translate column into index
+                $rangeStart[0]    = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
+                $rangeEnd[0]    = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+
+                // Make sure we can loop upwards on rows and columns
+                if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
+                    $tmp = $rangeStart;
+                    $rangeStart = $rangeEnd;
+                    $rangeEnd = $tmp;
+                }
+
+                // ADVANCED MODE:
+                if ($pAdvanced && isset($pStyles['borders'])) {
+                    // 'allborders' is a shorthand property for 'outline' and 'inside' and
+                    //        it applies to components that have not been set explicitly
+                    if (isset($pStyles['borders']['allborders'])) {
+                        foreach (array('outline', 'inside') as $component) {
+                            if (!isset($pStyles['borders'][$component])) {
+                                $pStyles['borders'][$component] = $pStyles['borders']['allborders'];
+                            }
+                        }
+                        unset($pStyles['borders']['allborders']); // not needed any more
+                    }
+                    // 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left'
+                    //        it applies to components that have not been set explicitly
+                    if (isset($pStyles['borders']['outline'])) {
+                        foreach (array('top', 'right', 'bottom', 'left') as $component) {
+                            if (!isset($pStyles['borders'][$component])) {
+                                $pStyles['borders'][$component] = $pStyles['borders']['outline'];
+                            }
+                        }
+                        unset($pStyles['borders']['outline']); // not needed any more
+                    }
+                    // 'inside' is a shorthand property for 'vertical' and 'horizontal'
+                    //        it applies to components that have not been set explicitly
+                    if (isset($pStyles['borders']['inside'])) {
+                        foreach (array('vertical', 'horizontal') as $component) {
+                            if (!isset($pStyles['borders'][$component])) {
+                                $pStyles['borders'][$component] = $pStyles['borders']['inside'];
+                            }
+                        }
+                        unset($pStyles['borders']['inside']); // not needed any more
+                    }
+                    // width and height characteristics of selection, 1, 2, or 3 (for 3 or more)
+                    $xMax = min($rangeEnd[0] - $rangeStart[0] + 1, 3);
+                    $yMax = min($rangeEnd[1] - $rangeStart[1] + 1, 3);
+
+                    // loop through up to 3 x 3 = 9 regions
+                    for ($x = 1; $x <= $xMax; ++$x) {
+                        // start column index for region
+                        $colStart = ($x == 3) ?
+                            PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0])
+                                : PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $x - 1);
+                        // end column index for region
+                        $colEnd = ($x == 1) ?
+                            PHPExcel_Cell::stringFromColumnIndex($rangeStart[0])
+                                : PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
+
+                        for ($y = 1; $y <= $yMax; ++$y) {
+                            // which edges are touching the region
+                            $edges = array();
+                            if ($x == 1) {
+                                // are we at left edge
+                                $edges[] = 'left';
+                            }
+                            if ($x == $xMax) {
+                                // are we at right edge
+                                $edges[] = 'right';
+                            }
+                            if ($y == 1) {
+                                // are we at top edge?
+                                $edges[] = 'top';
+                            }
+                            if ($y == $yMax) {
+                                // are we at bottom edge?
+                                $edges[] = 'bottom';
+                            }
+
+                            // start row index for region
+                            $rowStart = ($y == 3) ?
+                                $rangeEnd[1] : $rangeStart[1] + $y - 1;
+
+                            // end row index for region
+                            $rowEnd = ($y == 1) ?
+                                $rangeStart[1] : $rangeEnd[1] - $yMax + $y;
+
+                            // build range for region
+                            $range = $colStart . $rowStart . ':' . $colEnd . $rowEnd;
+
+                            // retrieve relevant style array for region
+                            $regionStyles = $pStyles;
+                            unset($regionStyles['borders']['inside']);
+
+                            // what are the inner edges of the region when looking at the selection
+                            $innerEdges = array_diff(array('top', 'right', 'bottom', 'left'), $edges);
+
+                            // inner edges that are not touching the region should take the 'inside' border properties if they have been set
+                            foreach ($innerEdges as $innerEdge) {
+                                switch ($innerEdge) {
+                                    case 'top':
+                                    case 'bottom':
+                                        // should pick up 'horizontal' border property if set
+                                        if (isset($pStyles['borders']['horizontal'])) {
+                                            $regionStyles['borders'][$innerEdge] = $pStyles['borders']['horizontal'];
+                                        } else {
+                                            unset($regionStyles['borders'][$innerEdge]);
+                                        }
+                                        break;
+                                    case 'left':
+                                    case 'right':
+                                        // should pick up 'vertical' border property if set
+                                        if (isset($pStyles['borders']['vertical'])) {
+                                            $regionStyles['borders'][$innerEdge] = $pStyles['borders']['vertical'];
+                                        } else {
+                                            unset($regionStyles['borders'][$innerEdge]);
+                                        }
+                                        break;
+                                }
+                            }
+
+                            // apply region style to region by calling applyFromArray() in simple mode
+                            $this->getActiveSheet()->getStyle($range)->applyFromArray($regionStyles, false);
+                        }
+                    }
+                    return $this;
+                }
+
+                // SIMPLE MODE:
+                // Selection type, inspect
+                if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) {
+                    $selectionType = 'COLUMN';
+                } elseif (preg_match('/^A[0-9]+:XFD[0-9]+$/', $pRange)) {
+                    $selectionType = 'ROW';
+                } else {
+                    $selectionType = 'CELL';
+                }
+
+                // First loop through columns, rows, or cells to find out which styles are affected by this operation
+                switch ($selectionType) {
+                    case 'COLUMN':
+                        $oldXfIndexes = array();
+                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                            $oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
+                        }
+                        break;
+                    case 'ROW':
+                        $oldXfIndexes = array();
+                        for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                            if ($this->getActiveSheet()->getRowDimension($row)->getXfIndex() == null) {
+                                $oldXfIndexes[0] = true; // row without explicit style should be formatted based on default style
+                            } else {
+                                $oldXfIndexes[$this->getActiveSheet()->getRowDimension($row)->getXfIndex()] = true;
+                            }
+                        }
+                        break;
+                    case 'CELL':
+                        $oldXfIndexes = array();
+                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                                $oldXfIndexes[$this->getActiveSheet()->getCellByColumnAndRow($col, $row)->getXfIndex()] = true;
+                            }
+                        }
+                        break;
+                }
+
+                // clone each of the affected styles, apply the style array, and add the new styles to the workbook
+                $workbook = $this->getActiveSheet()->getParent();
+                foreach ($oldXfIndexes as $oldXfIndex => $dummy) {
+                    $style = $workbook->getCellXfByIndex($oldXfIndex);
+                    $newStyle = clone $style;
+                    $newStyle->applyFromArray($pStyles);
+
+                    if ($existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode())) {
+                        // there is already such cell Xf in our collection
+                        $newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
+                    } else {
+                        // we don't have such a cell Xf, need to add
+                        $workbook->addCellXf($newStyle);
+                        $newXfIndexes[$oldXfIndex] = $newStyle->getIndex();
+                    }
+                }
+
+                // Loop through columns, rows, or cells again and update the XF index
+                switch ($selectionType) {
+                    case 'COLUMN':
+                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                            $columnDimension = $this->getActiveSheet()->getColumnDimensionByColumn($col);
+                            $oldXfIndex = $columnDimension->getXfIndex();
+                            $columnDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
+                        }
+                        break;
+
+                    case 'ROW':
+                        for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                            $rowDimension = $this->getActiveSheet()->getRowDimension($row);
+                            $oldXfIndex = $rowDimension->getXfIndex() === null ?
+                                0 : $rowDimension->getXfIndex(); // row without explicit style should be formatted based on default style
+                            $rowDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
+                        }
+                        break;
+
+                    case 'CELL':
+                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                                $cell = $this->getActiveSheet()->getCellByColumnAndRow($col, $row);
+                                $oldXfIndex = $cell->getXfIndex();
+                                $cell->setXfIndex($newXfIndexes[$oldXfIndex]);
+                            }
+                        }
+                        break;
+                }
+
+            } else {
+                // not a supervisor, just apply the style array directly on style object
+                if (array_key_exists('fill', $pStyles)) {
+                    $this->getFill()->applyFromArray($pStyles['fill']);
+                }
+                if (array_key_exists('font', $pStyles)) {
+                    $this->getFont()->applyFromArray($pStyles['font']);
+                }
+                if (array_key_exists('borders', $pStyles)) {
+                    $this->getBorders()->applyFromArray($pStyles['borders']);
+                }
+                if (array_key_exists('alignment', $pStyles)) {
+                    $this->getAlignment()->applyFromArray($pStyles['alignment']);
+                }
+                if (array_key_exists('numberformat', $pStyles)) {
+                    $this->getNumberFormat()->applyFromArray($pStyles['numberformat']);
+                }
+                if (array_key_exists('protection', $pStyles)) {
+                    $this->getProtection()->applyFromArray($pStyles['protection']);
+                }
+                if (array_key_exists('quotePrefix', $pStyles)) {
+                    $this->quotePrefix = $pStyles['quotePrefix'];
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Fill
+     *
+     * @return PHPExcel_Style_Fill
+     */
+    public function getFill()
+    {
+        return $this->fill;
+    }
+
+    /**
+     * Get Font
+     *
+     * @return PHPExcel_Style_Font
+     */
+    public function getFont()
+    {
+        return $this->font;
+    }
+
+    /**
+     * Set font
+     *
+     * @param PHPExcel_Style_Font $font
+     * @return PHPExcel_Style
+     */
+    public function setFont(PHPExcel_Style_Font $font)
+    {
+        $this->font = $font;
+        return $this;
+    }
+
+    /**
+     * Get Borders
+     *
+     * @return PHPExcel_Style_Borders
+     */
+    public function getBorders()
+    {
+        return $this->borders;
+    }
+
+    /**
+     * Get Alignment
+     *
+     * @return PHPExcel_Style_Alignment
+     */
+    public function getAlignment()
+    {
+        return $this->alignment;
+    }
+
+    /**
+     * Get Number Format
+     *
+     * @return PHPExcel_Style_NumberFormat
+     */
+    public function getNumberFormat()
+    {
+        return $this->numberFormat;
+    }
+
+    /**
+     * Get Conditional Styles. Only used on supervisor.
+     *
+     * @return PHPExcel_Style_Conditional[]
+     */
+    public function getConditionalStyles()
+    {
+        return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
+    }
+
+    /**
+     * Set Conditional Styles. Only used on supervisor.
+     *
+     * @param PHPExcel_Style_Conditional[] $pValue Array of condtional styles
+     * @return PHPExcel_Style
+     */
+    public function setConditionalStyles($pValue = null)
+    {
+        if (is_array($pValue)) {
+            $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
+        }
+        return $this;
+    }
+
+    /**
+     * Get Protection
+     *
+     * @return PHPExcel_Style_Protection
+     */
+    public function getProtection()
+    {
+        return $this->protection;
+    }
+
+    /**
+     * Get quote prefix
+     *
+     * @return boolean
+     */
+    public function getQuotePrefix()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getQuotePrefix();
+        }
+        return $this->quotePrefix;
+    }
+
+    /**
+     * Set quote prefix
+     *
+     * @param boolean $pValue
+     */
+    public function setQuotePrefix($pValue)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = array('quotePrefix' => $pValue);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->quotePrefix = (boolean) $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string Hash code
+     */
+    public function getHashCode()
+    {
+        $hashConditionals = '';
+        foreach ($this->conditionalStyles as $conditional) {
+            $hashConditionals .= $conditional->getHashCode();
+        }
+
+        return md5(
+            $this->fill->getHashCode() .
+            $this->font->getHashCode() .
+            $this->borders->getHashCode() .
+            $this->alignment->getHashCode() .
+            $this->numberFormat->getHashCode() .
+            $hashConditionals .
+            $this->protection->getHashCode() .
+            ($this->quotePrefix  ? 't' : 'f') .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Get own index in style collection
+     *
+     * @return int
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    /**
+     * Set own index in style collection
+     *
+     * @param int $pValue
+     */
+    public function setIndex($pValue)
+    {
+        $this->index = $pValue;
+    }
+}
diff --git a/lib/PHPExcel/Style/Alignment.php b/lib/PHPExcel/Style/Alignment.php
new file mode 100644
index 000000000..bfc494771
--- /dev/null
+++ b/lib/PHPExcel/Style/Alignment.php
@@ -0,0 +1,464 @@
+<?php
+/**
+ * PHPExcel_Style_Alignment
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Horizontal alignment styles */
+    const HORIZONTAL_GENERAL           = 'general';
+    const HORIZONTAL_LEFT              = 'left';
+    const HORIZONTAL_RIGHT             = 'right';
+    const HORIZONTAL_CENTER            = 'center';
+    const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous';
+    const HORIZONTAL_JUSTIFY           = 'justify';
+    const HORIZONTAL_FILL              = 'fill';
+    const HORIZONTAL_DISTRIBUTED       = 'distributed';        // Excel2007 only
+
+    /* Vertical alignment styles */
+    const VERTICAL_BOTTOM      = 'bottom';
+    const VERTICAL_TOP         = 'top';
+    const VERTICAL_CENTER      = 'center';
+    const VERTICAL_JUSTIFY     = 'justify';
+    const VERTICAL_DISTRIBUTED = 'distributed';        // Excel2007 only
+
+    /* Read order */
+    const READORDER_CONTEXT = 0;
+    const READORDER_LTR     = 1;
+    const READORDER_RTL     = 2;
+
+    /**
+     * Horizontal alignment
+     *
+     * @var string
+     */
+    protected $horizontal = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+
+    /**
+     * Vertical alignment
+     *
+     * @var string
+     */
+    protected $vertical = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+
+    /**
+     * Text rotation
+     *
+     * @var integer
+     */
+    protected $textRotation = 0;
+
+    /**
+     * Wrap text
+     *
+     * @var boolean
+     */
+    protected $wrapText = false;
+
+    /**
+     * Shrink to fit
+     *
+     * @var boolean
+     */
+    protected $shrinkToFit = false;
+
+    /**
+     * Indent - only possible with horizontal alignment left and right
+     *
+     * @var integer
+     */
+    protected $indent = 0;
+
+    /**
+     * Read order
+     *
+     * @var integer
+     */
+    protected $readorder = 0;
+
+    /**
+     * Create a new PHPExcel_Style_Alignment
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                       Leave this value at default unless you understand exactly what
+     *                                          its ramifications are
+     * @param    boolean    $isConditional   Flag indicating if this is a conditional style or not
+     *                                       Leave this value at default unless you understand exactly what
+     *                                          its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        if ($isConditional) {
+            $this->horizontal   = null;
+            $this->vertical     = null;
+            $this->textRotation = null;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Alignment
+     */
+    public function getSharedComponent()
+    {
+        return $this->parent->getSharedComponent()->getAlignment();
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('alignment' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray(
+     *        array(
+     *            'horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
+     *            'vertical'   => PHPExcel_Style_Alignment::VERTICAL_CENTER,
+     *            'rotation'   => 0,
+     *            'wrap'            => TRUE
+     *        )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Alignment
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())
+                    ->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (isset($pStyles['horizontal'])) {
+                    $this->setHorizontal($pStyles['horizontal']);
+                }
+                if (isset($pStyles['vertical'])) {
+                    $this->setVertical($pStyles['vertical']);
+                }
+                if (isset($pStyles['rotation'])) {
+                    $this->setTextRotation($pStyles['rotation']);
+                }
+                if (isset($pStyles['wrap'])) {
+                    $this->setWrapText($pStyles['wrap']);
+                }
+                if (isset($pStyles['shrinkToFit'])) {
+                    $this->setShrinkToFit($pStyles['shrinkToFit']);
+                }
+                if (isset($pStyles['indent'])) {
+                    $this->setIndent($pStyles['indent']);
+                }
+                if (isset($pStyles['readorder'])) {
+                    $this->setReadorder($pStyles['readorder']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Horizontal
+     *
+     * @return string
+     */
+    public function getHorizontal()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHorizontal();
+        }
+        return $this->horizontal;
+    }
+
+    /**
+     * Set Horizontal
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setHorizontal($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL)
+    {
+        if ($pValue == '') {
+            $pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('horizontal' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->horizontal = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Vertical
+     *
+     * @return string
+     */
+    public function getVertical()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getVertical();
+        }
+        return $this->vertical;
+    }
+
+    /**
+     * Set Vertical
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setVertical($pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM)
+    {
+        if ($pValue == '') {
+            $pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('vertical' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->vertical = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get TextRotation
+     *
+     * @return int
+     */
+    public function getTextRotation()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getTextRotation();
+        }
+        return $this->textRotation;
+    }
+
+    /**
+     * Set TextRotation
+     *
+     * @param int $pValue
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setTextRotation($pValue = 0)
+    {
+        // Excel2007 value 255 => PHPExcel value -165
+        if ($pValue == 255) {
+            $pValue = -165;
+        }
+
+        // Set rotation
+        if (($pValue >= -90 && $pValue <= 90) || $pValue == -165) {
+            if ($this->isSupervisor) {
+                $styleArray = $this->getStyleArray(array('rotation' => $pValue));
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            } else {
+                $this->textRotation = $pValue;
+            }
+        } else {
+            throw new PHPExcel_Exception("Text rotation should be a value between -90 and 90.");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Wrap Text
+     *
+     * @return boolean
+     */
+    public function getWrapText()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getWrapText();
+        }
+        return $this->wrapText;
+    }
+
+    /**
+     * Set Wrap Text
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setWrapText($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('wrap' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->wrapText = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Shrink to fit
+     *
+     * @return boolean
+     */
+    public function getShrinkToFit()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getShrinkToFit();
+        }
+        return $this->shrinkToFit;
+    }
+
+    /**
+     * Set Shrink to fit
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setShrinkToFit($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('shrinkToFit' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->shrinkToFit = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get indent
+     *
+     * @return int
+     */
+    public function getIndent()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getIndent();
+        }
+        return $this->indent;
+    }
+
+    /**
+     * Set indent
+     *
+     * @param int $pValue
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setIndent($pValue = 0)
+    {
+        if ($pValue > 0) {
+            if ($this->getHorizontal() != self::HORIZONTAL_GENERAL &&
+                $this->getHorizontal() != self::HORIZONTAL_LEFT &&
+                $this->getHorizontal() != self::HORIZONTAL_RIGHT) {
+                $pValue = 0; // indent not supported
+            }
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('indent' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->indent = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get read order
+     *
+     * @return integer
+     */
+    public function getReadorder()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getReadorder();
+        }
+        return $this->readorder;
+    }
+
+    /**
+     * Set read order
+     *
+     * @param int $pValue
+     * @return PHPExcel_Style_Alignment
+     */
+    public function setReadorder($pValue = 0)
+    {
+        if ($pValue < 0 || $pValue > 2) {
+            $pValue = 0;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('readorder' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->readorder = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->horizontal .
+            $this->vertical .
+            $this->textRotation .
+            ($this->wrapText ? 't' : 'f') .
+            ($this->shrinkToFit ? 't' : 'f') .
+            $this->indent .
+            $this->readorder .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/Border.php b/lib/PHPExcel/Style/Border.php
new file mode 100644
index 000000000..55efc501e
--- /dev/null
+++ b/lib/PHPExcel/Style/Border.php
@@ -0,0 +1,282 @@
+<?php
+
+/**
+ * PHPExcel_Style_Border
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Border style */
+    const BORDER_NONE             = 'none';
+    const BORDER_DASHDOT          = 'dashDot';
+    const BORDER_DASHDOTDOT       = 'dashDotDot';
+    const BORDER_DASHED           = 'dashed';
+    const BORDER_DOTTED           = 'dotted';
+    const BORDER_DOUBLE           = 'double';
+    const BORDER_HAIR             = 'hair';
+    const BORDER_MEDIUM           = 'medium';
+    const BORDER_MEDIUMDASHDOT    = 'mediumDashDot';
+    const BORDER_MEDIUMDASHDOTDOT = 'mediumDashDotDot';
+    const BORDER_MEDIUMDASHED     = 'mediumDashed';
+    const BORDER_SLANTDASHDOT     = 'slantDashDot';
+    const BORDER_THICK            = 'thick';
+    const BORDER_THIN             = 'thin';
+
+    /**
+     * Border style
+     *
+     * @var string
+     */
+    protected $borderStyle = PHPExcel_Style_Border::BORDER_NONE;
+
+    /**
+     * Border color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    protected $color;
+
+    /**
+     * Parent property name
+     *
+     * @var string
+     */
+    protected $parentPropertyName;
+
+    /**
+     * Create a new PHPExcel_Style_Border
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        $this->color    = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->color->bindParent($this, 'color');
+        }
+    }
+
+    /**
+     * Bind parent. Only used for supervisor
+     *
+     * @param PHPExcel_Style_Borders $parent
+     * @param string $parentPropertyName
+     * @return PHPExcel_Style_Border
+     */
+    public function bindParent($parent, $parentPropertyName = null)
+    {
+        $this->parent = $parent;
+        $this->parentPropertyName = $parentPropertyName;
+        return $this;
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Border
+     * @throws PHPExcel_Exception
+     */
+    public function getSharedComponent()
+    {
+        switch ($this->parentPropertyName) {
+            case 'allBorders':
+            case 'horizontal':
+            case 'inside':
+            case 'outline':
+            case 'vertical':
+                throw new PHPExcel_Exception('Cannot get shared component for a pseudo-border.');
+                break;
+            case 'bottom':
+                return $this->parent->getSharedComponent()->getBottom();
+            case 'diagonal':
+                return $this->parent->getSharedComponent()->getDiagonal();
+            case 'left':
+                return $this->parent->getSharedComponent()->getLeft();
+            case 'right':
+                return $this->parent->getSharedComponent()->getRight();
+            case 'top':
+                return $this->parent->getSharedComponent()->getTop();
+        }
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        switch ($this->parentPropertyName) {
+            case 'allBorders':
+            case 'bottom':
+            case 'diagonal':
+            case 'horizontal':
+            case 'inside':
+            case 'left':
+            case 'outline':
+            case 'right':
+            case 'top':
+            case 'vertical':
+                $key = strtolower('vertical');
+                break;
+        }
+        return $this->parent->getStyleArray(array($key => $array));
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->getTop()->applyFromArray(
+     *        array(
+     *            'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+     *            'color' => array(
+     *                'rgb' => '808080'
+     *            )
+     *        )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Border
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (isset($pStyles['style'])) {
+                    $this->setBorderStyle($pStyles['style']);
+                }
+                if (isset($pStyles['color'])) {
+                    $this->getColor()->applyFromArray($pStyles['color']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Border style
+     *
+     * @return string
+     */
+    public function getBorderStyle()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBorderStyle();
+        }
+        return $this->borderStyle;
+    }
+
+    /**
+     * Set Border style
+     *
+     * @param string|boolean    $pValue
+     *                            When passing a boolean, FALSE equates PHPExcel_Style_Border::BORDER_NONE
+     *                                and TRUE to PHPExcel_Style_Border::BORDER_MEDIUM
+     * @return PHPExcel_Style_Border
+     */
+    public function setBorderStyle($pValue = PHPExcel_Style_Border::BORDER_NONE)
+    {
+
+        if (empty($pValue)) {
+            $pValue = PHPExcel_Style_Border::BORDER_NONE;
+        } elseif (is_bool($pValue) && $pValue) {
+            $pValue = PHPExcel_Style_Border::BORDER_MEDIUM;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('style' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->borderStyle = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Border Color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getColor()
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set Border Color
+     *
+     * @param    PHPExcel_Style_Color $pValue
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Border
+     */
+    public function setColor(PHPExcel_Style_Color $pValue = null)
+    {
+        // make sure parameter is a real color and not a supervisor
+        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->color = $color;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->borderStyle .
+            $this->color->getHashCode() .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/Borders.php b/lib/PHPExcel/Style/Borders.php
new file mode 100644
index 000000000..27c40a48e
--- /dev/null
+++ b/lib/PHPExcel/Style/Borders.php
@@ -0,0 +1,429 @@
+<?php
+
+/**
+ * PHPExcel_Style_Borders
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Diagonal directions */
+    const DIAGONAL_NONE = 0;
+    const DIAGONAL_UP   = 1;
+    const DIAGONAL_DOWN = 2;
+    const DIAGONAL_BOTH = 3;
+
+    /**
+     * Left
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $left;
+
+    /**
+     * Right
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $right;
+
+    /**
+     * Top
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $top;
+
+    /**
+     * Bottom
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $bottom;
+
+    /**
+     * Diagonal
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $diagonal;
+
+    /**
+     * DiagonalDirection
+     *
+     * @var int
+     */
+    protected $diagonalDirection;
+
+    /**
+     * All borders psedo-border. Only applies to supervisor.
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $allBorders;
+
+    /**
+     * Outline psedo-border. Only applies to supervisor.
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $outline;
+
+    /**
+     * Inside psedo-border. Only applies to supervisor.
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $inside;
+
+    /**
+     * Vertical pseudo-border. Only applies to supervisor.
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $vertical;
+
+    /**
+     * Horizontal pseudo-border. Only applies to supervisor.
+     *
+     * @var PHPExcel_Style_Border
+     */
+    protected $horizontal;
+
+    /**
+     * Create a new PHPExcel_Style_Borders
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        $this->left = new PHPExcel_Style_Border($isSupervisor, $isConditional);
+        $this->right = new PHPExcel_Style_Border($isSupervisor, $isConditional);
+        $this->top = new PHPExcel_Style_Border($isSupervisor, $isConditional);
+        $this->bottom = new PHPExcel_Style_Border($isSupervisor, $isConditional);
+        $this->diagonal = new PHPExcel_Style_Border($isSupervisor, $isConditional);
+        $this->diagonalDirection = PHPExcel_Style_Borders::DIAGONAL_NONE;
+
+        // Specially for supervisor
+        if ($isSupervisor) {
+            // Initialize pseudo-borders
+            $this->allBorders = new PHPExcel_Style_Border(true);
+            $this->outline = new PHPExcel_Style_Border(true);
+            $this->inside = new PHPExcel_Style_Border(true);
+            $this->vertical = new PHPExcel_Style_Border(true);
+            $this->horizontal = new PHPExcel_Style_Border(true);
+
+            // bind parent if we are a supervisor
+            $this->left->bindParent($this, 'left');
+            $this->right->bindParent($this, 'right');
+            $this->top->bindParent($this, 'top');
+            $this->bottom->bindParent($this, 'bottom');
+            $this->diagonal->bindParent($this, 'diagonal');
+            $this->allBorders->bindParent($this, 'allBorders');
+            $this->outline->bindParent($this, 'outline');
+            $this->inside->bindParent($this, 'inside');
+            $this->vertical->bindParent($this, 'vertical');
+            $this->horizontal->bindParent($this, 'horizontal');
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Borders
+     */
+    public function getSharedComponent()
+    {
+        return $this->parent->getSharedComponent()->getBorders();
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('borders' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
+     *         array(
+     *             'bottom'     => array(
+     *                 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+     *                 'color' => array(
+     *                     'rgb' => '808080'
+     *                 )
+     *             ),
+     *             'top'     => array(
+     *                 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+     *                 'color' => array(
+     *                     'rgb' => '808080'
+     *                 )
+     *             )
+     *         )
+     * );
+     * </code>
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
+     *         array(
+     *             'allborders' => array(
+     *                 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+     *                 'color' => array(
+     *                     'rgb' => '808080'
+     *                 )
+     *             )
+     *         )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Borders
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (array_key_exists('left', $pStyles)) {
+                    $this->getLeft()->applyFromArray($pStyles['left']);
+                }
+                if (array_key_exists('right', $pStyles)) {
+                    $this->getRight()->applyFromArray($pStyles['right']);
+                }
+                if (array_key_exists('top', $pStyles)) {
+                    $this->getTop()->applyFromArray($pStyles['top']);
+                }
+                if (array_key_exists('bottom', $pStyles)) {
+                    $this->getBottom()->applyFromArray($pStyles['bottom']);
+                }
+                if (array_key_exists('diagonal', $pStyles)) {
+                    $this->getDiagonal()->applyFromArray($pStyles['diagonal']);
+                }
+                if (array_key_exists('diagonaldirection', $pStyles)) {
+                    $this->setDiagonalDirection($pStyles['diagonaldirection']);
+                }
+                if (array_key_exists('allborders', $pStyles)) {
+                    $this->getLeft()->applyFromArray($pStyles['allborders']);
+                    $this->getRight()->applyFromArray($pStyles['allborders']);
+                    $this->getTop()->applyFromArray($pStyles['allborders']);
+                    $this->getBottom()->applyFromArray($pStyles['allborders']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Left
+     *
+     * @return PHPExcel_Style_Border
+     */
+    public function getLeft()
+    {
+        return $this->left;
+    }
+
+    /**
+     * Get Right
+     *
+     * @return PHPExcel_Style_Border
+     */
+    public function getRight()
+    {
+        return $this->right;
+    }
+
+    /**
+     * Get Top
+     *
+     * @return PHPExcel_Style_Border
+     */
+    public function getTop()
+    {
+        return $this->top;
+    }
+
+    /**
+     * Get Bottom
+     *
+     * @return PHPExcel_Style_Border
+     */
+    public function getBottom()
+    {
+        return $this->bottom;
+    }
+
+    /**
+     * Get Diagonal
+     *
+     * @return PHPExcel_Style_Border
+     */
+    public function getDiagonal()
+    {
+        return $this->diagonal;
+    }
+
+    /**
+     * Get AllBorders (pseudo-border). Only applies to supervisor.
+     *
+     * @return PHPExcel_Style_Border
+     * @throws PHPExcel_Exception
+     */
+    public function getAllBorders()
+    {
+        if (!$this->isSupervisor) {
+            throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
+        }
+        return $this->allBorders;
+    }
+
+    /**
+     * Get Outline (pseudo-border). Only applies to supervisor.
+     *
+     * @return boolean
+     * @throws PHPExcel_Exception
+     */
+    public function getOutline()
+    {
+        if (!$this->isSupervisor) {
+            throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
+        }
+        return $this->outline;
+    }
+
+    /**
+     * Get Inside (pseudo-border). Only applies to supervisor.
+     *
+     * @return boolean
+     * @throws PHPExcel_Exception
+     */
+    public function getInside()
+    {
+        if (!$this->isSupervisor) {
+            throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
+        }
+        return $this->inside;
+    }
+
+    /**
+     * Get Vertical (pseudo-border). Only applies to supervisor.
+     *
+     * @return PHPExcel_Style_Border
+     * @throws PHPExcel_Exception
+     */
+    public function getVertical()
+    {
+        if (!$this->isSupervisor) {
+            throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
+        }
+        return $this->vertical;
+    }
+
+    /**
+     * Get Horizontal (pseudo-border). Only applies to supervisor.
+     *
+     * @return PHPExcel_Style_Border
+     * @throws PHPExcel_Exception
+     */
+    public function getHorizontal()
+    {
+        if (!$this->isSupervisor) {
+            throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
+        }
+        return $this->horizontal;
+    }
+
+    /**
+     * Get DiagonalDirection
+     *
+     * @return int
+     */
+    public function getDiagonalDirection()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getDiagonalDirection();
+        }
+        return $this->diagonalDirection;
+    }
+
+    /**
+     * Set DiagonalDirection
+     *
+     * @param int $pValue
+     * @return PHPExcel_Style_Borders
+     */
+    public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE)
+    {
+        if ($pValue == '') {
+            $pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->diagonalDirection = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashcode();
+        }
+        return md5(
+            $this->getLeft()->getHashCode() .
+            $this->getRight()->getHashCode() .
+            $this->getTop()->getHashCode() .
+            $this->getBottom()->getHashCode() .
+            $this->getDiagonal()->getHashCode() .
+            $this->getDiagonalDirection() .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/Color.php b/lib/PHPExcel/Style/Color.php
new file mode 100644
index 000000000..9c7790f00
--- /dev/null
+++ b/lib/PHPExcel/Style/Color.php
@@ -0,0 +1,443 @@
+<?php
+
+/**
+ * PHPExcel_Style_Color
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Colors */
+    const COLOR_BLACK      = 'FF000000';
+    const COLOR_WHITE      = 'FFFFFFFF';
+    const COLOR_RED        = 'FFFF0000';
+    const COLOR_DARKRED    = 'FF800000';
+    const COLOR_BLUE       = 'FF0000FF';
+    const COLOR_DARKBLUE   = 'FF000080';
+    const COLOR_GREEN      = 'FF00FF00';
+    const COLOR_DARKGREEN  = 'FF008000';
+    const COLOR_YELLOW     = 'FFFFFF00';
+    const COLOR_DARKYELLOW = 'FF808000';
+
+    /**
+     * Indexed colors array
+     *
+     * @var array
+     */
+    protected static $indexedColors;
+
+    /**
+     * ARGB - Alpha RGB
+     *
+     * @var string
+     */
+    protected $argb = null;
+
+    /**
+     * Parent property name
+     *
+     * @var string
+     */
+    protected $parentPropertyName;
+
+
+    /**
+     * Create a new PHPExcel_Style_Color
+     *
+     * @param    string    $pARGB            ARGB value for the colour
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = false, $isConditional = false)
+    {
+        //    Supervisor?
+        parent::__construct($isSupervisor);
+
+        //    Initialise values
+        if (!$isConditional) {
+            $this->argb = $pARGB;
+        }
+    }
+
+    /**
+     * Bind parent. Only used for supervisor
+     *
+     * @param mixed $parent
+     * @param string $parentPropertyName
+     * @return PHPExcel_Style_Color
+     */
+    public function bindParent($parent, $parentPropertyName = null)
+    {
+        $this->parent = $parent;
+        $this->parentPropertyName = $parentPropertyName;
+        return $this;
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getSharedComponent()
+    {
+        switch ($this->parentPropertyName) {
+            case 'endColor':
+                return $this->parent->getSharedComponent()->getEndColor();
+            case 'color':
+                return $this->parent->getSharedComponent()->getColor();
+            case 'startColor':
+                return $this->parent->getSharedComponent()->getStartColor();
+        }
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        switch ($this->parentPropertyName) {
+            case 'endColor':
+                $key = 'endcolor';
+                break;
+            case 'color':
+                $key = 'color';
+                break;
+            case 'startColor':
+                $key = 'startcolor';
+                break;
+
+        }
+        return $this->parent->getStyleArray(array($key => $array));
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Color
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (array_key_exists('rgb', $pStyles)) {
+                    $this->setRGB($pStyles['rgb']);
+                }
+                if (array_key_exists('argb', $pStyles)) {
+                    $this->setARGB($pStyles['argb']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get ARGB
+     *
+     * @return string
+     */
+    public function getARGB()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getARGB();
+        }
+        return $this->argb;
+    }
+
+    /**
+     * Set ARGB
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_Color
+     */
+    public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK)
+    {
+        if ($pValue == '') {
+            $pValue = PHPExcel_Style_Color::COLOR_BLACK;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('argb' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->argb = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get RGB
+     *
+     * @return string
+     */
+    public function getRGB()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getRGB();
+        }
+        return substr($this->argb, 2);
+    }
+
+    /**
+     * Set RGB
+     *
+     * @param    string    $pValue    RGB value
+     * @return PHPExcel_Style_Color
+     */
+    public function setRGB($pValue = '000000')
+    {
+        if ($pValue == '') {
+            $pValue = '000000';
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->argb = 'FF' . $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get a specified colour component of an RGB value
+     *
+     * @private
+     * @param    string        $RGB        The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param    int            $offset        Position within the RGB value to extract
+     * @param    boolean        $hex        Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     * @return    string        The extracted colour component
+     */
+    private static function getColourComponent($RGB, $offset, $hex = true)
+    {
+        $colour = substr($RGB, $offset, 2);
+        if (!$hex) {
+            $colour = hexdec($colour);
+        }
+        return $colour;
+    }
+
+    /**
+     * Get the red colour component of an RGB value
+     *
+     * @param    string        $RGB        The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param    boolean        $hex        Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     * @return    string        The red colour component
+     */
+    public static function getRed($RGB, $hex = true)
+    {
+        return self::getColourComponent($RGB, strlen($RGB) - 6, $hex);
+    }
+
+    /**
+     * Get the green colour component of an RGB value
+     *
+     * @param    string        $RGB        The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param    boolean        $hex        Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     * @return    string        The green colour component
+     */
+    public static function getGreen($RGB, $hex = true)
+    {
+        return self::getColourComponent($RGB, strlen($RGB) - 4, $hex);
+    }
+
+    /**
+     * Get the blue colour component of an RGB value
+     *
+     * @param    string        $RGB        The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param    boolean        $hex        Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     * @return    string        The blue colour component
+     */
+    public static function getBlue($RGB, $hex = true)
+    {
+        return self::getColourComponent($RGB, strlen($RGB) - 2, $hex);
+    }
+
+    /**
+     * Adjust the brightness of a color
+     *
+     * @param    string        $hex    The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+     * @param    float        $adjustPercentage    The percentage by which to adjust the colour as a float from -1 to 1
+     * @return    string        The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+     */
+    public static function changeBrightness($hex, $adjustPercentage)
+    {
+        $rgba = (strlen($hex) == 8);
+
+        $red = self::getRed($hex, false);
+        $green = self::getGreen($hex, false);
+        $blue = self::getBlue($hex, false);
+        if ($adjustPercentage > 0) {
+            $red += (255 - $red) * $adjustPercentage;
+            $green += (255 - $green) * $adjustPercentage;
+            $blue += (255 - $blue) * $adjustPercentage;
+        } else {
+            $red += $red * $adjustPercentage;
+            $green += $green * $adjustPercentage;
+            $blue += $blue * $adjustPercentage;
+        }
+
+        if ($red < 0) {
+            $red = 0;
+        } elseif ($red > 255) {
+            $red = 255;
+        }
+        if ($green < 0) {
+            $green = 0;
+        } elseif ($green > 255) {
+            $green = 255;
+        }
+        if ($blue < 0) {
+            $blue = 0;
+        } elseif ($blue > 255) {
+            $blue = 255;
+        }
+
+        $rgb = strtoupper(
+            str_pad(dechex($red), 2, '0', 0) .
+            str_pad(dechex($green), 2, '0', 0) .
+            str_pad(dechex($blue), 2, '0', 0)
+        );
+        return (($rgba) ? 'FF' : '') . $rgb;
+    }
+
+    /**
+     * Get indexed color
+     *
+     * @param    int            $pIndex            Index entry point into the colour array
+     * @param    boolean        $background        Flag to indicate whether default background or foreground colour
+     *                                            should be returned if the indexed colour doesn't exist
+     * @return    PHPExcel_Style_Color
+     */
+    public static function indexedColor($pIndex, $background = false)
+    {
+        // Clean parameter
+        $pIndex = intval($pIndex);
+
+        // Indexed colors
+        if (is_null(self::$indexedColors)) {
+            self::$indexedColors = array(
+                    1    => 'FF000000',    //    System Colour #1 - Black
+                    2    => 'FFFFFFFF',    //    System Colour #2 - White
+                    3    => 'FFFF0000',    //    System Colour #3 - Red
+                    4    => 'FF00FF00',    //    System Colour #4 - Green
+                    5    => 'FF0000FF',    //    System Colour #5 - Blue
+                    6    => 'FFFFFF00',    //    System Colour #6 - Yellow
+                    7    => 'FFFF00FF',    //    System Colour #7- Magenta
+                    8    => 'FF00FFFF',    //    System Colour #8- Cyan
+                    9    => 'FF800000',    //    Standard Colour #9
+                    10    => 'FF008000',    //    Standard Colour #10
+                    11    => 'FF000080',    //    Standard Colour #11
+                    12    => 'FF808000',    //    Standard Colour #12
+                    13    => 'FF800080',    //    Standard Colour #13
+                    14    => 'FF008080',    //    Standard Colour #14
+                    15    => 'FFC0C0C0',    //    Standard Colour #15
+                    16    => 'FF808080',    //    Standard Colour #16
+                    17    => 'FF9999FF',    //    Chart Fill Colour #17
+                    18    => 'FF993366',    //    Chart Fill Colour #18
+                    19    => 'FFFFFFCC',    //    Chart Fill Colour #19
+                    20    => 'FFCCFFFF',    //    Chart Fill Colour #20
+                    21    => 'FF660066',    //    Chart Fill Colour #21
+                    22    => 'FFFF8080',    //    Chart Fill Colour #22
+                    23    => 'FF0066CC',    //    Chart Fill Colour #23
+                    24    => 'FFCCCCFF',    //    Chart Fill Colour #24
+                    25    => 'FF000080',    //    Chart Line Colour #25
+                    26    => 'FFFF00FF',    //    Chart Line Colour #26
+                    27    => 'FFFFFF00',    //    Chart Line Colour #27
+                    28    => 'FF00FFFF',    //    Chart Line Colour #28
+                    29    => 'FF800080',    //    Chart Line Colour #29
+                    30    => 'FF800000',    //    Chart Line Colour #30
+                    31    => 'FF008080',    //    Chart Line Colour #31
+                    32    => 'FF0000FF',    //    Chart Line Colour #32
+                    33    => 'FF00CCFF',    //    Standard Colour #33
+                    34    => 'FFCCFFFF',    //    Standard Colour #34
+                    35    => 'FFCCFFCC',    //    Standard Colour #35
+                    36    => 'FFFFFF99',    //    Standard Colour #36
+                    37    => 'FF99CCFF',    //    Standard Colour #37
+                    38    => 'FFFF99CC',    //    Standard Colour #38
+                    39    => 'FFCC99FF',    //    Standard Colour #39
+                    40    => 'FFFFCC99',    //    Standard Colour #40
+                    41    => 'FF3366FF',    //    Standard Colour #41
+                    42    => 'FF33CCCC',    //    Standard Colour #42
+                    43    => 'FF99CC00',    //    Standard Colour #43
+                    44    => 'FFFFCC00',    //    Standard Colour #44
+                    45    => 'FFFF9900',    //    Standard Colour #45
+                    46    => 'FFFF6600',    //    Standard Colour #46
+                    47    => 'FF666699',    //    Standard Colour #47
+                    48    => 'FF969696',    //    Standard Colour #48
+                    49    => 'FF003366',    //    Standard Colour #49
+                    50    => 'FF339966',    //    Standard Colour #50
+                    51    => 'FF003300',    //    Standard Colour #51
+                    52    => 'FF333300',    //    Standard Colour #52
+                    53    => 'FF993300',    //    Standard Colour #53
+                    54    => 'FF993366',    //    Standard Colour #54
+                    55    => 'FF333399',    //    Standard Colour #55
+                    56    => 'FF333333'    //    Standard Colour #56
+                );
+        }
+
+        if (array_key_exists($pIndex, self::$indexedColors)) {
+            return new PHPExcel_Style_Color(self::$indexedColors[$pIndex]);
+        }
+
+        if ($background) {
+            return new PHPExcel_Style_Color(self::COLOR_WHITE);
+        }
+        return new PHPExcel_Style_Color(self::COLOR_BLACK);
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->argb .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/Conditional.php b/lib/PHPExcel/Style/Conditional.php
new file mode 100644
index 000000000..331362b42
--- /dev/null
+++ b/lib/PHPExcel/Style/Conditional.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Style_Conditional
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Style_Conditional implements PHPExcel_IComparable
+{
+    /* Condition types */
+    const CONDITION_NONE         = 'none';
+    const CONDITION_CELLIS       = 'cellIs';
+    const CONDITION_CONTAINSTEXT = 'containsText';
+    const CONDITION_EXPRESSION   = 'expression';
+
+    /* Operator types */
+    const OPERATOR_NONE               = '';
+    const OPERATOR_BEGINSWITH         = 'beginsWith';
+    const OPERATOR_ENDSWITH           = 'endsWith';
+    const OPERATOR_EQUAL              = 'equal';
+    const OPERATOR_GREATERTHAN        = 'greaterThan';
+    const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
+    const OPERATOR_LESSTHAN           = 'lessThan';
+    const OPERATOR_LESSTHANOREQUAL    = 'lessThanOrEqual';
+    const OPERATOR_NOTEQUAL           = 'notEqual';
+    const OPERATOR_CONTAINSTEXT       = 'containsText';
+    const OPERATOR_NOTCONTAINS        = 'notContains';
+    const OPERATOR_BETWEEN            = 'between';
+
+    /**
+     * Condition type
+     *
+     * @var int
+     */
+    private $conditionType;
+
+    /**
+     * Operator type
+     *
+     * @var int
+     */
+    private $operatorType;
+
+    /**
+     * Text
+     *
+     * @var string
+     */
+    private $text;
+
+    /**
+     * Condition
+     *
+     * @var string[]
+     */
+    private $condition = array();
+
+    /**
+     * Style
+     *
+     * @var PHPExcel_Style
+     */
+    private $style;
+
+    /**
+     * Create a new PHPExcel_Style_Conditional
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->conditionType = PHPExcel_Style_Conditional::CONDITION_NONE;
+        $this->operatorType  = PHPExcel_Style_Conditional::OPERATOR_NONE;
+        $this->text          = null;
+        $this->condition     = array();
+        $this->style         = new PHPExcel_Style(false, true);
+    }
+
+    /**
+     * Get Condition type
+     *
+     * @return string
+     */
+    public function getConditionType()
+    {
+        return $this->conditionType;
+    }
+
+    /**
+     * Set Condition type
+     *
+     * @param string $pValue    PHPExcel_Style_Conditional condition type
+     * @return PHPExcel_Style_Conditional
+     */
+    public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE)
+    {
+        $this->conditionType = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Operator type
+     *
+     * @return string
+     */
+    public function getOperatorType()
+    {
+        return $this->operatorType;
+    }
+
+    /**
+     * Set Operator type
+     *
+     * @param string $pValue    PHPExcel_Style_Conditional operator type
+     * @return PHPExcel_Style_Conditional
+     */
+    public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE)
+    {
+        $this->operatorType = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get text
+     *
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set text
+     *
+     * @param string $value
+     * @return PHPExcel_Style_Conditional
+     */
+    public function setText($value = null)
+    {
+        $this->text = $value;
+        return $this;
+    }
+
+    /**
+     * Get Condition
+     *
+     * @deprecated Deprecated, use getConditions instead
+     * @return string
+     */
+    public function getCondition()
+    {
+        if (isset($this->condition[0])) {
+            return $this->condition[0];
+        }
+
+        return '';
+    }
+
+    /**
+     * Set Condition
+     *
+     * @deprecated Deprecated, use setConditions instead
+     * @param string $pValue    Condition
+     * @return PHPExcel_Style_Conditional
+     */
+    public function setCondition($pValue = '')
+    {
+        if (!is_array($pValue)) {
+            $pValue = array($pValue);
+        }
+
+        return $this->setConditions($pValue);
+    }
+
+    /**
+     * Get Conditions
+     *
+     * @return string[]
+     */
+    public function getConditions()
+    {
+        return $this->condition;
+    }
+
+    /**
+     * Set Conditions
+     *
+     * @param string[] $pValue    Condition
+     * @return PHPExcel_Style_Conditional
+     */
+    public function setConditions($pValue)
+    {
+        if (!is_array($pValue)) {
+            $pValue = array($pValue);
+        }
+        $this->condition = $pValue;
+        return $this;
+    }
+
+    /**
+     * Add Condition
+     *
+     * @param string $pValue    Condition
+     * @return PHPExcel_Style_Conditional
+     */
+    public function addCondition($pValue = '')
+    {
+        $this->condition[] = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Style
+     *
+     * @return PHPExcel_Style
+     */
+    public function getStyle()
+    {
+        return $this->style;
+    }
+
+    /**
+     * Set Style
+     *
+     * @param     PHPExcel_Style $pValue
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Style_Conditional
+     */
+    public function setStyle(PHPExcel_Style $pValue = null)
+    {
+           $this->style = $pValue;
+           return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->conditionType .
+            $this->operatorType .
+            implode(';', $this->condition) .
+            $this->style->getHashCode() .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Style/Fill.php b/lib/PHPExcel/Style/Fill.php
new file mode 100644
index 000000000..26343ff5a
--- /dev/null
+++ b/lib/PHPExcel/Style/Fill.php
@@ -0,0 +1,322 @@
+<?php
+
+/**
+ * PHPExcel_Style_Fill
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Fill types */
+    const FILL_NONE                    = 'none';
+    const FILL_SOLID                   = 'solid';
+    const FILL_GRADIENT_LINEAR         = 'linear';
+    const FILL_GRADIENT_PATH           = 'path';
+    const FILL_PATTERN_DARKDOWN        = 'darkDown';
+    const FILL_PATTERN_DARKGRAY        = 'darkGray';
+    const FILL_PATTERN_DARKGRID        = 'darkGrid';
+    const FILL_PATTERN_DARKHORIZONTAL  = 'darkHorizontal';
+    const FILL_PATTERN_DARKTRELLIS     = 'darkTrellis';
+    const FILL_PATTERN_DARKUP          = 'darkUp';
+    const FILL_PATTERN_DARKVERTICAL    = 'darkVertical';
+    const FILL_PATTERN_GRAY0625        = 'gray0625';
+    const FILL_PATTERN_GRAY125         = 'gray125';
+    const FILL_PATTERN_LIGHTDOWN       = 'lightDown';
+    const FILL_PATTERN_LIGHTGRAY       = 'lightGray';
+    const FILL_PATTERN_LIGHTGRID       = 'lightGrid';
+    const FILL_PATTERN_LIGHTHORIZONTAL = 'lightHorizontal';
+    const FILL_PATTERN_LIGHTTRELLIS    = 'lightTrellis';
+    const FILL_PATTERN_LIGHTUP         = 'lightUp';
+    const FILL_PATTERN_LIGHTVERTICAL   = 'lightVertical';
+    const FILL_PATTERN_MEDIUMGRAY      = 'mediumGray';
+
+    /**
+     * Fill type
+     *
+     * @var string
+     */
+    protected $fillType = PHPExcel_Style_Fill::FILL_NONE;
+
+    /**
+     * Rotation
+     *
+     * @var double
+     */
+    protected $rotation = 0;
+
+    /**
+     * Start color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    protected $startColor;
+
+    /**
+     * End color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    protected $endColor;
+
+    /**
+     * Create a new PHPExcel_Style_Fill
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        if ($isConditional) {
+            $this->fillType = null;
+        }
+        $this->startColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
+        $this->endColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
+
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->startColor->bindParent($this, 'startColor');
+            $this->endColor->bindParent($this, 'endColor');
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Fill
+     */
+    public function getSharedComponent()
+    {
+        return $this->parent->getSharedComponent()->getFill();
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('fill' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
+     *        array(
+     *            'type'       => PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR,
+     *            'rotation'   => 0,
+     *            'startcolor' => array(
+     *                'rgb' => '000000'
+     *            ),
+     *            'endcolor'   => array(
+     *                'argb' => 'FFFFFFFF'
+     *            )
+     *        )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Fill
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (array_key_exists('type', $pStyles)) {
+                    $this->setFillType($pStyles['type']);
+                }
+                if (array_key_exists('rotation', $pStyles)) {
+                    $this->setRotation($pStyles['rotation']);
+                }
+                if (array_key_exists('startcolor', $pStyles)) {
+                    $this->getStartColor()->applyFromArray($pStyles['startcolor']);
+                }
+                if (array_key_exists('endcolor', $pStyles)) {
+                    $this->getEndColor()->applyFromArray($pStyles['endcolor']);
+                }
+                if (array_key_exists('color', $pStyles)) {
+                    $this->getStartColor()->applyFromArray($pStyles['color']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Fill Type
+     *
+     * @return string
+     */
+    public function getFillType()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getFillType();
+        }
+        return $this->fillType;
+    }
+
+    /**
+     * Set Fill Type
+     *
+     * @param string $pValue    PHPExcel_Style_Fill fill type
+     * @return PHPExcel_Style_Fill
+     */
+    public function setFillType($pValue = PHPExcel_Style_Fill::FILL_NONE)
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('type' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->fillType = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Rotation
+     *
+     * @return double
+     */
+    public function getRotation()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getRotation();
+        }
+        return $this->rotation;
+    }
+
+    /**
+     * Set Rotation
+     *
+     * @param double $pValue
+     * @return PHPExcel_Style_Fill
+     */
+    public function setRotation($pValue = 0)
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('rotation' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->rotation = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Start Color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getStartColor()
+    {
+        return $this->startColor;
+    }
+
+    /**
+     * Set Start Color
+     *
+     * @param    PHPExcel_Style_Color $pValue
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Fill
+     */
+    public function setStartColor(PHPExcel_Style_Color $pValue = null)
+    {
+        // make sure parameter is a real color and not a supervisor
+        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStartColor()->getStyleArray(array('argb' => $color->getARGB()));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->startColor = $color;
+        }
+        return $this;
+    }
+
+    /**
+     * Get End Color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getEndColor()
+    {
+        return $this->endColor;
+    }
+
+    /**
+     * Set End Color
+     *
+     * @param    PHPExcel_Style_Color $pValue
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Fill
+     */
+    public function setEndColor(PHPExcel_Style_Color $pValue = null)
+    {
+        // make sure parameter is a real color and not a supervisor
+        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getEndColor()->getStyleArray(array('argb' => $color->getARGB()));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->endColor = $color;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->getFillType() .
+            $this->getRotation() .
+            $this->getStartColor()->getHashCode() .
+            $this->getEndColor()->getHashCode() .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/Font.php b/lib/PHPExcel/Style/Font.php
new file mode 100644
index 000000000..9566e1dfa
--- /dev/null
+++ b/lib/PHPExcel/Style/Font.php
@@ -0,0 +1,543 @@
+<?php
+
+/**
+ * PHPExcel_Style_Font
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Font extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Underline types */
+    const UNDERLINE_NONE             = 'none';
+    const UNDERLINE_DOUBLE           = 'double';
+    const UNDERLINE_DOUBLEACCOUNTING = 'doubleAccounting';
+    const UNDERLINE_SINGLE           = 'single';
+    const UNDERLINE_SINGLEACCOUNTING = 'singleAccounting';
+
+    /**
+     * Font Name
+     *
+     * @var string
+     */
+    protected $name = 'Calibri';
+
+    /**
+     * Font Size
+     *
+     * @var float
+     */
+    protected $size = 11;
+
+    /**
+     * Bold
+     *
+     * @var boolean
+     */
+    protected $bold = false;
+
+    /**
+     * Italic
+     *
+     * @var boolean
+     */
+    protected $italic = false;
+
+    /**
+     * Superscript
+     *
+     * @var boolean
+     */
+    protected $superScript = false;
+
+    /**
+     * Subscript
+     *
+     * @var boolean
+     */
+    protected $subScript = false;
+
+    /**
+     * Underline
+     *
+     * @var string
+     */
+    protected $underline = self::UNDERLINE_NONE;
+
+    /**
+     * Strikethrough
+     *
+     * @var boolean
+     */
+    protected $strikethrough = false;
+
+    /**
+     * Foreground color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    protected $color;
+
+    /**
+     * Create a new PHPExcel_Style_Font
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        if ($isConditional) {
+            $this->name = null;
+            $this->size = null;
+            $this->bold = null;
+            $this->italic = null;
+            $this->superScript = null;
+            $this->subScript = null;
+            $this->underline = null;
+            $this->strikethrough = null;
+            $this->color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
+        } else {
+            $this->color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+        }
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->color->bindParent($this, 'color');
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Font
+     */
+    public function getSharedComponent()
+    {
+        return $this->parent->getSharedComponent()->getFont();
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('font' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->applyFromArray(
+     *        array(
+     *            'name'        => 'Arial',
+     *            'bold'        => TRUE,
+     *            'italic'    => FALSE,
+     *            'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
+     *            'strike'    => FALSE,
+     *            'color'        => array(
+     *                'rgb' => '808080'
+     *            )
+     *        )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Font
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (array_key_exists('name', $pStyles)) {
+                    $this->setName($pStyles['name']);
+                }
+                if (array_key_exists('bold', $pStyles)) {
+                    $this->setBold($pStyles['bold']);
+                }
+                if (array_key_exists('italic', $pStyles)) {
+                    $this->setItalic($pStyles['italic']);
+                }
+                if (array_key_exists('superScript', $pStyles)) {
+                    $this->setSuperScript($pStyles['superScript']);
+                }
+                if (array_key_exists('subScript', $pStyles)) {
+                    $this->setSubScript($pStyles['subScript']);
+                }
+                if (array_key_exists('underline', $pStyles)) {
+                    $this->setUnderline($pStyles['underline']);
+                }
+                if (array_key_exists('strike', $pStyles)) {
+                    $this->setStrikethrough($pStyles['strike']);
+                }
+                if (array_key_exists('color', $pStyles)) {
+                    $this->getColor()->applyFromArray($pStyles['color']);
+                }
+                if (array_key_exists('size', $pStyles)) {
+                    $this->setSize($pStyles['size']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getName();
+        }
+        return $this->name;
+    }
+
+    /**
+     * Set Name
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setName($pValue = 'Calibri')
+    {
+        if ($pValue == '') {
+            $pValue = 'Calibri';
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('name' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->name = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Size
+     *
+     * @return double
+     */
+    public function getSize()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getSize();
+        }
+        return $this->size;
+    }
+
+    /**
+     * Set Size
+     *
+     * @param double $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setSize($pValue = 10)
+    {
+        if ($pValue == '') {
+            $pValue = 10;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('size' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->size = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Bold
+     *
+     * @return boolean
+     */
+    public function getBold()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBold();
+        }
+        return $this->bold;
+    }
+
+    /**
+     * Set Bold
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setBold($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('bold' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->bold = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Italic
+     *
+     * @return boolean
+     */
+    public function getItalic()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getItalic();
+        }
+        return $this->italic;
+    }
+
+    /**
+     * Set Italic
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setItalic($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('italic' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->italic = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get SuperScript
+     *
+     * @return boolean
+     */
+    public function getSuperScript()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getSuperScript();
+        }
+        return $this->superScript;
+    }
+
+    /**
+     * Set SuperScript
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setSuperScript($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('superScript' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->superScript = $pValue;
+            $this->subScript = !$pValue;
+        }
+        return $this;
+    }
+
+        /**
+     * Get SubScript
+     *
+     * @return boolean
+     */
+    public function getSubScript()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getSubScript();
+        }
+        return $this->subScript;
+    }
+
+    /**
+     * Set SubScript
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setSubScript($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('subScript' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->subScript = $pValue;
+            $this->superScript = !$pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Underline
+     *
+     * @return string
+     */
+    public function getUnderline()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getUnderline();
+        }
+        return $this->underline;
+    }
+
+    /**
+     * Set Underline
+     *
+     * @param string|boolean $pValue    PHPExcel_Style_Font underline type
+     *                                    If a boolean is passed, then TRUE equates to UNDERLINE_SINGLE,
+     *                                        false equates to UNDERLINE_NONE
+     * @return PHPExcel_Style_Font
+     */
+    public function setUnderline($pValue = self::UNDERLINE_NONE)
+    {
+        if (is_bool($pValue)) {
+            $pValue = ($pValue) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
+        } elseif ($pValue == '') {
+            $pValue = self::UNDERLINE_NONE;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('underline' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->underline = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Strikethrough
+     *
+     * @return boolean
+     */
+    public function getStrikethrough()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getStrikethrough();
+        }
+        return $this->strikethrough;
+    }
+
+    /**
+     * Set Strikethrough
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Style_Font
+     */
+    public function setStrikethrough($pValue = false)
+    {
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('strike' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->strikethrough = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getColor()
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set Color
+     *
+     * @param    PHPExcel_Style_Color $pValue
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Font
+     */
+    public function setColor(PHPExcel_Style_Color $pValue = null)
+    {
+        // make sure parameter is a real color and not a supervisor
+        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->color = $color;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->name .
+            $this->size .
+            ($this->bold ? 't' : 'f') .
+            ($this->italic ? 't' : 'f') .
+            ($this->superScript ? 't' : 'f') .
+            ($this->subScript ? 't' : 'f') .
+            $this->underline .
+            ($this->strikethrough ? 't' : 'f') .
+            $this->color->getHashCode() .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/NumberFormat.php b/lib/PHPExcel/Style/NumberFormat.php
new file mode 100644
index 000000000..1b72cda92
--- /dev/null
+++ b/lib/PHPExcel/Style/NumberFormat.php
@@ -0,0 +1,751 @@
+<?php
+
+/**
+ * PHPExcel_Style_NumberFormat
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /* Pre-defined formats */
+    const FORMAT_GENERAL                 = 'General';
+
+    const FORMAT_TEXT                    = '@';
+
+    const FORMAT_NUMBER                  = '0';
+    const FORMAT_NUMBER_00               = '0.00';
+    const FORMAT_NUMBER_COMMA_SEPARATED1 = '#,##0.00';
+    const FORMAT_NUMBER_COMMA_SEPARATED2 = '#,##0.00_-';
+
+    const FORMAT_PERCENTAGE              = '0%';
+    const FORMAT_PERCENTAGE_00           = '0.00%';
+
+    const FORMAT_DATE_YYYYMMDD2          = 'yyyy-mm-dd';
+    const FORMAT_DATE_YYYYMMDD           = 'yy-mm-dd';
+    const FORMAT_DATE_DDMMYYYY           = 'dd/mm/yy';
+    const FORMAT_DATE_DMYSLASH           = 'd/m/y';
+    const FORMAT_DATE_DMYMINUS           = 'd-m-y';
+    const FORMAT_DATE_DMMINUS            = 'd-m';
+    const FORMAT_DATE_MYMINUS            = 'm-y';
+    const FORMAT_DATE_XLSX14             = 'mm-dd-yy';
+    const FORMAT_DATE_XLSX15             = 'd-mmm-yy';
+    const FORMAT_DATE_XLSX16             = 'd-mmm';
+    const FORMAT_DATE_XLSX17             = 'mmm-yy';
+    const FORMAT_DATE_XLSX22             = 'm/d/yy h:mm';
+    const FORMAT_DATE_DATETIME           = 'd/m/y h:mm';
+    const FORMAT_DATE_TIME1              = 'h:mm AM/PM';
+    const FORMAT_DATE_TIME2              = 'h:mm:ss AM/PM';
+    const FORMAT_DATE_TIME3              = 'h:mm';
+    const FORMAT_DATE_TIME4              = 'h:mm:ss';
+    const FORMAT_DATE_TIME5              = 'mm:ss';
+    const FORMAT_DATE_TIME6              = 'h:mm:ss';
+    const FORMAT_DATE_TIME7              = 'i:s.S';
+    const FORMAT_DATE_TIME8              = 'h:mm:ss;@';
+    const FORMAT_DATE_YYYYMMDDSLASH      = 'yy/mm/dd;@';
+
+    const FORMAT_CURRENCY_USD_SIMPLE     = '"$"#,##0.00_-';
+    const FORMAT_CURRENCY_USD            = '$#,##0_-';
+    const FORMAT_CURRENCY_EUR_SIMPLE     = '[$EUR ]#,##0.00_-';
+
+    /**
+     * Excel built-in number formats
+     *
+     * @var array
+     */
+    protected static $builtInFormats;
+
+    /**
+     * Excel built-in number formats (flipped, for faster lookups)
+     *
+     * @var array
+     */
+    protected static $flippedBuiltInFormats;
+
+    /**
+     * Format Code
+     *
+     * @var string
+     */
+    protected $formatCode = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+
+    /**
+     * Built-in format Code
+     *
+     * @var string
+     */
+    protected $builtInFormatCode    = 0;
+
+    /**
+     * Create a new PHPExcel_Style_NumberFormat
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        if ($isConditional) {
+            $this->formatCode = null;
+            $this->builtInFormatCode = false;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_NumberFormat
+     */
+    public function getSharedComponent()
+    {
+        return $this->parent->getSharedComponent()->getNumberFormat();
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('numberformat' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getNumberFormat()->applyFromArray(
+     *        array(
+     *            'code' => PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE
+     *        )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_NumberFormat
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (array_key_exists('code', $pStyles)) {
+                    $this->setFormatCode($pStyles['code']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Format Code
+     *
+     * @return string
+     */
+    public function getFormatCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getFormatCode();
+        }
+        if ($this->builtInFormatCode !== false) {
+            return self::builtInFormatCode($this->builtInFormatCode);
+        }
+        return $this->formatCode;
+    }
+
+    /**
+     * Set Format Code
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_NumberFormat
+     */
+    public function setFormatCode($pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL)
+    {
+        if ($pValue == '') {
+            $pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('code' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->formatCode = $pValue;
+            $this->builtInFormatCode = self::builtInFormatCodeIndex($pValue);
+        }
+        return $this;
+    }
+
+    /**
+     * Get Built-In Format Code
+     *
+     * @return int
+     */
+    public function getBuiltInFormatCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBuiltInFormatCode();
+        }
+        return $this->builtInFormatCode;
+    }
+
+    /**
+     * Set Built-In Format Code
+     *
+     * @param int $pValue
+     * @return PHPExcel_Style_NumberFormat
+     */
+    public function setBuiltInFormatCode($pValue = 0)
+    {
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('code' => self::builtInFormatCode($pValue)));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->builtInFormatCode = $pValue;
+            $this->formatCode = self::builtInFormatCode($pValue);
+        }
+        return $this;
+    }
+
+    /**
+     * Fill built-in format codes
+     */
+    private static function fillBuiltInFormatCodes()
+    {
+        //  [MS-OI29500: Microsoft Office Implementation Information for ISO/IEC-29500 Standard Compliance]
+        //  18.8.30. numFmt (Number Format)
+        //
+        //  The ECMA standard defines built-in format IDs
+        //      14: "mm-dd-yy"
+        //      22: "m/d/yy h:mm"
+        //      37: "#,##0 ;(#,##0)"
+        //      38: "#,##0 ;[Red](#,##0)"
+        //      39: "#,##0.00;(#,##0.00)"
+        //      40: "#,##0.00;[Red](#,##0.00)"
+        //      47: "mmss.0"
+        //      KOR fmt 55: "yyyy-mm-dd"
+        //  Excel defines built-in format IDs
+        //      14: "m/d/yyyy"
+        //      22: "m/d/yyyy h:mm"
+        //      37: "#,##0_);(#,##0)"
+        //      38: "#,##0_);[Red](#,##0)"
+        //      39: "#,##0.00_);(#,##0.00)"
+        //      40: "#,##0.00_);[Red](#,##0.00)"
+        //      47: "mm:ss.0"
+        //      KOR fmt 55: "yyyy/mm/dd"
+ 
+        // Built-in format codes
+        if (is_null(self::$builtInFormats)) {
+            self::$builtInFormats = array();
+
+            // General
+            self::$builtInFormats[0] = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+            self::$builtInFormats[1] = '0';
+            self::$builtInFormats[2] = '0.00';
+            self::$builtInFormats[3] = '#,##0';
+            self::$builtInFormats[4] = '#,##0.00';
+
+            self::$builtInFormats[9] = '0%';
+            self::$builtInFormats[10] = '0.00%';
+            self::$builtInFormats[11] = '0.00E+00';
+            self::$builtInFormats[12] = '# ?/?';
+            self::$builtInFormats[13] = '# ??/??';
+            self::$builtInFormats[14] = 'm/d/yyyy';                     // Despite ECMA 'mm-dd-yy';
+            self::$builtInFormats[15] = 'd-mmm-yy';
+            self::$builtInFormats[16] = 'd-mmm';
+            self::$builtInFormats[17] = 'mmm-yy';
+            self::$builtInFormats[18] = 'h:mm AM/PM';
+            self::$builtInFormats[19] = 'h:mm:ss AM/PM';
+            self::$builtInFormats[20] = 'h:mm';
+            self::$builtInFormats[21] = 'h:mm:ss';
+            self::$builtInFormats[22] = 'm/d/yyyy h:mm';                // Despite ECMA 'm/d/yy h:mm';
+
+            self::$builtInFormats[37] = '#,##0_);(#,##0)';              //  Despite ECMA '#,##0 ;(#,##0)';
+            self::$builtInFormats[38] = '#,##0_);[Red](#,##0)';         //  Despite ECMA '#,##0 ;[Red](#,##0)';
+            self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)';        //  Despite ECMA '#,##0.00;(#,##0.00)';
+            self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)';   //  Despite ECMA '#,##0.00;[Red](#,##0.00)';
+
+            self::$builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
+            self::$builtInFormats[45] = 'mm:ss';
+            self::$builtInFormats[46] = '[h]:mm:ss';
+            self::$builtInFormats[47] = 'mm:ss.0';                      //  Despite ECMA 'mmss.0';
+            self::$builtInFormats[48] = '##0.0E+0';
+            self::$builtInFormats[49] = '@';
+
+            // CHT
+            self::$builtInFormats[27] = '[$-404]e/m/d';
+            self::$builtInFormats[30] = 'm/d/yy';
+            self::$builtInFormats[36] = '[$-404]e/m/d';
+            self::$builtInFormats[50] = '[$-404]e/m/d';
+            self::$builtInFormats[57] = '[$-404]e/m/d';
+
+            // THA
+            self::$builtInFormats[59] = 't0';
+            self::$builtInFormats[60] = 't0.00';
+            self::$builtInFormats[61] = 't#,##0';
+            self::$builtInFormats[62] = 't#,##0.00';
+            self::$builtInFormats[67] = 't0%';
+            self::$builtInFormats[68] = 't0.00%';
+            self::$builtInFormats[69] = 't# ?/?';
+            self::$builtInFormats[70] = 't# ??/??';
+
+            // Flip array (for faster lookups)
+            self::$flippedBuiltInFormats = array_flip(self::$builtInFormats);
+        }
+    }
+
+    /**
+     * Get built-in format code
+     *
+     * @param    int        $pIndex
+     * @return    string
+     */
+    public static function builtInFormatCode($pIndex)
+    {
+        // Clean parameter
+        $pIndex = intval($pIndex);
+
+        // Ensure built-in format codes are available
+        self::fillBuiltInFormatCodes();
+        // Lookup format code
+        if (isset(self::$builtInFormats[$pIndex])) {
+            return self::$builtInFormats[$pIndex];
+        }
+
+        return '';
+    }
+
+    /**
+     * Get built-in format code index
+     *
+     * @param    string        $formatCode
+     * @return    int|boolean
+     */
+    public static function builtInFormatCodeIndex($formatCode)
+    {
+        // Ensure built-in format codes are available
+        self::fillBuiltInFormatCodes();
+
+        // Lookup format code
+        if (isset(self::$flippedBuiltInFormats[$formatCode])) {
+            return self::$flippedBuiltInFormats[$formatCode];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->formatCode .
+            $this->builtInFormatCode .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Search/replace values to convert Excel date/time format masks to PHP format masks
+     *
+     * @var array
+     */
+    private static $dateFormatReplacements = array(
+            // first remove escapes related to non-format characters
+            '\\'    => '',
+            //    12-hour suffix
+            'am/pm' => 'A',
+            //    4-digit year
+            'e'     => 'Y',
+            'yyyy'  => 'Y',
+            //    2-digit year
+            'yy'    => 'y',
+            //    first letter of month - no php equivalent
+            'mmmmm' => 'M',
+            //    full month name
+            'mmmm'  => 'F',
+            //    short month name
+            'mmm'   => 'M',
+            //    mm is minutes if time, but can also be month w/leading zero
+            //    so we try to identify times be the inclusion of a : separator in the mask
+            //    It isn't perfect, but the best way I know how
+            ':mm'   => ':i',
+            'mm:'   => 'i:',
+            //    month leading zero
+            'mm'    => 'm',
+            //    month no leading zero
+            'm'     => 'n',
+            //    full day of week name
+            'dddd'  => 'l',
+            //    short day of week name
+            'ddd'   => 'D',
+            //    days leading zero
+            'dd'    => 'd',
+            //    days no leading zero
+            'd'     => 'j',
+            //    seconds
+            'ss'    => 's',
+            //    fractional seconds - no php equivalent
+            '.s'    => ''
+        );
+    /**
+     * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock)
+     *
+     * @var array
+     */
+    private static $dateFormatReplacements24 = array(
+            'hh' => 'H',
+            'h'  => 'G'
+        );
+    /**
+     * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock)
+     *
+     * @var array
+     */
+    private static $dateFormatReplacements12 = array(
+            'hh' => 'h',
+            'h'  => 'g'
+        );
+
+    private static function setLowercaseCallback($matches) {
+        return mb_strtolower($matches[0]);
+    }
+
+    private static function escapeQuotesCallback($matches) {
+        return '\\' . implode('\\', str_split($matches[1]));
+    }
+
+    private static function formatAsDate(&$value, &$format)
+    {
+        // strip off first part containing e.g. [$-F800] or [$USD-409]
+        // general syntax: [$<Currency string>-<language info>]
+        // language info is in hexadecimal
+        $format = preg_replace('/^(\[\$[A-Z]*-[0-9A-F]*\])/i', '', $format);
+
+        // OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case;
+        //    but we don't want to change any quoted strings
+        $format = preg_replace_callback('/(?:^|")([^"]*)(?:$|")/', array('self', 'setLowercaseCallback'), $format);
+
+        // Only process the non-quoted blocks for date format characters
+        $blocks = explode('"', $format);
+        foreach($blocks as $key => &$block) {
+            if ($key % 2 == 0) {
+                $block = strtr($block, self::$dateFormatReplacements);
+                if (!strpos($block, 'A')) {
+                    // 24-hour time format
+                    $block = strtr($block, self::$dateFormatReplacements24);
+                } else {
+                    // 12-hour time format
+                    $block = strtr($block, self::$dateFormatReplacements12);
+                }
+            }
+        }
+        $format = implode('"', $blocks);
+
+        // escape any quoted characters so that DateTime format() will render them correctly
+        $format = preg_replace_callback('/"(.*)"/U', array('self', 'escapeQuotesCallback'), $format);
+
+        $dateObj = PHPExcel_Shared_Date::ExcelToPHPObject($value);
+        $value = $dateObj->format($format);
+    }
+
+    private static function formatAsPercentage(&$value, &$format)
+    {
+        if ($format === self::FORMAT_PERCENTAGE) {
+            $value = round((100 * $value), 0) . '%';
+        } else {
+            if (preg_match('/\.[#0]+/i', $format, $m)) {
+                $s = substr($m[0], 0, 1) . (strlen($m[0]) - 1);
+                $format = str_replace($m[0], $s, $format);
+            }
+            if (preg_match('/^[#0]+/', $format, $m)) {
+                $format = str_replace($m[0], strlen($m[0]), $format);
+            }
+            $format = '%' . str_replace('%', 'f%%', $format);
+
+            $value = sprintf($format, 100 * $value);
+        }
+    }
+
+    private static function formatAsFraction(&$value, &$format)
+    {
+        $sign = ($value < 0) ? '-' : '';
+
+        $integerPart = floor(abs($value));
+        $decimalPart = trim(fmod(abs($value), 1), '0.');
+        $decimalLength = strlen($decimalPart);
+        $decimalDivisor = pow(10, $decimalLength);
+
+        $GCD = PHPExcel_Calculation_MathTrig::GCD($decimalPart, $decimalDivisor);
+
+        $adjustedDecimalPart = $decimalPart/$GCD;
+        $adjustedDecimalDivisor = $decimalDivisor/$GCD;
+
+        if ((strpos($format, '0') !== false) || (strpos($format, '#') !== false) || (substr($format, 0, 3) == '? ?')) {
+            if ($integerPart == 0) {
+                $integerPart = '';
+            }
+            $value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
+        } else {
+            $adjustedDecimalPart += $integerPart * $adjustedDecimalDivisor;
+            $value = "$sign$adjustedDecimalPart/$adjustedDecimalDivisor";
+        }
+    }
+
+    private static function complexNumberFormatMask($number, $mask, $level = 0)
+    {
+        $sign = ($number < 0.0);
+        $number = abs($number);
+        if (strpos($mask, '.') !== false) {
+            $numbers = explode('.', $number . '.0');
+            $masks = explode('.', $mask . '.0');
+            $result1 = self::complexNumberFormatMask($numbers[0], $masks[0], 1);
+            $result2 = strrev(self::complexNumberFormatMask(strrev($numbers[1]), strrev($masks[1]), 1));
+            return (($sign) ? '-' : '') . $result1 . '.' . $result2;
+        }
+
+        $r = preg_match_all('/0+/', $mask, $result, PREG_OFFSET_CAPTURE);
+        if ($r > 1) {
+            $result = array_reverse($result[0]);
+
+            foreach ($result as $block) {
+                $divisor = 1 . $block[0];
+                $size = strlen($block[0]);
+                $offset = $block[1];
+
+                $blockValue = sprintf(
+                    '%0' . $size . 'd',
+                    fmod($number, $divisor)
+                );
+                $number = floor($number / $divisor);
+                $mask = substr_replace($mask, $blockValue, $offset, $size);
+            }
+            if ($number > 0) {
+                $mask = substr_replace($mask, $number, $offset, 0);
+            }
+            $result = $mask;
+        } else {
+            $result = $number;
+        }
+
+        return (($sign) ? '-' : '') . $result;
+    }
+
+    /**
+     * Convert a value in a pre-defined format to a PHP string
+     *
+     * @param mixed    $value        Value to format
+     * @param string    $format        Format code
+     * @param array        $callBack    Callback function for additional formatting of string
+     * @return string    Formatted string
+     */
+    public static function toFormattedString($value = '0', $format = PHPExcel_Style_NumberFormat::FORMAT_GENERAL, $callBack = null)
+    {
+        // For now we do not treat strings although section 4 of a format code affects strings
+        if (!is_numeric($value)) {
+            return $value;
+        }
+
+        // For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
+        // it seems to round numbers to a total of 10 digits.
+        if (($format === PHPExcel_Style_NumberFormat::FORMAT_GENERAL) || ($format === PHPExcel_Style_NumberFormat::FORMAT_TEXT)) {
+            return $value;
+        }
+
+        // Convert any other escaped characters to quoted strings, e.g. (\T to "T")
+        $format = preg_replace('/(\\\(.))(?=(?:[^"]|"[^"]*")*$)/u', '"${2}"', $format);
+
+        // Get the sections, there can be up to four sections, separated with a semi-colon (but only if not a quoted literal)
+        $sections = preg_split('/(;)(?=(?:[^"]|"[^"]*")*$)/u', $format);
+
+        // Extract the relevant section depending on whether number is positive, negative, or zero?
+        // Text not supported yet.
+        // Here is how the sections apply to various values in Excel:
+        //   1 section:   [POSITIVE/NEGATIVE/ZERO/TEXT]
+        //   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
+        //   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
+        //   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
+        switch (count($sections)) {
+            case 1:
+                $format = $sections[0];
+                break;
+            case 2:
+                $format = ($value >= 0) ? $sections[0] : $sections[1];
+                $value = abs($value); // Use the absolute value
+                break;
+            case 3:
+                $format = ($value > 0) ?
+                    $sections[0] : ( ($value < 0) ?
+                        $sections[1] : $sections[2]);
+                $value = abs($value); // Use the absolute value
+                break;
+            case 4:
+                $format = ($value > 0) ?
+                    $sections[0] : ( ($value < 0) ?
+                        $sections[1] : $sections[2]);
+                $value = abs($value); // Use the absolute value
+                break;
+            default:
+                // something is wrong, just use first section
+                $format = $sections[0];
+                break;
+        }
+
+        // In Excel formats, "_" is used to add spacing,
+        //    The following character indicates the size of the spacing, which we can't do in HTML, so we just use a standard space
+        $format = preg_replace('/_./', ' ', $format);
+
+        // Save format with color information for later use below
+        $formatColor = $format;
+
+        // Strip color information
+        $color_regex = '/^\\[[a-zA-Z]+\\]/';
+        $format = preg_replace($color_regex, '', $format);
+
+        // Let's begin inspecting the format and converting the value to a formatted string
+
+        //  Check for date/time characters (not inside quotes)
+        if (preg_match('/(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy](?=(?:[^"]|"[^"]*")*$)/miu', $format, $matches)) {
+            // datetime format
+            self::formatAsDate($value, $format);
+        } elseif (preg_match('/%$/', $format)) {
+            // % number format
+            self::formatAsPercentage($value, $format);
+        } else {
+            if ($format === self::FORMAT_CURRENCY_EUR_SIMPLE) {
+                $value = 'EUR ' . sprintf('%1.2f', $value);
+            } else {
+                // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
+                $format = str_replace(array('"', '*'), '', $format);
+
+                // Find out if we need thousands separator
+                // This is indicated by a comma enclosed by a digit placeholder:
+                //        #,#   or   0,0
+                $useThousands = preg_match('/(#,#|0,0)/', $format);
+                if ($useThousands) {
+                    $format = preg_replace('/0,0/', '00', $format);
+                    $format = preg_replace('/#,#/', '##', $format);
+                }
+
+                // Scale thousands, millions,...
+                // This is indicated by a number of commas after a digit placeholder:
+                //        #,   or    0.0,,
+                $scale = 1; // same as no scale
+                $matches = array();
+                if (preg_match('/(#|0)(,+)/', $format, $matches)) {
+                    $scale = pow(1000, strlen($matches[2]));
+
+                    // strip the commas
+                    $format = preg_replace('/0,+/', '0', $format);
+                    $format = preg_replace('/#,+/', '#', $format);
+                }
+
+                if (preg_match('/#?.*\?\/\?/', $format, $m)) {
+                    //echo 'Format mask is fractional '.$format.' <br />';
+                    if ($value != (int)$value) {
+                        self::formatAsFraction($value, $format);
+                    }
+
+                } else {
+                    // Handle the number itself
+
+                    // scale number
+                    $value = $value / $scale;
+
+                    // Strip #
+                    $format = preg_replace('/\\#/', '0', $format);
+
+                    $n = "/\[[^\]]+\]/";
+                    $m = preg_replace($n, '', $format);
+                    $number_regex = "/(0+)(\.?)(0*)/";
+                    if (preg_match($number_regex, $m, $matches)) {
+                        $left = $matches[1];
+                        $dec = $matches[2];
+                        $right = $matches[3];
+
+                        // minimun width of formatted number (including dot)
+                        $minWidth = strlen($left) + strlen($dec) + strlen($right);
+                        if ($useThousands) {
+                            $value = number_format(
+                                $value,
+                                strlen($right),
+                                PHPExcel_Shared_String::getDecimalSeparator(),
+                                PHPExcel_Shared_String::getThousandsSeparator()
+                            );
+                            $value = preg_replace($number_regex, $value, $format);
+                        } else {
+                            if (preg_match('/[0#]E[+-]0/i', $format)) {
+                                //    Scientific format
+                                $value = sprintf('%5.2E', $value);
+                            } elseif (preg_match('/0([^\d\.]+)0/', $format)) {
+                                $value = self::complexNumberFormatMask($value, $format);
+                            } else {
+                                $sprintf_pattern = "%0$minWidth." . strlen($right) . "f";
+                                $value = sprintf($sprintf_pattern, $value);
+                                $value = preg_replace($number_regex, $value, $format);
+                            }
+                        }
+                    }
+                }
+                if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
+                    //  Currency or Accounting
+                    $currencyFormat = $m[0];
+                    $currencyCode = $m[1];
+                    list($currencyCode) = explode('-', $currencyCode);
+                    if ($currencyCode == '') {
+                        $currencyCode = PHPExcel_Shared_String::getCurrencyCode();
+                    }
+                    $value = preg_replace('/\[\$([^\]]*)\]/u', $currencyCode, $value);
+                }
+            }
+        }
+
+        // Escape any escaped slashes to a single slash
+        $format = preg_replace("/\\\\/u", '\\', $format);
+
+        // Additional formatting provided by callback function
+        if ($callBack !== null) {
+            list($writerInstance, $function) = $callBack;
+            $value = $writerInstance->$function($value, $formatColor);
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/PHPExcel/Style/Protection.php b/lib/PHPExcel/Style/Protection.php
new file mode 100644
index 000000000..d5568f655
--- /dev/null
+++ b/lib/PHPExcel/Style/Protection.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * PHPExcel_Style_Protection
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+{
+    /** Protection styles */
+    const PROTECTION_INHERIT      = 'inherit';
+    const PROTECTION_PROTECTED    = 'protected';
+    const PROTECTION_UNPROTECTED  = 'unprotected';
+
+    /**
+     * Locked
+     *
+     * @var string
+     */
+    protected $locked;
+
+    /**
+     * Hidden
+     *
+     * @var string
+     */
+    protected $hidden;
+
+    /**
+     * Create a new PHPExcel_Style_Protection
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param    boolean    $isConditional    Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false, $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        if (!$isConditional) {
+            $this->locked = self::PROTECTION_INHERIT;
+            $this->hidden = self::PROTECTION_INHERIT;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor
+     *
+     * @return PHPExcel_Style_Protection
+     */
+    public function getSharedComponent()
+    {
+        return $this->parent->getSharedComponent()->getProtection();
+    }
+
+    /**
+     * Build style array from subcomponents
+     *
+     * @param array $array
+     * @return array
+     */
+    public function getStyleArray($array)
+    {
+        return array('protection' => $array);
+    }
+
+    /**
+     * Apply styles from array
+     *
+     * <code>
+     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray(
+     *        array(
+     *            'locked' => TRUE,
+     *            'hidden' => FALSE
+     *        )
+     * );
+     * </code>
+     *
+     * @param    array    $pStyles    Array containing style information
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Style_Protection
+     */
+    public function applyFromArray($pStyles = null)
+    {
+        if (is_array($pStyles)) {
+            if ($this->isSupervisor) {
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            } else {
+                if (isset($pStyles['locked'])) {
+                    $this->setLocked($pStyles['locked']);
+                }
+                if (isset($pStyles['hidden'])) {
+                    $this->setHidden($pStyles['hidden']);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception("Invalid style array passed.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get locked
+     *
+     * @return string
+     */
+    public function getLocked()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getLocked();
+        }
+        return $this->locked;
+    }
+
+    /**
+     * Set locked
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_Protection
+     */
+    public function setLocked($pValue = self::PROTECTION_INHERIT)
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('locked' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->locked = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hidden
+     *
+     * @return string
+     */
+    public function getHidden()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHidden();
+        }
+        return $this->hidden;
+    }
+
+    /**
+     * Set hidden
+     *
+     * @param string $pValue
+     * @return PHPExcel_Style_Protection
+     */
+    public function setHidden($pValue = self::PROTECTION_INHERIT)
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(array('hidden' => $pValue));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->hidden = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+        return md5(
+            $this->locked .
+            $this->hidden .
+            __CLASS__
+        );
+    }
+}
diff --git a/lib/PHPExcel/Style/Supervisor.php b/lib/PHPExcel/Style/Supervisor.php
new file mode 100644
index 000000000..a90e1c6a9
--- /dev/null
+++ b/lib/PHPExcel/Style/Supervisor.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * PHPExcel_Style_Supervisor
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Style_Supervisor
+{
+    /**
+     * Supervisor?
+     *
+     * @var boolean
+     */
+    protected $isSupervisor;
+
+    /**
+     * Parent. Only used for supervisor
+     *
+     * @var PHPExcel_Style
+     */
+    protected $parent;
+
+    /**
+     * Create a new PHPExcel_Style_Alignment
+     *
+     * @param    boolean    $isSupervisor    Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct($isSupervisor = false)
+    {
+        // Supervisor?
+        $this->isSupervisor = $isSupervisor;
+    }
+
+    /**
+     * Bind parent. Only used for supervisor
+     *
+     * @param PHPExcel $parent
+     * @return PHPExcel_Style_Supervisor
+     */
+    public function bindParent($parent, $parentPropertyName = null)
+    {
+        $this->parent = $parent;
+        return $this;
+    }
+
+    /**
+     * Is this a supervisor or a cell style component?
+     *
+     * @return boolean
+     */
+    public function getIsSupervisor()
+    {
+        return $this->isSupervisor;
+    }
+
+    /**
+     * Get the currently active sheet. Only used for supervisor
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function getActiveSheet()
+    {
+        return $this->parent->getActiveSheet();
+    }
+
+    /**
+     * Get the currently active cell coordinate in currently active sheet.
+     * Only used for supervisor
+     *
+     * @return string E.g. 'A1'
+     */
+    public function getSelectedCells()
+    {
+        return $this->getActiveSheet()->getSelectedCells();
+    }
+
+    /**
+     * Get the currently active cell coordinate in currently active sheet.
+     * Only used for supervisor
+     *
+     * @return string E.g. 'A1'
+     */
+    public function getActiveCell()
+    {
+        return $this->getActiveSheet()->getActiveCell();
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ((is_object($value)) && ($key != 'parent')) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet.php b/lib/PHPExcel/Worksheet.php
new file mode 100644
index 000000000..483aa0021
--- /dev/null
+++ b/lib/PHPExcel/Worksheet.php
@@ -0,0 +1,2968 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet implements PHPExcel_IComparable
+{
+    /* Break types */
+    const BREAK_NONE   = 0;
+    const BREAK_ROW    = 1;
+    const BREAK_COLUMN = 2;
+
+    /* Sheet state */
+    const SHEETSTATE_VISIBLE    = 'visible';
+    const SHEETSTATE_HIDDEN     = 'hidden';
+    const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+
+    /**
+     * Invalid characters in sheet title
+     *
+     * @var array
+     */
+    private static $invalidCharacters = array('*', ':', '/', '\\', '?', '[', ']');
+
+    /**
+     * Parent spreadsheet
+     *
+     * @var PHPExcel
+     */
+    private $parent;
+
+    /**
+     * Cacheable collection of cells
+     *
+     * @var PHPExcel_CachedObjectStorage_xxx
+     */
+    private $cellCollection;
+
+    /**
+     * Collection of row dimensions
+     *
+     * @var PHPExcel_Worksheet_RowDimension[]
+     */
+    private $rowDimensions = array();
+
+    /**
+     * Default row dimension
+     *
+     * @var PHPExcel_Worksheet_RowDimension
+     */
+    private $defaultRowDimension;
+
+    /**
+     * Collection of column dimensions
+     *
+     * @var PHPExcel_Worksheet_ColumnDimension[]
+     */
+    private $columnDimensions = array();
+
+    /**
+     * Default column dimension
+     *
+     * @var PHPExcel_Worksheet_ColumnDimension
+     */
+    private $defaultColumnDimension = null;
+
+    /**
+     * Collection of drawings
+     *
+     * @var PHPExcel_Worksheet_BaseDrawing[]
+     */
+    private $drawingCollection = null;
+
+    /**
+     * Collection of Chart objects
+     *
+     * @var PHPExcel_Chart[]
+     */
+    private $chartCollection = array();
+
+    /**
+     * Worksheet title
+     *
+     * @var string
+     */
+    private $title;
+
+    /**
+     * Sheet state
+     *
+     * @var string
+     */
+    private $sheetState;
+
+    /**
+     * Page setup
+     *
+     * @var PHPExcel_Worksheet_PageSetup
+     */
+    private $pageSetup;
+
+    /**
+     * Page margins
+     *
+     * @var PHPExcel_Worksheet_PageMargins
+     */
+    private $pageMargins;
+
+    /**
+     * Page header/footer
+     *
+     * @var PHPExcel_Worksheet_HeaderFooter
+     */
+    private $headerFooter;
+
+    /**
+     * Sheet view
+     *
+     * @var PHPExcel_Worksheet_SheetView
+     */
+    private $sheetView;
+
+    /**
+     * Protection
+     *
+     * @var PHPExcel_Worksheet_Protection
+     */
+    private $protection;
+
+    /**
+     * Collection of styles
+     *
+     * @var PHPExcel_Style[]
+     */
+    private $styles = array();
+
+    /**
+     * Conditional styles. Indexed by cell coordinate, e.g. 'A1'
+     *
+     * @var array
+     */
+    private $conditionalStylesCollection = array();
+
+    /**
+     * Is the current cell collection sorted already?
+     *
+     * @var boolean
+     */
+    private $cellCollectionIsSorted = false;
+
+    /**
+     * Collection of breaks
+     *
+     * @var array
+     */
+    private $breaks = array();
+
+    /**
+     * Collection of merged cell ranges
+     *
+     * @var array
+     */
+    private $mergeCells = array();
+
+    /**
+     * Collection of protected cell ranges
+     *
+     * @var array
+     */
+    private $protectedCells = array();
+
+    /**
+     * Autofilter Range and selection
+     *
+     * @var PHPExcel_Worksheet_AutoFilter
+     */
+    private $autoFilter;
+
+    /**
+     * Freeze pane
+     *
+     * @var string
+     */
+    private $freezePane = '';
+
+    /**
+     * Show gridlines?
+     *
+     * @var boolean
+     */
+    private $showGridlines = true;
+
+    /**
+    * Print gridlines?
+    *
+    * @var boolean
+    */
+    private $printGridlines = false;
+
+    /**
+    * Show row and column headers?
+    *
+    * @var boolean
+    */
+    private $showRowColHeaders = true;
+
+    /**
+     * Show summary below? (Row/Column outline)
+     *
+     * @var boolean
+     */
+    private $showSummaryBelow = true;
+
+    /**
+     * Show summary right? (Row/Column outline)
+     *
+     * @var boolean
+     */
+    private $showSummaryRight = true;
+
+    /**
+     * Collection of comments
+     *
+     * @var PHPExcel_Comment[]
+     */
+    private $comments = array();
+
+    /**
+     * Active cell. (Only one!)
+     *
+     * @var string
+     */
+    private $activeCell = 'A1';
+
+    /**
+     * Selected cells
+     *
+     * @var string
+     */
+    private $selectedCells = 'A1';
+
+    /**
+     * Cached highest column
+     *
+     * @var string
+     */
+    private $cachedHighestColumn = 'A';
+
+    /**
+     * Cached highest row
+     *
+     * @var int
+     */
+    private $cachedHighestRow = 1;
+
+    /**
+     * Right-to-left?
+     *
+     * @var boolean
+     */
+    private $rightToLeft = false;
+
+    /**
+     * Hyperlinks. Indexed by cell coordinate, e.g. 'A1'
+     *
+     * @var array
+     */
+    private $hyperlinkCollection = array();
+
+    /**
+     * Data validation objects. Indexed by cell coordinate, e.g. 'A1'
+     *
+     * @var array
+     */
+    private $dataValidationCollection = array();
+
+    /**
+     * Tab color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    private $tabColor;
+
+    /**
+     * Dirty flag
+     *
+     * @var boolean
+     */
+    private $dirty = true;
+
+    /**
+     * Hash
+     *
+     * @var string
+     */
+    private $hash;
+
+    /**
+    * CodeName
+    *
+    * @var string
+    */
+    private $codeName = null;
+
+    /**
+     * Create a new worksheet
+     *
+     * @param PHPExcel        $pParent
+     * @param string        $pTitle
+     */
+    public function __construct(PHPExcel $pParent = null, $pTitle = 'Worksheet')
+    {
+        // Set parent and title
+        $this->parent = $pParent;
+        $this->setTitle($pTitle, false);
+        // setTitle can change $pTitle
+        $this->setCodeName($this->getTitle());
+        $this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
+
+        $this->cellCollection         = PHPExcel_CachedObjectStorageFactory::getInstance($this);
+        // Set page setup
+        $this->pageSetup              = new PHPExcel_Worksheet_PageSetup();
+        // Set page margins
+        $this->pageMargins            = new PHPExcel_Worksheet_PageMargins();
+        // Set page header/footer
+        $this->headerFooter           = new PHPExcel_Worksheet_HeaderFooter();
+        // Set sheet view
+        $this->sheetView              = new PHPExcel_Worksheet_SheetView();
+        // Drawing collection
+        $this->drawingCollection      = new ArrayObject();
+        // Chart collection
+        $this->chartCollection        = new ArrayObject();
+        // Protection
+        $this->protection             = new PHPExcel_Worksheet_Protection();
+        // Default row dimension
+        $this->defaultRowDimension    = new PHPExcel_Worksheet_RowDimension(null);
+        // Default column dimension
+        $this->defaultColumnDimension = new PHPExcel_Worksheet_ColumnDimension(null);
+        $this->autoFilter             = new PHPExcel_Worksheet_AutoFilter(null, $this);
+    }
+
+
+    /**
+     * Disconnect all cells from this PHPExcel_Worksheet object,
+     *    typically so that the worksheet object can be unset
+     *
+     */
+    public function disconnectCells()
+    {
+        if ($this->cellCollection !== null) {
+            $this->cellCollection->unsetWorksheetCells();
+            $this->cellCollection = null;
+        }
+        //    detach ourself from the workbook, so that it can then delete this worksheet successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Code to execute when this worksheet is unset()
+     *
+     */
+    public function __destruct()
+    {
+        PHPExcel_Calculation::getInstance($this->parent)->clearCalculationCacheForWorksheet($this->title);
+
+        $this->disconnectCells();
+    }
+
+   /**
+     * Return the cache controller for the cell collection
+     *
+     * @return PHPExcel_CachedObjectStorage_xxx
+     */
+    public function getCellCacheController()
+    {
+        return $this->cellCollection;
+    }
+
+
+    /**
+     * Get array of invalid characters for sheet title
+     *
+     * @return array
+     */
+    public static function getInvalidCharacters()
+    {
+        return self::$invalidCharacters;
+    }
+
+    /**
+     * Check sheet code name for valid Excel syntax
+     *
+     * @param string $pValue The string to check
+     * @return string The valid string
+     * @throws Exception
+     */
+    private static function checkSheetCodeName($pValue)
+    {
+        $CharCount = PHPExcel_Shared_String::CountCharacters($pValue);
+        if ($CharCount == 0) {
+            throw new PHPExcel_Exception('Sheet code name cannot be empty.');
+        }
+        // Some of the printable ASCII characters are invalid:  * : / \ ? [ ] and  first and last characters cannot be a "'"
+        if ((str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) ||
+            (PHPExcel_Shared_String::Substring($pValue, -1, 1)=='\'') ||
+            (PHPExcel_Shared_String::Substring($pValue, 0, 1)=='\'')) {
+            throw new PHPExcel_Exception('Invalid character found in sheet code name');
+        }
+
+        // Maximum 31 characters allowed for sheet title
+        if ($CharCount > 31) {
+            throw new PHPExcel_Exception('Maximum 31 characters allowed in sheet code name.');
+        }
+
+        return $pValue;
+    }
+
+   /**
+     * Check sheet title for valid Excel syntax
+     *
+     * @param string $pValue The string to check
+     * @return string The valid string
+     * @throws PHPExcel_Exception
+     */
+    private static function checkSheetTitle($pValue)
+    {
+        // Some of the printable ASCII characters are invalid:  * : / \ ? [ ]
+        if (str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) {
+            throw new PHPExcel_Exception('Invalid character found in sheet title');
+        }
+
+        // Maximum 31 characters allowed for sheet title
+        if (PHPExcel_Shared_String::CountCharacters($pValue) > 31) {
+            throw new PHPExcel_Exception('Maximum 31 characters allowed in sheet title.');
+        }
+
+        return $pValue;
+    }
+
+    /**
+     * Get collection of cells
+     *
+     * @param boolean $pSorted Also sort the cell collection?
+     * @return PHPExcel_Cell[]
+     */
+    public function getCellCollection($pSorted = true)
+    {
+        if ($pSorted) {
+            // Re-order cell collection
+            return $this->sortCellCollection();
+        }
+        if ($this->cellCollection !== null) {
+            return $this->cellCollection->getCellList();
+        }
+        return array();
+    }
+
+    /**
+     * Sort collection of cells
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function sortCellCollection()
+    {
+        if ($this->cellCollection !== null) {
+            return $this->cellCollection->getSortedCellList();
+        }
+        return array();
+    }
+
+    /**
+     * Get collection of row dimensions
+     *
+     * @return PHPExcel_Worksheet_RowDimension[]
+     */
+    public function getRowDimensions()
+    {
+        return $this->rowDimensions;
+    }
+
+    /**
+     * Get default row dimension
+     *
+     * @return PHPExcel_Worksheet_RowDimension
+     */
+    public function getDefaultRowDimension()
+    {
+        return $this->defaultRowDimension;
+    }
+
+    /**
+     * Get collection of column dimensions
+     *
+     * @return PHPExcel_Worksheet_ColumnDimension[]
+     */
+    public function getColumnDimensions()
+    {
+        return $this->columnDimensions;
+    }
+
+    /**
+     * Get default column dimension
+     *
+     * @return PHPExcel_Worksheet_ColumnDimension
+     */
+    public function getDefaultColumnDimension()
+    {
+        return $this->defaultColumnDimension;
+    }
+
+    /**
+     * Get collection of drawings
+     *
+     * @return PHPExcel_Worksheet_BaseDrawing[]
+     */
+    public function getDrawingCollection()
+    {
+        return $this->drawingCollection;
+    }
+
+    /**
+     * Get collection of charts
+     *
+     * @return PHPExcel_Chart[]
+     */
+    public function getChartCollection()
+    {
+        return $this->chartCollection;
+    }
+
+    /**
+     * Add chart
+     *
+     * @param PHPExcel_Chart $pChart
+     * @param int|null $iChartIndex Index where chart should go (0,1,..., or null for last)
+     * @return PHPExcel_Chart
+     */
+    public function addChart(PHPExcel_Chart $pChart = null, $iChartIndex = null)
+    {
+        $pChart->setWorksheet($this);
+        if (is_null($iChartIndex)) {
+            $this->chartCollection[] = $pChart;
+        } else {
+            // Insert the chart at the requested index
+            array_splice($this->chartCollection, $iChartIndex, 0, array($pChart));
+        }
+
+        return $pChart;
+    }
+
+    /**
+     * Return the count of charts on this worksheet
+     *
+     * @return int        The number of charts
+     */
+    public function getChartCount()
+    {
+        return count($this->chartCollection);
+    }
+
+    /**
+     * Get a chart by its index position
+     *
+     * @param string $index Chart index position
+     * @return false|PHPExcel_Chart
+     * @throws PHPExcel_Exception
+     */
+    public function getChartByIndex($index = null)
+    {
+        $chartCount = count($this->chartCollection);
+        if ($chartCount == 0) {
+            return false;
+        }
+        if (is_null($index)) {
+            $index = --$chartCount;
+        }
+        if (!isset($this->chartCollection[$index])) {
+            return false;
+        }
+
+        return $this->chartCollection[$index];
+    }
+
+    /**
+     * Return an array of the names of charts on this worksheet
+     *
+     * @return string[] The names of charts
+     * @throws PHPExcel_Exception
+     */
+    public function getChartNames()
+    {
+        $chartNames = array();
+        foreach ($this->chartCollection as $chart) {
+            $chartNames[] = $chart->getName();
+        }
+        return $chartNames;
+    }
+
+    /**
+     * Get a chart by name
+     *
+     * @param string $chartName Chart name
+     * @return false|PHPExcel_Chart
+     * @throws PHPExcel_Exception
+     */
+    public function getChartByName($chartName = '')
+    {
+        $chartCount = count($this->chartCollection);
+        if ($chartCount == 0) {
+            return false;
+        }
+        foreach ($this->chartCollection as $index => $chart) {
+            if ($chart->getName() == $chartName) {
+                return $this->chartCollection[$index];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Refresh column dimensions
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function refreshColumnDimensions()
+    {
+        $currentColumnDimensions = $this->getColumnDimensions();
+        $newColumnDimensions = array();
+
+        foreach ($currentColumnDimensions as $objColumnDimension) {
+            $newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension;
+        }
+
+        $this->columnDimensions = $newColumnDimensions;
+
+        return $this;
+    }
+
+    /**
+     * Refresh row dimensions
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function refreshRowDimensions()
+    {
+        $currentRowDimensions = $this->getRowDimensions();
+        $newRowDimensions = array();
+
+        foreach ($currentRowDimensions as $objRowDimension) {
+            $newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension;
+        }
+
+        $this->rowDimensions = $newRowDimensions;
+
+        return $this;
+    }
+
+    /**
+     * Calculate worksheet dimension
+     *
+     * @return string  String containing the dimension of this worksheet
+     */
+    public function calculateWorksheetDimension()
+    {
+        // Return
+        return 'A1' . ':' .  $this->getHighestColumn() . $this->getHighestRow();
+    }
+
+    /**
+     * Calculate worksheet data dimension
+     *
+     * @return string  String containing the dimension of this worksheet that actually contain data
+     */
+    public function calculateWorksheetDataDimension()
+    {
+        // Return
+        return 'A1' . ':' .  $this->getHighestDataColumn() . $this->getHighestDataRow();
+    }
+
+    /**
+     * Calculate widths for auto-size columns
+     *
+     * @param  boolean  $calculateMergeCells  Calculate merge cell width
+     * @return PHPExcel_Worksheet;
+     */
+    public function calculateColumnWidths($calculateMergeCells = false)
+    {
+        // initialize $autoSizes array
+        $autoSizes = array();
+        foreach ($this->getColumnDimensions() as $colDimension) {
+            if ($colDimension->getAutoSize()) {
+                $autoSizes[$colDimension->getColumnIndex()] = -1;
+            }
+        }
+
+        // There is only something to do if there are some auto-size columns
+        if (!empty($autoSizes)) {
+            // build list of cells references that participate in a merge
+            $isMergeCell = array();
+            foreach ($this->getMergeCells() as $cells) {
+                foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cells) as $cellReference) {
+                    $isMergeCell[$cellReference] = true;
+                }
+            }
+
+            // loop through all cells in the worksheet
+            foreach ($this->getCellCollection(false) as $cellID) {
+                $cell = $this->getCell($cellID, false);
+                if ($cell !== null && isset($autoSizes[$this->cellCollection->getCurrentColumn()])) {
+                    // Determine width if cell does not participate in a merge
+                    if (!isset($isMergeCell[$this->cellCollection->getCurrentAddress()])) {
+                        // Calculated value
+                        // To formatted string
+                        $cellValue = PHPExcel_Style_NumberFormat::toFormattedString(
+                            $cell->getCalculatedValue(),
+                            $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode()
+                        );
+
+                        $autoSizes[$this->cellCollection->getCurrentColumn()] = max(
+                            (float) $autoSizes[$this->cellCollection->getCurrentColumn()],
+                            (float)PHPExcel_Shared_Font::calculateColumnWidth(
+                                $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
+                                $cellValue,
+                                $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
+                                $this->getDefaultStyle()->getFont()
+                            )
+                        );
+                    }
+                }
+            }
+
+            // adjust column widths
+            foreach ($autoSizes as $columnIndex => $width) {
+                if ($width == -1) {
+                    $width = $this->getDefaultColumnDimension()->getWidth();
+                }
+                $this->getColumnDimension($columnIndex)->setWidth($width);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get parent
+     *
+     * @return PHPExcel
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Re-bind parent
+     *
+     * @param PHPExcel $parent
+     * @return PHPExcel_Worksheet
+     */
+    public function rebindParent(PHPExcel $parent)
+    {
+        if ($this->parent !== null) {
+            $namedRanges = $this->parent->getNamedRanges();
+            foreach ($namedRanges as $namedRange) {
+                $parent->addNamedRange($namedRange);
+            }
+
+            $this->parent->removeSheetByIndex(
+                $this->parent->getIndex($this)
+            );
+        }
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Get title
+     *
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set title
+     *
+     * @param string $pValue String containing the dimension of this worksheet
+     * @param string $updateFormulaCellReferences boolean Flag indicating whether cell references in formulae should
+     *            be updated to reflect the new sheet name.
+     *          This should be left as the default true, unless you are
+     *          certain that no formula cells on any worksheet contain
+     *          references to this worksheet
+     * @return PHPExcel_Worksheet
+     */
+    public function setTitle($pValue = 'Worksheet', $updateFormulaCellReferences = true)
+    {
+        // Is this a 'rename' or not?
+        if ($this->getTitle() == $pValue) {
+            return $this;
+        }
+
+        // Syntax check
+        self::checkSheetTitle($pValue);
+
+        // Old title
+        $oldTitle = $this->getTitle();
+
+        if ($this->parent) {
+            // Is there already such sheet name?
+            if ($this->parent->sheetNameExists($pValue)) {
+                // Use name, but append with lowest possible integer
+
+                if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
+                    $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 29);
+                }
+                $i = 1;
+                while ($this->parent->sheetNameExists($pValue . ' ' . $i)) {
+                    ++$i;
+                    if ($i == 10) {
+                        if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
+                            $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 28);
+                        }
+                    } elseif ($i == 100) {
+                        if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
+                            $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 27);
+                        }
+                    }
+                }
+
+                $altTitle = $pValue . ' ' . $i;
+                return $this->setTitle($altTitle, $updateFormulaCellReferences);
+            }
+        }
+
+        // Set title
+        $this->title = $pValue;
+        $this->dirty = true;
+
+        if ($this->parent && $this->parent->getCalculationEngine()) {
+            // New title
+            $newTitle = $this->getTitle();
+            $this->parent->getCalculationEngine()
+                ->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
+            if ($updateFormulaCellReferences) {
+                PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->parent, $oldTitle, $newTitle);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get sheet state
+     *
+     * @return string Sheet state (visible, hidden, veryHidden)
+     */
+    public function getSheetState()
+    {
+        return $this->sheetState;
+    }
+
+    /**
+     * Set sheet state
+     *
+     * @param string $value Sheet state (visible, hidden, veryHidden)
+     * @return PHPExcel_Worksheet
+     */
+    public function setSheetState($value = PHPExcel_Worksheet::SHEETSTATE_VISIBLE)
+    {
+        $this->sheetState = $value;
+        return $this;
+    }
+
+    /**
+     * Get page setup
+     *
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function getPageSetup()
+    {
+        return $this->pageSetup;
+    }
+
+    /**
+     * Set page setup
+     *
+     * @param PHPExcel_Worksheet_PageSetup    $pValue
+     * @return PHPExcel_Worksheet
+     */
+    public function setPageSetup(PHPExcel_Worksheet_PageSetup $pValue)
+    {
+        $this->pageSetup = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get page margins
+     *
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function getPageMargins()
+    {
+        return $this->pageMargins;
+    }
+
+    /**
+     * Set page margins
+     *
+     * @param PHPExcel_Worksheet_PageMargins    $pValue
+     * @return PHPExcel_Worksheet
+     */
+    public function setPageMargins(PHPExcel_Worksheet_PageMargins $pValue)
+    {
+        $this->pageMargins = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get page header/footer
+     *
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function getHeaderFooter()
+    {
+        return $this->headerFooter;
+    }
+
+    /**
+     * Set page header/footer
+     *
+     * @param PHPExcel_Worksheet_HeaderFooter    $pValue
+     * @return PHPExcel_Worksheet
+     */
+    public function setHeaderFooter(PHPExcel_Worksheet_HeaderFooter $pValue)
+    {
+        $this->headerFooter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get sheet view
+     *
+     * @return PHPExcel_Worksheet_SheetView
+     */
+    public function getSheetView()
+    {
+        return $this->sheetView;
+    }
+
+    /**
+     * Set sheet view
+     *
+     * @param PHPExcel_Worksheet_SheetView    $pValue
+     * @return PHPExcel_Worksheet
+     */
+    public function setSheetView(PHPExcel_Worksheet_SheetView $pValue)
+    {
+        $this->sheetView = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Protection
+     *
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function getProtection()
+    {
+        return $this->protection;
+    }
+
+    /**
+     * Set Protection
+     *
+     * @param PHPExcel_Worksheet_Protection    $pValue
+     * @return PHPExcel_Worksheet
+     */
+    public function setProtection(PHPExcel_Worksheet_Protection $pValue)
+    {
+        $this->protection = $pValue;
+        $this->dirty = true;
+
+        return $this;
+    }
+
+    /**
+     * Get highest worksheet column
+     *
+     * @param   string     $row        Return the data highest column for the specified row,
+     *                                     or the highest column of any row if no row number is passed
+     * @return string Highest column name
+     */
+    public function getHighestColumn($row = null)
+    {
+        if ($row == null) {
+            return $this->cachedHighestColumn;
+        }
+        return $this->getHighestDataColumn($row);
+    }
+
+    /**
+     * Get highest worksheet column that contains data
+     *
+     * @param   string     $row        Return the highest data column for the specified row,
+     *                                     or the highest data column of any row if no row number is passed
+     * @return string Highest column name that contains data
+     */
+    public function getHighestDataColumn($row = null)
+    {
+        return $this->cellCollection->getHighestColumn($row);
+    }
+
+    /**
+     * Get highest worksheet row
+     *
+     * @param   string     $column     Return the highest data row for the specified column,
+     *                                     or the highest row of any column if no column letter is passed
+     * @return int Highest row number
+     */
+    public function getHighestRow($column = null)
+    {
+        if ($column == null) {
+            return $this->cachedHighestRow;
+        }
+        return $this->getHighestDataRow($column);
+    }
+
+    /**
+     * Get highest worksheet row that contains data
+     *
+     * @param   string     $column     Return the highest data row for the specified column,
+     *                                     or the highest data row of any column if no column letter is passed
+     * @return string Highest row number that contains data
+     */
+    public function getHighestDataRow($column = null)
+    {
+        return $this->cellCollection->getHighestRow($column);
+    }
+
+    /**
+     * Get highest worksheet column and highest row that have cell records
+     *
+     * @return array Highest column name and highest row number
+     */
+    public function getHighestRowAndColumn()
+    {
+        return $this->cellCollection->getHighestRowAndColumn();
+    }
+
+    /**
+     * Set a cell value
+     *
+     * @param string $pCoordinate Coordinate of the cell
+     * @param mixed $pValue Value of the cell
+     * @param bool $returnCell   Return the worksheet (false, default) or the cell (true)
+     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
+     */
+    public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false)
+    {
+        $cell = $this->getCell(strtoupper($pCoordinate))->setValue($pValue);
+        return ($returnCell) ? $cell : $this;
+    }
+
+    /**
+     * Set a cell value by using numeric cell coordinates
+     *
+     * @param string $pColumn Numeric column coordinate of the cell (A = 0)
+     * @param string $pRow Numeric row coordinate of the cell
+     * @param mixed $pValue Value of the cell
+     * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
+     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
+     */
+    public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false)
+    {
+        $cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValue($pValue);
+        return ($returnCell) ? $cell : $this;
+    }
+
+    /**
+     * Set a cell value
+     *
+     * @param string $pCoordinate Coordinate of the cell
+     * @param mixed  $pValue Value of the cell
+     * @param string $pDataType Explicit data type
+     * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
+     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
+     */
+    public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
+    {
+        // Set value
+        $cell = $this->getCell(strtoupper($pCoordinate))->setValueExplicit($pValue, $pDataType);
+        return ($returnCell) ? $cell : $this;
+    }
+
+    /**
+     * Set a cell value by using numeric cell coordinates
+     *
+     * @param string $pColumn Numeric column coordinate of the cell
+     * @param string $pRow Numeric row coordinate of the cell
+     * @param mixed $pValue Value of the cell
+     * @param string $pDataType Explicit data type
+     * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
+     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
+     */
+    public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
+    {
+        $cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValueExplicit($pValue, $pDataType);
+        return ($returnCell) ? $cell : $this;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param string $pCoordinate    Coordinate of the cell
+     * @param boolean $createIfNotExists  Flag indicating whether a new cell should be created if it doesn't
+     *                                       already exist, or a null should be returned instead
+     * @throws PHPExcel_Exception
+     * @return null|PHPExcel_Cell Cell that was found/created or null
+     */
+    public function getCell($pCoordinate = 'A1', $createIfNotExists = true)
+    {
+        // Check cell collection
+        if ($this->cellCollection->isDataSet(strtoupper($pCoordinate))) {
+            return $this->cellCollection->getCacheData($pCoordinate);
+        }
+
+        // Worksheet reference?
+        if (strpos($pCoordinate, '!') !== false) {
+            $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
+            return $this->parent->getSheetByName($worksheetReference[0])->getCell(strtoupper($worksheetReference[1]), $createIfNotExists);
+        }
+
+        // Named range?
+        if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+            (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
+            $namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
+            if ($namedRange !== null) {
+                $pCoordinate = $namedRange->getRange();
+                return $namedRange->getWorksheet()->getCell($pCoordinate, $createIfNotExists);
+            }
+        }
+
+        // Uppercase coordinate
+        $pCoordinate = strtoupper($pCoordinate);
+
+        if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
+        } elseif (strpos($pCoordinate, '$') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
+        }
+
+        // Create new cell object, if required
+        return $createIfNotExists ? $this->createNewCell($pCoordinate) : null;
+    }
+
+    /**
+     * Get cell at a specific coordinate by using numeric cell coordinates
+     *
+     * @param  string $pColumn Numeric column coordinate of the cell (starting from 0)
+     * @param string $pRow Numeric row coordinate of the cell
+     * @param boolean $createIfNotExists  Flag indicating whether a new cell should be created if it doesn't
+     *                                       already exist, or a null should be returned instead
+     * @return null|PHPExcel_Cell Cell that was found/created or null
+     */
+    public function getCellByColumnAndRow($pColumn = 0, $pRow = 1, $createIfNotExists = true)
+    {
+        $columnLetter = PHPExcel_Cell::stringFromColumnIndex($pColumn);
+        $coordinate = $columnLetter . $pRow;
+
+        if ($this->cellCollection->isDataSet($coordinate)) {
+            return $this->cellCollection->getCacheData($coordinate);
+        }
+
+        // Create new cell object, if required
+        return $createIfNotExists ? $this->createNewCell($coordinate) : null;
+    }
+
+    /**
+     * Create a new cell at the specified coordinate
+     *
+     * @param string $pCoordinate    Coordinate of the cell
+     * @return PHPExcel_Cell Cell that was created
+     */
+    private function createNewCell($pCoordinate)
+    {
+        $cell = $this->cellCollection->addCacheData(
+            $pCoordinate,
+            new PHPExcel_Cell(null, PHPExcel_Cell_DataType::TYPE_NULL, $this)
+        );
+        $this->cellCollectionIsSorted = false;
+
+        // Coordinates
+        $aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
+        if (PHPExcel_Cell::columnIndexFromString($this->cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0])) {
+            $this->cachedHighestColumn = $aCoordinates[0];
+        }
+        $this->cachedHighestRow = max($this->cachedHighestRow, $aCoordinates[1]);
+
+        // Cell needs appropriate xfIndex from dimensions records
+        //    but don't create dimension records if they don't already exist
+        $rowDimension    = $this->getRowDimension($aCoordinates[1], false);
+        $columnDimension = $this->getColumnDimension($aCoordinates[0], false);
+
+        if ($rowDimension !== null && $rowDimension->getXfIndex() > 0) {
+            // then there is a row dimension with explicit style, assign it to the cell
+            $cell->setXfIndex($rowDimension->getXfIndex());
+        } elseif ($columnDimension !== null && $columnDimension->getXfIndex() > 0) {
+            // then there is a column dimension, assign it to the cell
+            $cell->setXfIndex($columnDimension->getXfIndex());
+        }
+
+        return $cell;
+    }
+
+    /**
+     * Does the cell at a specific coordinate exist?
+     *
+     * @param string $pCoordinate  Coordinate of the cell
+     * @throws PHPExcel_Exception
+     * @return boolean
+     */
+    public function cellExists($pCoordinate = 'A1')
+    {
+       // Worksheet reference?
+        if (strpos($pCoordinate, '!') !== false) {
+            $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
+            return $this->parent->getSheetByName($worksheetReference[0])->cellExists(strtoupper($worksheetReference[1]));
+        }
+
+        // Named range?
+        if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+            (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
+            $namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
+            if ($namedRange !== null) {
+                $pCoordinate = $namedRange->getRange();
+                if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
+                    if (!$namedRange->getLocalOnly()) {
+                        return $namedRange->getWorksheet()->cellExists($pCoordinate);
+                    } else {
+                        throw new PHPExcel_Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
+                    }
+                }
+            } else {
+                return false;
+            }
+        }
+
+        // Uppercase coordinate
+        $pCoordinate = strtoupper($pCoordinate);
+
+        if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
+        } elseif (strpos($pCoordinate, '$') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
+        } else {
+            // Coordinates
+            $aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
+
+            // Cell exists?
+            return $this->cellCollection->isDataSet($pCoordinate);
+        }
+    }
+
+    /**
+     * Cell at a specific coordinate by using numeric cell coordinates exists?
+     *
+     * @param string $pColumn Numeric column coordinate of the cell
+     * @param string $pRow Numeric row coordinate of the cell
+     * @return boolean
+     */
+    public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
+    {
+        return $this->cellExists(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+    }
+
+    /**
+     * Get row dimension at a specific row
+     *
+     * @param int $pRow Numeric index of the row
+     * @return PHPExcel_Worksheet_RowDimension
+     */
+    public function getRowDimension($pRow = 1, $create = true)
+    {
+        // Found
+        $found = null;
+
+        // Get row dimension
+        if (!isset($this->rowDimensions[$pRow])) {
+            if (!$create) {
+                return null;
+            }
+            $this->rowDimensions[$pRow] = new PHPExcel_Worksheet_RowDimension($pRow);
+
+            $this->cachedHighestRow = max($this->cachedHighestRow, $pRow);
+        }
+        return $this->rowDimensions[$pRow];
+    }
+
+    /**
+     * Get column dimension at a specific column
+     *
+     * @param string $pColumn String index of the column
+     * @return PHPExcel_Worksheet_ColumnDimension
+     */
+    public function getColumnDimension($pColumn = 'A', $create = true)
+    {
+        // Uppercase coordinate
+        $pColumn = strtoupper($pColumn);
+
+        // Fetch dimensions
+        if (!isset($this->columnDimensions[$pColumn])) {
+            if (!$create) {
+                return null;
+            }
+            $this->columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
+
+            if (PHPExcel_Cell::columnIndexFromString($this->cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn)) {
+                $this->cachedHighestColumn = $pColumn;
+            }
+        }
+        return $this->columnDimensions[$pColumn];
+    }
+
+    /**
+     * Get column dimension at a specific column by using numeric cell coordinates
+     *
+     * @param string $pColumn Numeric column coordinate of the cell
+     * @return PHPExcel_Worksheet_ColumnDimension
+     */
+    public function getColumnDimensionByColumn($pColumn = 0)
+    {
+        return $this->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($pColumn));
+    }
+
+    /**
+     * Get styles
+     *
+     * @return PHPExcel_Style[]
+     */
+    public function getStyles()
+    {
+        return $this->styles;
+    }
+
+    /**
+     * Get default style of workbook.
+     *
+     * @deprecated
+     * @return PHPExcel_Style
+     * @throws PHPExcel_Exception
+     */
+    public function getDefaultStyle()
+    {
+        return $this->parent->getDefaultStyle();
+    }
+
+    /**
+     * Set default style - should only be used by PHPExcel_IReader implementations!
+     *
+     * @deprecated
+     * @param PHPExcel_Style $pValue
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function setDefaultStyle(PHPExcel_Style $pValue)
+    {
+        $this->parent->getDefaultStyle()->applyFromArray(array(
+            'font' => array(
+                'name' => $pValue->getFont()->getName(),
+                'size' => $pValue->getFont()->getSize(),
+            ),
+        ));
+        return $this;
+    }
+
+    /**
+     * Get style for cell
+     *
+     * @param string $pCellCoordinate Cell coordinate (or range) to get style for
+     * @return PHPExcel_Style
+     * @throws PHPExcel_Exception
+     */
+    public function getStyle($pCellCoordinate = 'A1')
+    {
+        // set this sheet as active
+        $this->parent->setActiveSheetIndex($this->parent->getIndex($this));
+
+        // set cell coordinate as active
+        $this->setSelectedCells(strtoupper($pCellCoordinate));
+
+        return $this->parent->getCellXfSupervisor();
+    }
+
+    /**
+     * Get conditional styles for a cell
+     *
+     * @param string $pCoordinate
+     * @return PHPExcel_Style_Conditional[]
+     */
+    public function getConditionalStyles($pCoordinate = 'A1')
+    {
+        $pCoordinate = strtoupper($pCoordinate);
+        if (!isset($this->conditionalStylesCollection[$pCoordinate])) {
+            $this->conditionalStylesCollection[$pCoordinate] = array();
+        }
+        return $this->conditionalStylesCollection[$pCoordinate];
+    }
+
+    /**
+     * Do conditional styles exist for this cell?
+     *
+     * @param string $pCoordinate
+     * @return boolean
+     */
+    public function conditionalStylesExists($pCoordinate = 'A1')
+    {
+        if (isset($this->conditionalStylesCollection[strtoupper($pCoordinate)])) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Removes conditional styles for a cell
+     *
+     * @param string $pCoordinate
+     * @return PHPExcel_Worksheet
+     */
+    public function removeConditionalStyles($pCoordinate = 'A1')
+    {
+        unset($this->conditionalStylesCollection[strtoupper($pCoordinate)]);
+        return $this;
+    }
+
+    /**
+     * Get collection of conditional styles
+     *
+     * @return array
+     */
+    public function getConditionalStylesCollection()
+    {
+        return $this->conditionalStylesCollection;
+    }
+
+    /**
+     * Set conditional styles
+     *
+     * @param $pCoordinate string E.g. 'A1'
+     * @param $pValue PHPExcel_Style_Conditional[]
+     * @return PHPExcel_Worksheet
+     */
+    public function setConditionalStyles($pCoordinate = 'A1', $pValue)
+    {
+        $this->conditionalStylesCollection[strtoupper($pCoordinate)] = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get style for cell by using numeric cell coordinates
+     *
+     * @param int $pColumn  Numeric column coordinate of the cell
+     * @param int $pRow Numeric row coordinate of the cell
+     * @param int pColumn2 Numeric column coordinate of the range cell
+     * @param int pRow2 Numeric row coordinate of the range cell
+     * @return PHPExcel_Style
+     */
+    public function getStyleByColumnAndRow($pColumn = 0, $pRow = 1, $pColumn2 = null, $pRow2 = null)
+    {
+        if (!is_null($pColumn2) && !is_null($pRow2)) {
+            $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+            return $this->getStyle($cellRange);
+        }
+
+        return $this->getStyle(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+    }
+
+    /**
+     * Set shared cell style to a range of cells
+     *
+     * Please note that this will overwrite existing cell styles for cells in range!
+     *
+     * @deprecated
+     * @param PHPExcel_Style $pSharedCellStyle Cell style to share
+     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
+    {
+        $this->duplicateStyle($pSharedCellStyle, $pRange);
+        return $this;
+    }
+
+    /**
+     * Duplicate cell style to a range of cells
+     *
+     * Please note that this will overwrite existing cell styles for cells in range!
+     *
+     * @param PHPExcel_Style $pCellStyle Cell style to duplicate
+     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function duplicateStyle(PHPExcel_Style $pCellStyle = null, $pRange = '')
+    {
+        // make sure we have a real style and not supervisor
+        $style = $pCellStyle->getIsSupervisor() ? $pCellStyle->getSharedComponent() : $pCellStyle;
+
+        // Add the style to the workbook if necessary
+        $workbook = $this->parent;
+        if ($existingStyle = $this->parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
+            // there is already such cell Xf in our collection
+            $xfIndex = $existingStyle->getIndex();
+        } else {
+            // we don't have such a cell Xf, need to add
+            $workbook->addCellXf($pCellStyle);
+            $xfIndex = $pCellStyle->getIndex();
+        }
+
+        // Calculate range outer borders
+        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange . ':' . $pRange);
+
+        // Make sure we can loop upwards on rows and columns
+        if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
+            $tmp = $rangeStart;
+            $rangeStart = $rangeEnd;
+            $rangeEnd = $tmp;
+        }
+
+        // Loop through cells and apply styles
+        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                $this->getCell(PHPExcel_Cell::stringFromColumnIndex($col - 1) . $row)->setXfIndex($xfIndex);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Duplicate conditional style to a range of cells
+     *
+     * Please note that this will overwrite existing cell styles for cells in range!
+     *
+     * @param    array of PHPExcel_Style_Conditional    $pCellStyle    Cell style to duplicate
+     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function duplicateConditionalStyle(array $pCellStyle = null, $pRange = '')
+    {
+        foreach ($pCellStyle as $cellStyle) {
+            if (!($cellStyle instanceof PHPExcel_Style_Conditional)) {
+                throw new PHPExcel_Exception('Style is not a conditional style');
+            }
+        }
+
+        // Calculate range outer borders
+        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange . ':' . $pRange);
+
+        // Make sure we can loop upwards on rows and columns
+        if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
+            $tmp = $rangeStart;
+            $rangeStart = $rangeEnd;
+            $rangeEnd = $tmp;
+        }
+
+        // Loop through cells and apply styles
+        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                $this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col - 1) . $row, $pCellStyle);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Duplicate cell style array to a range of cells
+     *
+     * Please note that this will overwrite existing cell styles for cells in range,
+     * if they are in the styles array. For example, if you decide to set a range of
+     * cells to font bold, only include font bold in the styles array.
+     *
+     * @deprecated
+     * @param array $pStyles Array containing style information
+     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @param boolean $pAdvanced Advanced mode for setting borders.
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true)
+    {
+        $this->getStyle($pRange)->applyFromArray($pStyles, $pAdvanced);
+        return $this;
+    }
+
+    /**
+     * Set break on a cell
+     *
+     * @param string $pCell Cell coordinate (e.g. A1)
+     * @param int $pBreak Break type (type of PHPExcel_Worksheet::BREAK_*)
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function setBreak($pCell = 'A1', $pBreak = PHPExcel_Worksheet::BREAK_NONE)
+    {
+        // Uppercase coordinate
+        $pCell = strtoupper($pCell);
+
+        if ($pCell != '') {
+            if ($pBreak == PHPExcel_Worksheet::BREAK_NONE) {
+                if (isset($this->breaks[$pCell])) {
+                    unset($this->breaks[$pCell]);
+                }
+            } else {
+                $this->breaks[$pCell] = $pBreak;
+            }
+        } else {
+            throw new PHPExcel_Exception('No cell coordinate specified.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set break on a cell by using numeric cell coordinates
+     *
+     * @param integer $pColumn Numeric column coordinate of the cell
+     * @param integer $pRow Numeric row coordinate of the cell
+     * @param  integer $pBreak Break type (type of PHPExcel_Worksheet::BREAK_*)
+     * @return PHPExcel_Worksheet
+     */
+    public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = PHPExcel_Worksheet::BREAK_NONE)
+    {
+        return $this->setBreak(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak);
+    }
+
+    /**
+     * Get breaks
+     *
+     * @return array[]
+     */
+    public function getBreaks()
+    {
+        return $this->breaks;
+    }
+
+    /**
+     * Set merge on a cell range
+     *
+     * @param string $pRange  Cell range (e.g. A1:E1)
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function mergeCells($pRange = 'A1:A1')
+    {
+        // Uppercase coordinate
+        $pRange = strtoupper($pRange);
+
+        if (strpos($pRange, ':') !== false) {
+            $this->mergeCells[$pRange] = $pRange;
+
+            // make sure cells are created
+
+            // get the cells in the range
+            $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
+
+            // create upper left cell if it does not already exist
+            $upperLeft = $aReferences[0];
+            if (!$this->cellExists($upperLeft)) {
+                $this->getCell($upperLeft)->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
+            }
+
+            // Blank out the rest of the cells in the range (if they exist)
+            $count = count($aReferences);
+            for ($i = 1; $i < $count; $i++) {
+                if ($this->cellExists($aReferences[$i])) {
+                    $this->getCell($aReferences[$i])->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
+                }
+            }
+        } else {
+            throw new PHPExcel_Exception('Merge must be set on a range of cells.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set merge on a cell range by using numeric cell coordinates
+     *
+     * @param int $pColumn1    Numeric column coordinate of the first cell
+     * @param int $pRow1        Numeric row coordinate of the first cell
+     * @param int $pColumn2    Numeric column coordinate of the last cell
+     * @param int $pRow2        Numeric row coordinate of the last cell
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
+    {
+        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+        return $this->mergeCells($cellRange);
+    }
+
+    /**
+     * Remove merge on a cell range
+     *
+     * @param    string            $pRange        Cell range (e.g. A1:E1)
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function unmergeCells($pRange = 'A1:A1')
+    {
+        // Uppercase coordinate
+        $pRange = strtoupper($pRange);
+
+        if (strpos($pRange, ':') !== false) {
+            if (isset($this->mergeCells[$pRange])) {
+                unset($this->mergeCells[$pRange]);
+            } else {
+                throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as merged.');
+            }
+        } else {
+            throw new PHPExcel_Exception('Merge can only be removed from a range of cells.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove merge on a cell range by using numeric cell coordinates
+     *
+     * @param int $pColumn1    Numeric column coordinate of the first cell
+     * @param int $pRow1        Numeric row coordinate of the first cell
+     * @param int $pColumn2    Numeric column coordinate of the last cell
+     * @param int $pRow2        Numeric row coordinate of the last cell
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
+    {
+        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+        return $this->unmergeCells($cellRange);
+    }
+
+    /**
+     * Get merge cells array.
+     *
+     * @return array[]
+     */
+    public function getMergeCells()
+    {
+        return $this->mergeCells;
+    }
+
+    /**
+     * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
+     * a single cell range.
+     *
+     * @param array
+     */
+    public function setMergeCells($pValue = array())
+    {
+        $this->mergeCells = $pValue;
+        return $this;
+    }
+
+    /**
+     * Set protection on a cell range
+     *
+     * @param    string            $pRange                Cell (e.g. A1) or cell range (e.g. A1:E1)
+     * @param    string            $pPassword            Password to unlock the protection
+     * @param    boolean        $pAlreadyHashed    If the password has already been hashed, set this to true
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function protectCells($pRange = 'A1', $pPassword = '', $pAlreadyHashed = false)
+    {
+        // Uppercase coordinate
+        $pRange = strtoupper($pRange);
+
+        if (!$pAlreadyHashed) {
+            $pPassword = PHPExcel_Shared_PasswordHasher::hashPassword($pPassword);
+        }
+        $this->protectedCells[$pRange] = $pPassword;
+
+        return $this;
+    }
+
+    /**
+     * Set protection on a cell range by using numeric cell coordinates
+     *
+     * @param int  $pColumn1            Numeric column coordinate of the first cell
+     * @param int  $pRow1                Numeric row coordinate of the first cell
+     * @param int  $pColumn2            Numeric column coordinate of the last cell
+     * @param int  $pRow2                Numeric row coordinate of the last cell
+     * @param string $pPassword            Password to unlock the protection
+     * @param    boolean $pAlreadyHashed    If the password has already been hashed, set this to true
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
+    {
+        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+        return $this->protectCells($cellRange, $pPassword, $pAlreadyHashed);
+    }
+
+    /**
+     * Remove protection on a cell range
+     *
+     * @param    string            $pRange        Cell (e.g. A1) or cell range (e.g. A1:E1)
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function unprotectCells($pRange = 'A1')
+    {
+        // Uppercase coordinate
+        $pRange = strtoupper($pRange);
+
+        if (isset($this->protectedCells[$pRange])) {
+            unset($this->protectedCells[$pRange]);
+        } else {
+            throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as protected.');
+        }
+        return $this;
+    }
+
+    /**
+     * Remove protection on a cell range by using numeric cell coordinates
+     *
+     * @param int  $pColumn1            Numeric column coordinate of the first cell
+     * @param int  $pRow1                Numeric row coordinate of the first cell
+     * @param int  $pColumn2            Numeric column coordinate of the last cell
+     * @param int $pRow2                Numeric row coordinate of the last cell
+     * @param string $pPassword            Password to unlock the protection
+     * @param    boolean $pAlreadyHashed    If the password has already been hashed, set this to true
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
+    {
+        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+        return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
+    }
+
+    /**
+     * Get protected cells
+     *
+     * @return array[]
+     */
+    public function getProtectedCells()
+    {
+        return $this->protectedCells;
+    }
+
+    /**
+     *    Get Autofilter
+     *
+     *    @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function getAutoFilter()
+    {
+        return $this->autoFilter;
+    }
+
+    /**
+     *    Set AutoFilter
+     *
+     *    @param    PHPExcel_Worksheet_AutoFilter|string   $pValue
+     *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet
+     */
+    public function setAutoFilter($pValue)
+    {
+        $pRange = strtoupper($pValue);
+        if (is_string($pValue)) {
+            $this->autoFilter->setRange($pValue);
+        } elseif (is_object($pValue) && ($pValue instanceof PHPExcel_Worksheet_AutoFilter)) {
+            $this->autoFilter = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     *    Set Autofilter Range by using numeric cell coordinates
+     *
+     *    @param  integer  $pColumn1    Numeric column coordinate of the first cell
+     *    @param  integer  $pRow1       Numeric row coordinate of the first cell
+     *    @param  integer  $pColumn2    Numeric column coordinate of the second cell
+     *    @param  integer  $pRow2       Numeric row coordinate of the second cell
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet
+     */
+    public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
+    {
+        return $this->setAutoFilter(
+            PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1
+            . ':' .
+            PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2
+        );
+    }
+
+    /**
+     * Remove autofilter
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function removeAutoFilter()
+    {
+        $this->autoFilter->setRange(null);
+        return $this;
+    }
+
+    /**
+     * Get Freeze Pane
+     *
+     * @return string
+     */
+    public function getFreezePane()
+    {
+        return $this->freezePane;
+    }
+
+    /**
+     * Freeze Pane
+     *
+     * @param    string        $pCell        Cell (i.e. A2)
+     *                                    Examples:
+     *                                        A2 will freeze the rows above cell A2 (i.e row 1)
+     *                                        B1 will freeze the columns to the left of cell B1 (i.e column A)
+     *                                        B2 will freeze the rows above and to the left of cell A2
+     *                                            (i.e row 1 and column A)
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function freezePane($pCell = '')
+    {
+        // Uppercase coordinate
+        $pCell = strtoupper($pCell);
+        if (strpos($pCell, ':') === false && strpos($pCell, ',') === false) {
+            $this->freezePane = $pCell;
+        } else {
+            throw new PHPExcel_Exception('Freeze pane can not be set on a range of cells.');
+        }
+        return $this;
+    }
+
+    /**
+     * Freeze Pane by using numeric cell coordinates
+     *
+     * @param int $pColumn    Numeric column coordinate of the cell
+     * @param int $pRow        Numeric row coordinate of the cell
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1)
+    {
+        return $this->freezePane(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+    }
+
+    /**
+     * Unfreeze Pane
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function unfreezePane()
+    {
+        return $this->freezePane('');
+    }
+
+    /**
+     * Insert a new row, updating all possible related data
+     *
+     * @param int $pBefore    Insert before this one
+     * @param int $pNumRows    Number of rows to insert
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function insertNewRowBefore($pBefore = 1, $pNumRows = 1)
+    {
+        if ($pBefore >= 1) {
+            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+            $objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
+        } else {
+            throw new PHPExcel_Exception("Rows can only be inserted before at least row 1.");
+        }
+        return $this;
+    }
+
+    /**
+     * Insert a new column, updating all possible related data
+     *
+     * @param int $pBefore    Insert before this one
+     * @param int $pNumCols    Number of columns to insert
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1)
+    {
+        if (!is_numeric($pBefore)) {
+            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+            $objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
+        } else {
+            throw new PHPExcel_Exception("Column references should not be numeric.");
+        }
+        return $this;
+    }
+
+    /**
+     * Insert a new column, updating all possible related data
+     *
+     * @param int $pBefore    Insert before this one (numeric column coordinate of the cell)
+     * @param int $pNumCols    Number of columns to insert
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1)
+    {
+        if ($pBefore >= 0) {
+            return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols);
+        } else {
+            throw new PHPExcel_Exception("Columns can only be inserted before at least column A (0).");
+        }
+    }
+
+    /**
+     * Delete a row, updating all possible related data
+     *
+     * @param int $pRow        Remove starting with this one
+     * @param int $pNumRows    Number of rows to remove
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function removeRow($pRow = 1, $pNumRows = 1)
+    {
+        if ($pRow >= 1) {
+            $highestRow = $this->getHighestDataRow();
+            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+            $objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
+            for ($r = 0; $r < $pNumRows; ++$r) {
+                $this->getCellCacheController()->removeRow($highestRow);
+                --$highestRow;
+            }
+        } else {
+            throw new PHPExcel_Exception("Rows to be deleted should at least start from row 1.");
+        }
+        return $this;
+    }
+
+    /**
+     * Remove a column, updating all possible related data
+     *
+     * @param string    $pColumn     Remove starting with this one
+     * @param int       $pNumCols    Number of columns to remove
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function removeColumn($pColumn = 'A', $pNumCols = 1)
+    {
+        if (!is_numeric($pColumn)) {
+            $highestColumn = $this->getHighestDataColumn();
+            $pColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
+            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+            $objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
+            for ($c = 0; $c < $pNumCols; ++$c) {
+                $this->getCellCacheController()->removeColumn($highestColumn);
+                $highestColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($highestColumn) - 2);
+            }
+        } else {
+            throw new PHPExcel_Exception("Column references should not be numeric.");
+        }
+        return $this;
+    }
+
+    /**
+     * Remove a column, updating all possible related data
+     *
+     * @param int $pColumn    Remove starting with this one (numeric column coordinate of the cell)
+     * @param int $pNumCols    Number of columns to remove
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function removeColumnByIndex($pColumn = 0, $pNumCols = 1)
+    {
+        if ($pColumn >= 0) {
+            return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols);
+        } else {
+            throw new PHPExcel_Exception("Columns to be deleted should at least start from column 0");
+        }
+    }
+
+    /**
+     * Show gridlines?
+     *
+     * @return boolean
+     */
+    public function getShowGridlines()
+    {
+        return $this->showGridlines;
+    }
+
+    /**
+     * Set show gridlines
+     *
+     * @param boolean $pValue    Show gridlines (true/false)
+     * @return PHPExcel_Worksheet
+     */
+    public function setShowGridlines($pValue = false)
+    {
+        $this->showGridlines = $pValue;
+        return $this;
+    }
+
+    /**
+    * Print gridlines?
+    *
+    * @return boolean
+    */
+    public function getPrintGridlines()
+    {
+        return $this->printGridlines;
+    }
+
+    /**
+    * Set print gridlines
+    *
+    * @param boolean $pValue Print gridlines (true/false)
+    * @return PHPExcel_Worksheet
+    */
+    public function setPrintGridlines($pValue = false)
+    {
+        $this->printGridlines = $pValue;
+        return $this;
+    }
+
+    /**
+    * Show row and column headers?
+    *
+    * @return boolean
+    */
+    public function getShowRowColHeaders()
+    {
+        return $this->showRowColHeaders;
+    }
+
+    /**
+    * Set show row and column headers
+    *
+    * @param boolean $pValue Show row and column headers (true/false)
+    * @return PHPExcel_Worksheet
+    */
+    public function setShowRowColHeaders($pValue = false)
+    {
+        $this->showRowColHeaders = $pValue;
+        return $this;
+    }
+
+    /**
+     * Show summary below? (Row/Column outlining)
+     *
+     * @return boolean
+     */
+    public function getShowSummaryBelow()
+    {
+        return $this->showSummaryBelow;
+    }
+
+    /**
+     * Set show summary below
+     *
+     * @param boolean $pValue    Show summary below (true/false)
+     * @return PHPExcel_Worksheet
+     */
+    public function setShowSummaryBelow($pValue = true)
+    {
+        $this->showSummaryBelow = $pValue;
+        return $this;
+    }
+
+    /**
+     * Show summary right? (Row/Column outlining)
+     *
+     * @return boolean
+     */
+    public function getShowSummaryRight()
+    {
+        return $this->showSummaryRight;
+    }
+
+    /**
+     * Set show summary right
+     *
+     * @param boolean $pValue    Show summary right (true/false)
+     * @return PHPExcel_Worksheet
+     */
+    public function setShowSummaryRight($pValue = true)
+    {
+        $this->showSummaryRight = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get comments
+     *
+     * @return PHPExcel_Comment[]
+     */
+    public function getComments()
+    {
+        return $this->comments;
+    }
+
+    /**
+     * Set comments array for the entire sheet.
+     *
+     * @param array of PHPExcel_Comment
+     * @return PHPExcel_Worksheet
+     */
+    public function setComments($pValue = array())
+    {
+        $this->comments = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get comment for cell
+     *
+     * @param string $pCellCoordinate    Cell coordinate to get comment for
+     * @return PHPExcel_Comment
+     * @throws PHPExcel_Exception
+     */
+    public function getComment($pCellCoordinate = 'A1')
+    {
+        // Uppercase coordinate
+        $pCellCoordinate = strtoupper($pCellCoordinate);
+
+        if (strpos($pCellCoordinate, ':') !== false || strpos($pCellCoordinate, ',') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (strpos($pCellCoordinate, '$') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate string must not be absolute.');
+        } elseif ($pCellCoordinate == '') {
+            throw new PHPExcel_Exception('Cell coordinate can not be zero-length string.');
+        } else {
+            // Check if we already have a comment for this cell.
+            // If not, create a new comment.
+            if (isset($this->comments[$pCellCoordinate])) {
+                return $this->comments[$pCellCoordinate];
+            } else {
+                $newComment = new PHPExcel_Comment();
+                $this->comments[$pCellCoordinate] = $newComment;
+                return $newComment;
+            }
+        }
+    }
+
+    /**
+     * Get comment for cell by using numeric cell coordinates
+     *
+     * @param int $pColumn    Numeric column coordinate of the cell
+     * @param int $pRow        Numeric row coordinate of the cell
+     * @return PHPExcel_Comment
+     */
+    public function getCommentByColumnAndRow($pColumn = 0, $pRow = 1)
+    {
+        return $this->getComment(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+    }
+
+    /**
+     * Get selected cell
+     *
+     * @deprecated
+     * @return string
+     */
+    public function getSelectedCell()
+    {
+        return $this->getSelectedCells();
+    }
+
+    /**
+     * Get active cell
+     *
+     * @return string Example: 'A1'
+     */
+    public function getActiveCell()
+    {
+        return $this->activeCell;
+    }
+
+    /**
+     * Get selected cells
+     *
+     * @return string
+     */
+    public function getSelectedCells()
+    {
+        return $this->selectedCells;
+    }
+
+    /**
+     * Selected cell
+     *
+     * @param    string        $pCoordinate    Cell (i.e. A1)
+     * @return PHPExcel_Worksheet
+     */
+    public function setSelectedCell($pCoordinate = 'A1')
+    {
+        return $this->setSelectedCells($pCoordinate);
+    }
+
+    /**
+     * Select a range of cells.
+     *
+     * @param    string        $pCoordinate    Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function setSelectedCells($pCoordinate = 'A1')
+    {
+        // Uppercase coordinate
+        $pCoordinate = strtoupper($pCoordinate);
+
+        // Convert 'A' to 'A:A'
+        $pCoordinate = preg_replace('/^([A-Z]+)$/', '${1}:${1}', $pCoordinate);
+
+        // Convert '1' to '1:1'
+        $pCoordinate = preg_replace('/^([0-9]+)$/', '${1}:${1}', $pCoordinate);
+
+        // Convert 'A:C' to 'A1:C1048576'
+        $pCoordinate = preg_replace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $pCoordinate);
+
+        // Convert '1:3' to 'A1:XFD3'
+        $pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate);
+
+        if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
+            list($first, ) = PHPExcel_Cell::splitRange($pCoordinate);
+            $this->activeCell = $first[0];
+        } else {
+            $this->activeCell = $pCoordinate;
+        }
+        $this->selectedCells = $pCoordinate;
+        return $this;
+    }
+
+    /**
+     * Selected cell by using numeric cell coordinates
+     *
+     * @param int $pColumn Numeric column coordinate of the cell
+     * @param int $pRow Numeric row coordinate of the cell
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1)
+    {
+        return $this->setSelectedCells(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+    }
+
+    /**
+     * Get right-to-left
+     *
+     * @return boolean
+     */
+    public function getRightToLeft()
+    {
+        return $this->rightToLeft;
+    }
+
+    /**
+     * Set right-to-left
+     *
+     * @param boolean $value    Right-to-left true/false
+     * @return PHPExcel_Worksheet
+     */
+    public function setRightToLeft($value = false)
+    {
+        $this->rightToLeft = $value;
+        return $this;
+    }
+
+    /**
+     * Fill worksheet from values in array
+     *
+     * @param array $source Source array
+     * @param mixed $nullValue Value in source array that stands for blank cell
+     * @param string $startCell Insert array starting from this cell address as the top left coordinate
+     * @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false)
+    {
+        if (is_array($source)) {
+            //    Convert a 1-D array to 2-D (for ease of looping)
+            if (!is_array(end($source))) {
+                $source = array($source);
+            }
+
+            // start coordinate
+            list ($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($startCell);
+
+            // Loop through $source
+            foreach ($source as $rowData) {
+                $currentColumn = $startColumn;
+                foreach ($rowData as $cellValue) {
+                    if ($strictNullComparison) {
+                        if ($cellValue !== $nullValue) {
+                            // Set cell value
+                            $this->getCell($currentColumn . $startRow)->setValue($cellValue);
+                        }
+                    } else {
+                        if ($cellValue != $nullValue) {
+                            // Set cell value
+                            $this->getCell($currentColumn . $startRow)->setValue($cellValue);
+                        }
+                    }
+                    ++$currentColumn;
+                }
+                ++$startRow;
+            }
+        } else {
+            throw new PHPExcel_Exception("Parameter \$source should be an array.");
+        }
+        return $this;
+    }
+
+    /**
+     * Create array from a range of cells
+     *
+     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param boolean $calculateFormulas Should formulas be calculated?
+     * @param boolean $formatData Should formatting be applied to cell values?
+     * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                               True - Return rows and columns indexed by their actual row and column IDs
+     * @return array
+     */
+    public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
+    {
+        // Returnvalue
+        $returnValue = array();
+        //    Identify the range that we need to extract from the worksheet
+        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
+        $minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] -1);
+        $minRow = $rangeStart[1];
+        $maxCol = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] -1);
+        $maxRow = $rangeEnd[1];
+
+        $maxCol++;
+        // Loop through rows
+        $r = -1;
+        for ($row = $minRow; $row <= $maxRow; ++$row) {
+            $rRef = ($returnCellRef) ? $row : ++$r;
+            $c = -1;
+            // Loop through columns in the current row
+            for ($col = $minCol; $col != $maxCol; ++$col) {
+                $cRef = ($returnCellRef) ? $col : ++$c;
+                //    Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
+                //        so we test and retrieve directly against cellCollection
+                if ($this->cellCollection->isDataSet($col.$row)) {
+                    // Cell exists
+                    $cell = $this->cellCollection->getCacheData($col.$row);
+                    if ($cell->getValue() !== null) {
+                        if ($cell->getValue() instanceof PHPExcel_RichText) {
+                            $returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText();
+                        } else {
+                            if ($calculateFormulas) {
+                                $returnValue[$rRef][$cRef] = $cell->getCalculatedValue();
+                            } else {
+                                $returnValue[$rRef][$cRef] = $cell->getValue();
+                            }
+                        }
+
+                        if ($formatData) {
+                            $style = $this->parent->getCellXfByIndex($cell->getXfIndex());
+                            $returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString(
+                                $returnValue[$rRef][$cRef],
+                                ($style && $style->getNumberFormat()) ? $style->getNumberFormat()->getFormatCode() : PHPExcel_Style_NumberFormat::FORMAT_GENERAL
+                            );
+                        }
+                    } else {
+                        // Cell holds a NULL
+                        $returnValue[$rRef][$cRef] = $nullValue;
+                    }
+                } else {
+                    // Cell doesn't exist
+                    $returnValue[$rRef][$cRef] = $nullValue;
+                }
+            }
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+
+    /**
+     * Create array from a range of cells
+     *
+     * @param  string $pNamedRange Name of the Named Range
+     * @param  mixed  $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param  boolean $calculateFormulas  Should formulas be calculated?
+     * @param  boolean $formatData  Should formatting be applied to cell values?
+     * @param  boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                                True - Return rows and columns indexed by their actual row and column IDs
+     * @return array
+     * @throws PHPExcel_Exception
+     */
+    public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
+    {
+        $namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
+        if ($namedRange !== null) {
+            $pWorkSheet = $namedRange->getWorksheet();
+            $pCellRange = $namedRange->getRange();
+
+            return $pWorkSheet->rangeToArray($pCellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
+        }
+
+        throw new PHPExcel_Exception('Named Range '.$pNamedRange.' does not exist.');
+    }
+
+
+    /**
+     * Create array from worksheet
+     *
+     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param boolean $calculateFormulas Should formulas be calculated?
+     * @param boolean $formatData  Should formatting be applied to cell values?
+     * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                               True - Return rows and columns indexed by their actual row and column IDs
+     * @return array
+     */
+    public function toArray($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
+    {
+        // Garbage collect...
+        $this->garbageCollect();
+
+        //    Identify the range that we need to extract from the worksheet
+        $maxCol = $this->getHighestColumn();
+        $maxRow = $this->getHighestRow();
+        // Return
+        return $this->rangeToArray('A1:'.$maxCol.$maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
+    }
+
+    /**
+     * Get row iterator
+     *
+     * @param   integer   $startRow   The row number at which to start iterating
+     * @param   integer   $endRow     The row number at which to stop iterating
+     *
+     * @return PHPExcel_Worksheet_RowIterator
+     */
+    public function getRowIterator($startRow = 1, $endRow = null)
+    {
+        return new PHPExcel_Worksheet_RowIterator($this, $startRow, $endRow);
+    }
+
+    /**
+     * Get column iterator
+     *
+     * @param   string   $startColumn The column address at which to start iterating
+     * @param   string   $endColumn   The column address at which to stop iterating
+     *
+     * @return PHPExcel_Worksheet_ColumnIterator
+     */
+    public function getColumnIterator($startColumn = 'A', $endColumn = null)
+    {
+        return new PHPExcel_Worksheet_ColumnIterator($this, $startColumn, $endColumn);
+    }
+
+    /**
+     * Run PHPExcel garabage collector.
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function garbageCollect()
+    {
+        // Flush cache
+        $this->cellCollection->getCacheData('A1');
+        // Build a reference table from images
+//        $imageCoordinates = array();
+//        $iterator = $this->getDrawingCollection()->getIterator();
+//        while ($iterator->valid()) {
+//            $imageCoordinates[$iterator->current()->getCoordinates()] = true;
+//
+//            $iterator->next();
+//        }
+//
+        // Lookup highest column and highest row if cells are cleaned
+        $colRow = $this->cellCollection->getHighestRowAndColumn();
+        $highestRow = $colRow['row'];
+        $highestColumn = PHPExcel_Cell::columnIndexFromString($colRow['column']);
+
+        // Loop through column dimensions
+        foreach ($this->columnDimensions as $dimension) {
+            $highestColumn = max($highestColumn, PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
+        }
+
+        // Loop through row dimensions
+        foreach ($this->rowDimensions as $dimension) {
+            $highestRow = max($highestRow, $dimension->getRowIndex());
+        }
+
+        // Cache values
+        if ($highestColumn < 0) {
+            $this->cachedHighestColumn = 'A';
+        } else {
+            $this->cachedHighestColumn = PHPExcel_Cell::stringFromColumnIndex(--$highestColumn);
+        }
+        $this->cachedHighestRow = $highestRow;
+
+        // Return
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        if ($this->dirty) {
+            $this->hash = md5($this->title . $this->autoFilter . ($this->protection->isProtectionEnabled() ? 't' : 'f') . __CLASS__);
+            $this->dirty = false;
+        }
+        return $this->hash;
+    }
+
+    /**
+     * Extract worksheet title from range.
+     *
+     * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
+     * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> array('testSheet 1', 'A1');
+     *
+     * @param string $pRange    Range to extract title from
+     * @param bool $returnRange    Return range? (see example)
+     * @return mixed
+     */
+    public static function extractSheetTitle($pRange, $returnRange = false)
+    {
+        // Sheet title included?
+        if (($sep = strpos($pRange, '!')) === false) {
+            return '';
+        }
+
+        if ($returnRange) {
+            return array(trim(substr($pRange, 0, $sep), "'"), substr($pRange, $sep + 1));
+        }
+
+        return substr($pRange, $sep + 1);
+    }
+
+    /**
+     * Get hyperlink
+     *
+     * @param string $pCellCoordinate    Cell coordinate to get hyperlink for
+     */
+    public function getHyperlink($pCellCoordinate = 'A1')
+    {
+        // return hyperlink if we already have one
+        if (isset($this->hyperlinkCollection[$pCellCoordinate])) {
+            return $this->hyperlinkCollection[$pCellCoordinate];
+        }
+
+        // else create hyperlink
+        $this->hyperlinkCollection[$pCellCoordinate] = new PHPExcel_Cell_Hyperlink();
+        return $this->hyperlinkCollection[$pCellCoordinate];
+    }
+
+    /**
+     * Set hyperlnk
+     *
+     * @param string $pCellCoordinate    Cell coordinate to insert hyperlink
+     * @param    PHPExcel_Cell_Hyperlink    $pHyperlink
+     * @return PHPExcel_Worksheet
+     */
+    public function setHyperlink($pCellCoordinate = 'A1', PHPExcel_Cell_Hyperlink $pHyperlink = null)
+    {
+        if ($pHyperlink === null) {
+            unset($this->hyperlinkCollection[$pCellCoordinate]);
+        } else {
+            $this->hyperlinkCollection[$pCellCoordinate] = $pHyperlink;
+        }
+        return $this;
+    }
+
+    /**
+     * Hyperlink at a specific coordinate exists?
+     *
+     * @param string $pCoordinate
+     * @return boolean
+     */
+    public function hyperlinkExists($pCoordinate = 'A1')
+    {
+        return isset($this->hyperlinkCollection[$pCoordinate]);
+    }
+
+    /**
+     * Get collection of hyperlinks
+     *
+     * @return PHPExcel_Cell_Hyperlink[]
+     */
+    public function getHyperlinkCollection()
+    {
+        return $this->hyperlinkCollection;
+    }
+
+    /**
+     * Get data validation
+     *
+     * @param string $pCellCoordinate Cell coordinate to get data validation for
+     */
+    public function getDataValidation($pCellCoordinate = 'A1')
+    {
+        // return data validation if we already have one
+        if (isset($this->dataValidationCollection[$pCellCoordinate])) {
+            return $this->dataValidationCollection[$pCellCoordinate];
+        }
+
+        // else create data validation
+        $this->dataValidationCollection[$pCellCoordinate] = new PHPExcel_Cell_DataValidation();
+        return $this->dataValidationCollection[$pCellCoordinate];
+    }
+
+    /**
+     * Set data validation
+     *
+     * @param string $pCellCoordinate    Cell coordinate to insert data validation
+     * @param    PHPExcel_Cell_DataValidation    $pDataValidation
+     * @return PHPExcel_Worksheet
+     */
+    public function setDataValidation($pCellCoordinate = 'A1', PHPExcel_Cell_DataValidation $pDataValidation = null)
+    {
+        if ($pDataValidation === null) {
+            unset($this->dataValidationCollection[$pCellCoordinate]);
+        } else {
+            $this->dataValidationCollection[$pCellCoordinate] = $pDataValidation;
+        }
+        return $this;
+    }
+
+    /**
+     * Data validation at a specific coordinate exists?
+     *
+     * @param string $pCoordinate
+     * @return boolean
+     */
+    public function dataValidationExists($pCoordinate = 'A1')
+    {
+        return isset($this->dataValidationCollection[$pCoordinate]);
+    }
+
+    /**
+     * Get collection of data validations
+     *
+     * @return PHPExcel_Cell_DataValidation[]
+     */
+    public function getDataValidationCollection()
+    {
+        return $this->dataValidationCollection;
+    }
+
+    /**
+     * Accepts a range, returning it as a range that falls within the current highest row and column of the worksheet
+     *
+     * @param string $range
+     * @return string Adjusted range value
+     */
+    public function shrinkRangeToFit($range)
+    {
+        $maxCol = $this->getHighestColumn();
+        $maxRow = $this->getHighestRow();
+        $maxCol = PHPExcel_Cell::columnIndexFromString($maxCol);
+
+        $rangeBlocks = explode(' ', $range);
+        foreach ($rangeBlocks as &$rangeSet) {
+            $rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($rangeSet);
+
+            if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) {
+                $rangeBoundaries[0][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol);
+            }
+            if ($rangeBoundaries[0][1] > $maxRow) {
+                $rangeBoundaries[0][1] = $maxRow;
+            }
+            if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) {
+                $rangeBoundaries[1][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol);
+            }
+            if ($rangeBoundaries[1][1] > $maxRow) {
+                $rangeBoundaries[1][1] = $maxRow;
+            }
+            $rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
+        }
+        unset($rangeSet);
+        $stRange = implode(' ', $rangeBlocks);
+
+        return $stRange;
+    }
+
+    /**
+     * Get tab color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getTabColor()
+    {
+        if ($this->tabColor === null) {
+            $this->tabColor = new PHPExcel_Style_Color();
+        }
+        return $this->tabColor;
+    }
+
+    /**
+     * Reset tab color
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function resetTabColor()
+    {
+        $this->tabColor = null;
+        unset($this->tabColor);
+
+        return $this;
+    }
+
+    /**
+     * Tab color set?
+     *
+     * @return boolean
+     */
+    public function isTabColorSet()
+    {
+        return ($this->tabColor !== null);
+    }
+
+    /**
+     * Copy worksheet (!= clone!)
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function copy()
+    {
+        $copied = clone $this;
+
+        return $copied;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        foreach ($this as $key => $val) {
+            if ($key == 'parent') {
+                continue;
+            }
+
+            if (is_object($val) || (is_array($val))) {
+                if ($key == 'cellCollection') {
+                    $newCollection = clone $this->cellCollection;
+                    $newCollection->copyCellCollection($this);
+                    $this->cellCollection = $newCollection;
+                } elseif ($key == 'drawingCollection') {
+                    $newCollection = clone $this->drawingCollection;
+                    $this->drawingCollection = $newCollection;
+                } elseif (($key == 'autoFilter') && ($this->autoFilter instanceof PHPExcel_Worksheet_AutoFilter)) {
+                    $newAutoFilter = clone $this->autoFilter;
+                    $this->autoFilter = $newAutoFilter;
+                    $this->autoFilter->setParent($this);
+                } else {
+                    $this->{$key} = unserialize(serialize($val));
+                }
+            }
+        }
+    }
+/**
+     * Define the code name of the sheet
+     *
+     * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore)
+     * @return objWorksheet
+     * @throws PHPExcel_Exception
+    */
+    public function setCodeName($pValue = null)
+    {
+        // Is this a 'rename' or not?
+        if ($this->getCodeName() == $pValue) {
+            return $this;
+        }
+        $pValue = str_replace(' ', '_', $pValue);//Excel does this automatically without flinching, we are doing the same
+        // Syntax check
+        // throw an exception if not valid
+        self::checkSheetCodeName($pValue);
+
+        // We use the same code that setTitle to find a valid codeName else not using a space (Excel don't like) but a '_'
+
+        if ($this->getParent()) {
+            // Is there already such sheet name?
+            if ($this->getParent()->sheetCodeNameExists($pValue)) {
+                // Use name, but append with lowest possible integer
+
+                if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
+                    $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 29);
+                }
+                $i = 1;
+                while ($this->getParent()->sheetCodeNameExists($pValue . '_' . $i)) {
+                    ++$i;
+                    if ($i == 10) {
+                        if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
+                            $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 28);
+                        }
+                    } elseif ($i == 100) {
+                        if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
+                            $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 27);
+                        }
+                    }
+                }
+
+                $pValue = $pValue . '_' . $i;// ok, we have a valid name
+                //codeName is'nt used in formula : no need to call for an update
+                //return $this->setTitle($altTitle, $updateFormulaCellReferences);
+            }
+        }
+
+        $this->codeName=$pValue;
+        return $this;
+    }
+    /**
+     * Return the code name of the sheet
+     *
+     * @return null|string
+    */
+    public function getCodeName()
+    {
+        return $this->codeName;
+    }
+    /**
+     * Sheet has a code name ?
+     * @return boolean
+    */
+    public function hasCodeName()
+    {
+        return !(is_null($this->codeName));
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/AutoFilter.php b/lib/PHPExcel/Worksheet/AutoFilter.php
new file mode 100644
index 000000000..1bc312bda
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/AutoFilter.php
@@ -0,0 +1,846 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_AutoFilter
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_AutoFilter
+{
+    /**
+     * Autofilter Worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $workSheet;
+
+
+    /**
+     * Autofilter Range
+     *
+     * @var string
+     */
+    private $range = '';
+
+
+    /**
+     * Autofilter Column Ruleset
+     *
+     * @var array of PHPExcel_Worksheet_AutoFilter_Column
+     */
+    private $columns = array();
+
+
+    /**
+     * Create a new PHPExcel_Worksheet_AutoFilter
+     *
+     *    @param    string        $pRange        Cell range (i.e. A1:E10)
+     * @param PHPExcel_Worksheet $pSheet
+     */
+    public function __construct($pRange = '', PHPExcel_Worksheet $pSheet = null)
+    {
+        $this->range = $pRange;
+        $this->workSheet = $pSheet;
+    }
+
+    /**
+     * Get AutoFilter Parent Worksheet
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function getParent()
+    {
+        return $this->workSheet;
+    }
+
+    /**
+     * Set AutoFilter Parent Worksheet
+     *
+     * @param PHPExcel_Worksheet $pSheet
+     * @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function setParent(PHPExcel_Worksheet $pSheet = null)
+    {
+        $this->workSheet = $pSheet;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Range
+     *
+     * @return string
+     */
+    public function getRange()
+    {
+        return $this->range;
+    }
+
+    /**
+     *    Set AutoFilter Range
+     *
+     *    @param    string        $pRange        Cell range (i.e. A1:E10)
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function setRange($pRange = '')
+    {
+        // Uppercase coordinate
+        $cellAddress = explode('!', strtoupper($pRange));
+        if (count($cellAddress) > 1) {
+            list($worksheet, $pRange) = $cellAddress;
+        }
+
+        if (strpos($pRange, ':') !== false) {
+            $this->range = $pRange;
+        } elseif (empty($pRange)) {
+            $this->range = '';
+        } else {
+            throw new PHPExcel_Exception('Autofilter must be set on a range of cells.');
+        }
+
+        if (empty($pRange)) {
+            //    Discard all column rules
+            $this->columns = array();
+        } else {
+            //    Discard any column rules that are no longer valid within this range
+            list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->range);
+            foreach ($this->columns as $key => $value) {
+                $colIndex = PHPExcel_Cell::columnIndexFromString($key);
+                if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
+                    unset($this->columns[$key]);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all AutoFilter Columns
+     *
+     * @throws    PHPExcel_Exception
+     * @return array of PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function getColumns()
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Validate that the specified column is in the AutoFilter range
+     *
+     * @param    string    $column            Column name (e.g. A)
+     * @throws    PHPExcel_Exception
+     * @return    integer    The column offset within the autofilter range
+     */
+    public function testColumnInRange($column)
+    {
+        if (empty($this->range)) {
+            throw new PHPExcel_Exception("No autofilter range is defined.");
+        }
+
+        $columnIndex = PHPExcel_Cell::columnIndexFromString($column);
+        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->range);
+        if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
+            throw new PHPExcel_Exception("Column is outside of current autofilter range.");
+        }
+
+        return $columnIndex - $rangeStart[0];
+    }
+
+    /**
+     * Get a specified AutoFilter Column Offset within the defined AutoFilter range
+     *
+     * @param    string    $pColumn        Column name (e.g. A)
+     * @throws    PHPExcel_Exception
+     * @return integer    The offset of the specified column within the autofilter range
+     */
+    public function getColumnOffset($pColumn)
+    {
+        return $this->testColumnInRange($pColumn);
+    }
+
+    /**
+     * Get a specified AutoFilter Column
+     *
+     * @param    string    $pColumn        Column name (e.g. A)
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function getColumn($pColumn)
+    {
+        $this->testColumnInRange($pColumn);
+
+        if (!isset($this->columns[$pColumn])) {
+            $this->columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
+        }
+
+        return $this->columns[$pColumn];
+    }
+
+    /**
+     * Get a specified AutoFilter Column by it's offset
+     *
+     * @param    integer    $pColumnOffset        Column offset within range (starting from 0)
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function getColumnByOffset($pColumnOffset = 0)
+    {
+        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->range);
+        $pColumn = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $pColumnOffset - 1);
+
+        return $this->getColumn($pColumn);
+    }
+
+    /**
+     *    Set AutoFilter
+     *
+     *    @param    PHPExcel_Worksheet_AutoFilter_Column|string        $pColumn
+     *            A simple string containing a Column ID like 'A' is permitted
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function setColumn($pColumn)
+    {
+        if ((is_string($pColumn)) && (!empty($pColumn))) {
+            $column = $pColumn;
+        } elseif (is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
+            $column = $pColumn->getColumnIndex();
+        } else {
+            throw new PHPExcel_Exception("Column is not within the autofilter range.");
+        }
+        $this->testColumnInRange($column);
+
+        if (is_string($pColumn)) {
+            $this->columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
+        } elseif (is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
+            $pColumn->setParent($this);
+            $this->columns[$column] = $pColumn;
+        }
+        ksort($this->columns);
+
+        return $this;
+    }
+
+    /**
+     * Clear a specified AutoFilter Column
+     *
+     * @param    string  $pColumn    Column name (e.g. A)
+     * @throws    PHPExcel_Exception
+     * @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function clearColumn($pColumn)
+    {
+        $this->testColumnInRange($pColumn);
+
+        if (isset($this->columns[$pColumn])) {
+            unset($this->columns[$pColumn]);
+        }
+
+        return $this;
+    }
+
+    /**
+     *    Shift an AutoFilter Column Rule to a different column
+     *
+     *    Note: This method bypasses validation of the destination column to ensure it is within this AutoFilter range.
+     *        Nor does it verify whether any column rule already exists at $toColumn, but will simply overrideany existing value.
+     *        Use with caution.
+     *
+     *    @param    string    $fromColumn        Column name (e.g. A)
+     *    @param    string    $toColumn        Column name (e.g. B)
+     *    @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function shiftColumn($fromColumn = null, $toColumn = null)
+    {
+        $fromColumn = strtoupper($fromColumn);
+        $toColumn = strtoupper($toColumn);
+
+        if (($fromColumn !== null) && (isset($this->columns[$fromColumn])) && ($toColumn !== null)) {
+            $this->columns[$fromColumn]->setParent();
+            $this->columns[$fromColumn]->setColumnIndex($toColumn);
+            $this->columns[$toColumn] = $this->columns[$fromColumn];
+            $this->columns[$toColumn]->setParent($this);
+            unset($this->columns[$fromColumn]);
+
+            ksort($this->columns);
+        }
+
+        return $this;
+    }
+
+
+    /**
+     *    Test if cell value is in the defined set of values
+     *
+     *    @param    mixed        $cellValue
+     *    @param    mixed[]        $dataSet
+     *    @return boolean
+     */
+    private static function filterTestInSimpleDataSet($cellValue, $dataSet)
+    {
+        $dataSetValues = $dataSet['filterValues'];
+        $blanks = $dataSet['blanks'];
+        if (($cellValue == '') || ($cellValue === null)) {
+            return $blanks;
+        }
+        return in_array($cellValue, $dataSetValues);
+    }
+
+    /**
+     *    Test if cell value is in the defined set of Excel date values
+     *
+     *    @param    mixed        $cellValue
+     *    @param    mixed[]        $dataSet
+     *    @return boolean
+     */
+    private static function filterTestInDateGroupSet($cellValue, $dataSet)
+    {
+        $dateSet = $dataSet['filterValues'];
+        $blanks = $dataSet['blanks'];
+        if (($cellValue == '') || ($cellValue === null)) {
+            return $blanks;
+        }
+
+        if (is_numeric($cellValue)) {
+            $dateValue = PHPExcel_Shared_Date::ExcelToPHP($cellValue);
+            if ($cellValue < 1) {
+                //    Just the time part
+                $dtVal = date('His', $dateValue);
+                $dateSet = $dateSet['time'];
+            } elseif ($cellValue == floor($cellValue)) {
+                //    Just the date part
+                $dtVal = date('Ymd', $dateValue);
+                $dateSet = $dateSet['date'];
+            } else {
+                //    date and time parts
+                $dtVal = date('YmdHis', $dateValue);
+                $dateSet = $dateSet['dateTime'];
+            }
+            foreach ($dateSet as $dateValue) {
+                //    Use of substr to extract value at the appropriate group level
+                if (substr($dtVal, 0, strlen($dateValue)) == $dateValue) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Test if cell value is within a set of values defined by a ruleset
+     *
+     *    @param    mixed        $cellValue
+     *    @param    mixed[]        $ruleSet
+     *    @return boolean
+     */
+    private static function filterTestInCustomDataSet($cellValue, $ruleSet)
+    {
+        $dataSet = $ruleSet['filterRules'];
+        $join = $ruleSet['join'];
+        $customRuleForBlanks = isset($ruleSet['customRuleForBlanks']) ? $ruleSet['customRuleForBlanks'] : false;
+
+        if (!$customRuleForBlanks) {
+            //    Blank cells are always ignored, so return a FALSE
+            if (($cellValue == '') || ($cellValue === null)) {
+                return false;
+            }
+        }
+        $returnVal = ($join == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
+        foreach ($dataSet as $rule) {
+            if (is_numeric($rule['value'])) {
+                //    Numeric values are tested using the appropriate operator
+                switch ($rule['operator']) {
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
+                        $retVal    = ($cellValue == $rule['value']);
+                        break;
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                        $retVal    = ($cellValue != $rule['value']);
+                        break;
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
+                        $retVal    = ($cellValue > $rule['value']);
+                        break;
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
+                        $retVal    = ($cellValue >= $rule['value']);
+                        break;
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
+                        $retVal    = ($cellValue < $rule['value']);
+                        break;
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
+                        $retVal    = ($cellValue <= $rule['value']);
+                        break;
+                }
+            } elseif ($rule['value'] == '') {
+                switch ($rule['operator']) {
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
+                        $retVal    = (($cellValue == '') || ($cellValue === null));
+                        break;
+                    case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                        $retVal    = (($cellValue != '') && ($cellValue !== null));
+                        break;
+                    default:
+                        $retVal    = true;
+                        break;
+                }
+            } else {
+                //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
+                $retVal    = preg_match('/^'.$rule['value'].'$/i', $cellValue);
+            }
+            //    If there are multiple conditions, then we need to test both using the appropriate join operator
+            switch ($join) {
+                case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR:
+                    $returnVal = $returnVal || $retVal;
+                    //    Break as soon as we have a TRUE match for OR joins,
+                    //        to avoid unnecessary additional code execution
+                    if ($returnVal) {
+                        return $returnVal;
+                    }
+                    break;
+                case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND:
+                    $returnVal = $returnVal && $retVal;
+                    break;
+            }
+        }
+
+        return $returnVal;
+    }
+
+    /**
+     *    Test if cell date value is matches a set of values defined by a set of months
+     *
+     *    @param    mixed        $cellValue
+     *    @param    mixed[]        $monthSet
+     *    @return boolean
+     */
+    private static function filterTestInPeriodDateSet($cellValue, $monthSet)
+    {
+        //    Blank cells are always ignored, so return a FALSE
+        if (($cellValue == '') || ($cellValue === null)) {
+            return false;
+        }
+
+        if (is_numeric($cellValue)) {
+            $dateValue = date('m', PHPExcel_Shared_Date::ExcelToPHP($cellValue));
+            if (in_array($dateValue, $monthSet)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     *    Search/Replace arrays to convert Excel wildcard syntax to a regexp syntax for preg_matching
+     *
+     *    @var    array
+     */
+    private static $fromReplace = array('\*', '\?', '~~', '~.*', '~.?');
+    private static $toReplace   = array('.*', '.',  '~',  '\*',  '\?');
+
+
+    /**
+     *    Convert a dynamic rule daterange to a custom filter range expression for ease of calculation
+     *
+     *    @param    string                                        $dynamicRuleType
+     *    @param    PHPExcel_Worksheet_AutoFilter_Column        &$filterColumn
+     *    @return mixed[]
+     */
+    private function dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
+    {
+        $rDateType = PHPExcel_Calculation_Functions::getReturnDateType();
+        PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC);
+        $val = $maxVal = null;
+
+        $ruleValues = array();
+        $baseDate = PHPExcel_Calculation_DateTime::DATENOW();
+        //    Calculate start/end dates for the required date range based on current date
+        switch ($dynamicRuleType) {
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK:
+                $baseDate = strtotime('-7 days', $baseDate);
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
+                $baseDate = strtotime('-7 days', $baseDate);
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
+                $baseDate = strtotime('-1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
+                $baseDate = strtotime('+1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
+                $baseDate = strtotime('-3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
+                $baseDate = strtotime('+3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
+                $baseDate = strtotime('-1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
+                $baseDate = strtotime('+1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+        }
+
+        switch ($dynamicRuleType) {
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
+                $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day', $baseDate));
+                $val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate);
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE:
+                $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day', $baseDate));
+                $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1, date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
+                $maxVal = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 31, 12, date('Y', $baseDate)));
+                ++$maxVal;
+                $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1, date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
+                $thisMonth = date('m', $baseDate);
+                $thisQuarter = floor(--$thisMonth / 3);
+                $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), (1+$thisQuarter)*3, date('Y', $baseDate)));
+                ++$maxVal;
+                $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1+$thisQuarter*3, date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
+                $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), date('m', $baseDate), date('Y', $baseDate)));
+                ++$maxVal;
+                $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK:
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
+                $dayOfWeek = date('w', $baseDate);
+                $val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
+                $maxVal = $val + 7;
+                break;
+        }
+
+        switch ($dynamicRuleType) {
+            //    Adjust Today dates for Yesterday and Tomorrow
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
+                --$maxVal;
+                --$val;
+                break;
+            case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
+                ++$maxVal;
+                ++$val;
+                break;
+        }
+
+        //    Set the filter column rule attributes ready for writing
+        $filterColumn->setAttributes(array('val' => $val, 'maxVal' => $maxVal));
+
+        //    Set the rules for identifying rows for hide/show
+        $ruleValues[] = array('operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL, 'value' => $val);
+        $ruleValues[] = array('operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN, 'value' => $maxVal);
+        PHPExcel_Calculation_Functions::setReturnDateType($rDateType);
+
+        return array('method' => 'filterTestInCustomDataSet', 'arguments' => array('filterRules' => $ruleValues, 'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND));
+    }
+
+    private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
+    {
+        $range = $columnID.$startRow.':'.$columnID.$endRow;
+        $dataValues = PHPExcel_Calculation_Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
+
+        $dataValues = array_filter($dataValues);
+        if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
+            rsort($dataValues);
+        } else {
+            sort($dataValues);
+        }
+
+        return array_pop(array_slice($dataValues, 0, $ruleValue));
+    }
+
+    /**
+     *    Apply the AutoFilter rules to the AutoFilter Range
+     *
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function showHideRows()
+    {
+        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->range);
+
+        //    The heading row should always be visible
+//        echo 'AutoFilter Heading Row ', $rangeStart[1],' is always SHOWN',PHP_EOL;
+        $this->workSheet->getRowDimension($rangeStart[1])->setVisible(true);
+
+        $columnFilterTests = array();
+        foreach ($this->columns as $columnID => $filterColumn) {
+            $rules = $filterColumn->getRules();
+            switch ($filterColumn->getFilterType()) {
+                case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER:
+                    $ruleValues = array();
+                    //    Build a list of the filter value selections
+                    foreach ($rules as $rule) {
+                        $ruleType = $rule->getRuleType();
+                        $ruleValues[] = $rule->getValue();
+                    }
+                    //    Test if we want to include blanks in our filter criteria
+                    $blanks = false;
+                    $ruleDataSet = array_filter($ruleValues);
+                    if (count($ruleValues) != count($ruleDataSet)) {
+                        $blanks = true;
+                    }
+                    if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
+                        //    Filter on absolute values
+                        $columnFilterTests[$columnID] = array(
+                            'method' => 'filterTestInSimpleDataSet',
+                            'arguments' => array('filterValues' => $ruleDataSet, 'blanks' => $blanks)
+                        );
+                    } else {
+                        //    Filter on date group values
+                        $arguments = array(
+                            'date' => array(),
+                            'time' => array(),
+                            'dateTime' => array(),
+                        );
+                        foreach ($ruleDataSet as $ruleValue) {
+                            $date = $time = '';
+                            if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
+                                ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')) {
+                                $date .= sprintf('%04d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
+                            }
+                            if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
+                                ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')) {
+                                $date .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
+                            }
+                            if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
+                                ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')) {
+                                $date .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
+                            }
+                            if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
+                                ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')) {
+                                $time .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
+                            }
+                            if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
+                                ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')) {
+                                $time .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
+                            }
+                            if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
+                                ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')) {
+                                $time .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
+                            }
+                            $dateTime = $date . $time;
+                            $arguments['date'][] = $date;
+                            $arguments['time'][] = $time;
+                            $arguments['dateTime'][] = $dateTime;
+                        }
+                        //    Remove empty elements
+                        $arguments['date'] = array_filter($arguments['date']);
+                        $arguments['time'] = array_filter($arguments['time']);
+                        $arguments['dateTime'] = array_filter($arguments['dateTime']);
+                        $columnFilterTests[$columnID] = array(
+                            'method' => 'filterTestInDateGroupSet',
+                            'arguments' => array('filterValues' => $arguments, 'blanks' => $blanks)
+                        );
+                    }
+                    break;
+                case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER:
+                    $customRuleForBlanks = false;
+                    $ruleValues = array();
+                    //    Build a list of the filter value selections
+                    foreach ($rules as $rule) {
+                        $ruleType = $rule->getRuleType();
+                        $ruleValue = $rule->getValue();
+                        if (!is_numeric($ruleValue)) {
+                            //    Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
+                            $ruleValue = preg_quote($ruleValue);
+                            $ruleValue = str_replace(self::$fromReplace, self::$toReplace, $ruleValue);
+                            if (trim($ruleValue) == '') {
+                                $customRuleForBlanks = true;
+                                $ruleValue = trim($ruleValue);
+                            }
+                        }
+                        $ruleValues[] = array('operator' => $rule->getOperator(), 'value' => $ruleValue);
+                    }
+                    $join = $filterColumn->getJoin();
+                    $columnFilterTests[$columnID] = array(
+                        'method' => 'filterTestInCustomDataSet',
+                        'arguments' => array('filterRules' => $ruleValues, 'join' => $join, 'customRuleForBlanks' => $customRuleForBlanks)
+                    );
+                    break;
+                case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER:
+                    $ruleValues = array();
+                    foreach ($rules as $rule) {
+                        //    We should only ever have one Dynamic Filter Rule anyway
+                        $dynamicRuleType = $rule->getGrouping();
+                        if (($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
+                            ($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
+                            //    Number (Average) based
+                            //    Calculate the average
+                            $averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')';
+                            $average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1'));
+                            //    Set above/below rule based on greaterThan or LessTan
+                            $operator = ($dynamicRuleType === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+                                ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
+                                : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
+                            $ruleValues[] = array('operator' => $operator,
+                                                   'value' => $average
+                                                 );
+                            $columnFilterTests[$columnID] = array(
+                                'method' => 'filterTestInCustomDataSet',
+                                'arguments' => array('filterRules' => $ruleValues, 'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR)
+                            );
+                        } else {
+                            //    Date based
+                            if ($dynamicRuleType[0] == 'M' || $dynamicRuleType[0] == 'Q') {
+                                //    Month or Quarter
+                                sscanf($dynamicRuleType, '%[A-Z]%d', $periodType, $period);
+                                if ($periodType == 'M') {
+                                    $ruleValues = array($period);
+                                } else {
+                                    --$period;
+                                    $periodEnd = (1+$period)*3;
+                                    $periodStart = 1+$period*3;
+                                    $ruleValues = range($periodStart, $periodEnd);
+                                }
+                                $columnFilterTests[$columnID] = array(
+                                    'method' => 'filterTestInPeriodDateSet',
+                                    'arguments' => $ruleValues
+                                );
+                                $filterColumn->setAttributes(array());
+                            } else {
+                                //    Date Range
+                                $columnFilterTests[$columnID] = $this->dynamicFilterDateRange($dynamicRuleType, $filterColumn);
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER:
+                    $ruleValues = array();
+                    $dataRowCount = $rangeEnd[1] - $rangeStart[1];
+                    foreach ($rules as $rule) {
+                        //    We should only ever have one Dynamic Filter Rule anyway
+                        $toptenRuleType = $rule->getGrouping();
+                        $ruleValue = $rule->getValue();
+                        $ruleOperator = $rule->getOperator();
+                    }
+                    if ($ruleOperator === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
+                        $ruleValue = floor($ruleValue * ($dataRowCount / 100));
+                    }
+                    if ($ruleValue < 1) {
+                        $ruleValue = 1;
+                    }
+                    if ($ruleValue > 500) {
+                        $ruleValue = 500;
+                    }
+
+                    $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1]+1, $rangeEnd[1], $toptenRuleType, $ruleValue);
+
+                    $operator = ($toptenRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
+                        ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
+                        : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
+                    $ruleValues[] = array('operator' => $operator, 'value' => $maxVal);
+                    $columnFilterTests[$columnID] = array(
+                        'method' => 'filterTestInCustomDataSet',
+                        'arguments' => array('filterRules' => $ruleValues, 'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR)
+                    );
+                    $filterColumn->setAttributes(array('maxVal' => $maxVal));
+                    break;
+            }
+        }
+
+//        echo 'Column Filter Test CRITERIA',PHP_EOL;
+//        var_dump($columnFilterTests);
+//
+        //    Execute the column tests for each row in the autoFilter range to determine show/hide,
+        for ($row = $rangeStart[1]+1; $row <= $rangeEnd[1]; ++$row) {
+//            echo 'Testing Row = ', $row,PHP_EOL;
+            $result = true;
+            foreach ($columnFilterTests as $columnID => $columnFilterTest) {
+//                echo 'Testing cell ', $columnID.$row,PHP_EOL;
+                $cellValue = $this->workSheet->getCell($columnID.$row)->getCalculatedValue();
+//                echo 'Value is ', $cellValue,PHP_EOL;
+                //    Execute the filter test
+                $result = $result &&
+                    call_user_func_array(
+                        array('PHPExcel_Worksheet_AutoFilter', $columnFilterTest['method']),
+                        array($cellValue, $columnFilterTest['arguments'])
+                    );
+//                echo (($result) ? 'VALID' : 'INVALID'),PHP_EOL;
+                //    If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests
+                if (!$result) {
+                    break;
+                }
+            }
+            //    Set show/hide for the row based on the result of the autoFilter result
+//            echo (($result) ? 'SHOW' : 'HIDE'),PHP_EOL;
+            $this->workSheet->getRowDimension($row)->setVisible($result);
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key == 'workSheet') {
+                    //    Detach from worksheet
+                    $this->{$key} = null;
+                } else {
+                    $this->{$key} = clone $value;
+                }
+            } elseif ((is_array($value)) && ($key == 'columns')) {
+                //    The columns array of PHPExcel_Worksheet_AutoFilter objects
+                $this->{$key} = array();
+                foreach ($value as $k => $v) {
+                    $this->{$key}[$k] = clone $v;
+                    // attach the new cloned Column to this new cloned Autofilter object
+                    $this->{$key}[$k]->setParent($this);
+                }
+            } else {
+                $this->{$key} = $value;
+            }
+        }
+    }
+
+    /**
+     * toString method replicates previous behavior by returning the range if object is
+     *    referenced as a property of its parent.
+     */
+    public function __toString()
+    {
+        return (string) $this->range;
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/AutoFilter/Column.php b/lib/PHPExcel/Worksheet/AutoFilter/Column.php
new file mode 100644
index 000000000..d64fd8165
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/AutoFilter/Column.php
@@ -0,0 +1,405 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_AutoFilter_Column
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Worksheet
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_AutoFilter_Column
+{
+    const AUTOFILTER_FILTERTYPE_FILTER         = 'filters';
+    const AUTOFILTER_FILTERTYPE_CUSTOMFILTER   = 'customFilters';
+    //    Supports no more than 2 rules, with an And/Or join criteria
+    //        if more than 1 rule is defined
+    const AUTOFILTER_FILTERTYPE_DYNAMICFILTER  = 'dynamicFilter';
+    //    Even though the filter rule is constant, the filtered data can vary
+    //        e.g. filtered by date = TODAY
+    const AUTOFILTER_FILTERTYPE_TOPTENFILTER   = 'top10';
+
+    /**
+     * Types of autofilter rules
+     *
+     * @var string[]
+     */
+    private static $filterTypes = array(
+        //    Currently we're not handling
+        //        colorFilter
+        //        extLst
+        //        iconFilter
+        self::AUTOFILTER_FILTERTYPE_FILTER,
+        self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER,
+        self::AUTOFILTER_FILTERTYPE_DYNAMICFILTER,
+        self::AUTOFILTER_FILTERTYPE_TOPTENFILTER,
+    );
+
+    /* Multiple Rule Connections */
+    const AUTOFILTER_COLUMN_JOIN_AND = 'and';
+    const AUTOFILTER_COLUMN_JOIN_OR  = 'or';
+
+    /**
+     * Join options for autofilter rules
+     *
+     * @var string[]
+     */
+    private static $ruleJoins = array(
+        self::AUTOFILTER_COLUMN_JOIN_AND,
+        self::AUTOFILTER_COLUMN_JOIN_OR,
+    );
+
+    /**
+     * Autofilter
+     *
+     * @var PHPExcel_Worksheet_AutoFilter
+     */
+    private $parent;
+
+
+    /**
+     * Autofilter Column Index
+     *
+     * @var string
+     */
+    private $columnIndex = '';
+
+
+    /**
+     * Autofilter Column Filter Type
+     *
+     * @var string
+     */
+    private $filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
+
+
+    /**
+     * Autofilter Multiple Rules And/Or
+     *
+     * @var string
+     */
+    private $join = self::AUTOFILTER_COLUMN_JOIN_OR;
+
+
+    /**
+     * Autofilter Column Rules
+     *
+     * @var array of PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    private $ruleset = array();
+
+
+    /**
+     * Autofilter Column Dynamic Attributes
+     *
+     * @var array of mixed
+     */
+    private $attributes = array();
+
+
+    /**
+     * Create a new PHPExcel_Worksheet_AutoFilter_Column
+     *
+     *    @param    string                           $pColumn        Column (e.g. A)
+     *    @param    PHPExcel_Worksheet_AutoFilter  $pParent        Autofilter for this column
+     */
+    public function __construct($pColumn, PHPExcel_Worksheet_AutoFilter $pParent = null)
+    {
+        $this->columnIndex = $pColumn;
+        $this->parent = $pParent;
+    }
+
+    /**
+     * Get AutoFilter Column Index
+     *
+     * @return string
+     */
+    public function getColumnIndex()
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     *    Set AutoFilter Column Index
+     *
+     *    @param    string        $pColumn        Column (e.g. A)
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setColumnIndex($pColumn)
+    {
+        // Uppercase coordinate
+        $pColumn = strtoupper($pColumn);
+        if ($this->parent !== null) {
+            $this->parent->testColumnInRange($pColumn);
+        }
+
+        $this->columnIndex = $pColumn;
+
+        return $this;
+    }
+
+    /**
+     * Get this Column's AutoFilter Parent
+     *
+     * @return PHPExcel_Worksheet_AutoFilter
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set this Column's AutoFilter Parent
+     *
+     * @param PHPExcel_Worksheet_AutoFilter
+     * @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setParent(PHPExcel_Worksheet_AutoFilter $pParent = null)
+    {
+        $this->parent = $pParent;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Type
+     *
+     * @return string
+     */
+    public function getFilterType()
+    {
+        return $this->filterType;
+    }
+
+    /**
+     *    Set AutoFilter Type
+     *
+     *    @param    string        $pFilterType
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER)
+    {
+        if (!in_array($pFilterType, self::$filterTypes)) {
+            throw new PHPExcel_Exception('Invalid filter type for column AutoFilter.');
+        }
+
+        $this->filterType = $pFilterType;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Multiple Rules And/Or Join
+     *
+     * @return string
+     */
+    public function getJoin()
+    {
+        return $this->join;
+    }
+
+    /**
+     *    Set AutoFilter Multiple Rules And/Or
+     *
+     *    @param    string        $pJoin        And/Or
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR)
+    {
+        // Lowercase And/Or
+        $pJoin = strtolower($pJoin);
+        if (!in_array($pJoin, self::$ruleJoins)) {
+            throw new PHPExcel_Exception('Invalid rule connection for column AutoFilter.');
+        }
+
+        $this->join = $pJoin;
+
+        return $this;
+    }
+
+    /**
+     *    Set AutoFilter Attributes
+     *
+     *    @param    string[]        $pAttributes
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setAttributes($pAttributes = array())
+    {
+        $this->attributes = $pAttributes;
+
+        return $this;
+    }
+
+    /**
+     *    Set An AutoFilter Attribute
+     *
+     *    @param    string        $pName        Attribute Name
+     *    @param    string        $pValue        Attribute Value
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setAttribute($pName, $pValue)
+    {
+        $this->attributes[$pName] = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Column Attributes
+     *
+     * @return string
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Get specific AutoFilter Column Attribute
+     *
+     *    @param    string        $pName        Attribute Name
+     * @return string
+     */
+    public function getAttribute($pName)
+    {
+        if (isset($this->attributes[$pName])) {
+            return $this->attributes[$pName];
+        }
+        return null;
+    }
+
+    /**
+     * Get all AutoFilter Column Rules
+     *
+     * @throws    PHPExcel_Exception
+     * @return array of PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function getRules()
+    {
+        return $this->ruleset;
+    }
+
+    /**
+     * Get a specified AutoFilter Column Rule
+     *
+     * @param    integer    $pIndex        Rule index in the ruleset array
+     * @return    PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function getRule($pIndex)
+    {
+        if (!isset($this->ruleset[$pIndex])) {
+            $this->ruleset[$pIndex] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
+        }
+        return $this->ruleset[$pIndex];
+    }
+
+    /**
+     * Create a new AutoFilter Column Rule in the ruleset
+     *
+     * @return    PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function createRule()
+    {
+        $this->ruleset[] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
+
+        return end($this->ruleset);
+    }
+
+    /**
+     * Add a new AutoFilter Column Rule to the ruleset
+     *
+     * @param    PHPExcel_Worksheet_AutoFilter_Column_Rule    $pRule
+     * @param    boolean    $returnRule     Flag indicating whether the rule object or the column object should be returned
+     * @return    PHPExcel_Worksheet_AutoFilter_Column|PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function addRule(PHPExcel_Worksheet_AutoFilter_Column_Rule $pRule, $returnRule = true)
+    {
+        $pRule->setParent($this);
+        $this->ruleset[] = $pRule;
+
+        return ($returnRule) ? $pRule : $this;
+    }
+
+    /**
+     * Delete a specified AutoFilter Column Rule
+     *    If the number of rules is reduced to 1, then we reset And/Or logic to Or
+     *
+     * @param    integer    $pIndex        Rule index in the ruleset array
+     * @return    PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function deleteRule($pIndex)
+    {
+        if (isset($this->ruleset[$pIndex])) {
+            unset($this->ruleset[$pIndex]);
+            //    If we've just deleted down to a single rule, then reset And/Or joining to Or
+            if (count($this->ruleset) <= 1) {
+                $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Delete all AutoFilter Column Rules
+     *
+     * @return    PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function clearRules()
+    {
+        $this->ruleset = array();
+        $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key == 'parent') {
+                    //    Detach from autofilter parent
+                    $this->$key = null;
+                } else {
+                    $this->$key = clone $value;
+                }
+            } elseif ((is_array($value)) && ($key == 'ruleset')) {
+                //    The columns array of PHPExcel_Worksheet_AutoFilter objects
+                $this->$key = array();
+                foreach ($value as $k => $v) {
+                    $this->$key[$k] = clone $v;
+                    // attach the new cloned Rule to this new cloned Autofilter Cloned object
+                    $this->$key[$k]->setParent($this);
+                }
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/lib/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
new file mode 100644
index 000000000..39ad18bf3
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
@@ -0,0 +1,468 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_AutoFilter_Column_Rule
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category    PHPExcel
+ * @package        PHPExcel_Worksheet
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version        ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_AutoFilter_Column_Rule
+{
+    const AUTOFILTER_RULETYPE_FILTER        = 'filter';
+    const AUTOFILTER_RULETYPE_DATEGROUP     = 'dateGroupItem';
+    const AUTOFILTER_RULETYPE_CUSTOMFILTER  = 'customFilter';
+    const AUTOFILTER_RULETYPE_DYNAMICFILTER = 'dynamicFilter';
+    const AUTOFILTER_RULETYPE_TOPTENFILTER  = 'top10Filter';
+
+    private static $ruleTypes = array(
+        //    Currently we're not handling
+        //        colorFilter
+        //        extLst
+        //        iconFilter
+        self::AUTOFILTER_RULETYPE_FILTER,
+        self::AUTOFILTER_RULETYPE_DATEGROUP,
+        self::AUTOFILTER_RULETYPE_CUSTOMFILTER,
+        self::AUTOFILTER_RULETYPE_DYNAMICFILTER,
+        self::AUTOFILTER_RULETYPE_TOPTENFILTER,
+    );
+
+    const AUTOFILTER_RULETYPE_DATEGROUP_YEAR   = 'year';
+    const AUTOFILTER_RULETYPE_DATEGROUP_MONTH  = 'month';
+    const AUTOFILTER_RULETYPE_DATEGROUP_DAY    = 'day';
+    const AUTOFILTER_RULETYPE_DATEGROUP_HOUR   = 'hour';
+    const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE = 'minute';
+    const AUTOFILTER_RULETYPE_DATEGROUP_SECOND = 'second';
+
+    private static $dateTimeGroups = array(
+        self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_DAY,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_HOUR,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_SECOND,
+    );
+
+    const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY    = 'yesterday';
+    const AUTOFILTER_RULETYPE_DYNAMIC_TODAY        = 'today';
+    const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW     = 'tomorrow';
+    const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE   = 'yearToDate';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR     = 'thisYear';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER  = 'thisQuarter';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH    = 'thisMonth';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK     = 'thisWeek';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR     = 'lastYear';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER  = 'lastQuarter';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH    = 'lastMonth';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK     = 'lastWeek';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR     = 'nextYear';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER  = 'nextQuarter';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH    = 'nextMonth';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK     = 'nextWeek';
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1      = 'M1';
+    const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY      = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2      = 'M2';
+    const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY     = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3      = 'M3';
+    const AUTOFILTER_RULETYPE_DYNAMIC_MARCH        = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4      = 'M4';
+    const AUTOFILTER_RULETYPE_DYNAMIC_APRIL        = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5      = 'M5';
+    const AUTOFILTER_RULETYPE_DYNAMIC_MAY          = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6      = 'M6';
+    const AUTOFILTER_RULETYPE_DYNAMIC_JUNE         = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7      = 'M7';
+    const AUTOFILTER_RULETYPE_DYNAMIC_JULY         = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8      = 'M8';
+    const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST       = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9      = 'M9';
+    const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER    = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10     = 'M10';
+    const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER      = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11     = 'M11';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER     = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12     = 'M12';
+    const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER     = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12;
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1    = 'Q1';
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2    = 'Q2';
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3    = 'Q3';
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4    = 'Q4';
+    const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE = 'aboveAverage';
+    const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE = 'belowAverage';
+
+    private static $dynamicTypes = array(
+        self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE,
+    );
+
+    /*
+     *    The only valid filter rule operators for filter and customFilter types are:
+     *        <xsd:enumeration value="equal"/>
+     *        <xsd:enumeration value="lessThan"/>
+     *        <xsd:enumeration value="lessThanOrEqual"/>
+     *        <xsd:enumeration value="notEqual"/>
+     *        <xsd:enumeration value="greaterThanOrEqual"/>
+     *        <xsd:enumeration value="greaterThan"/>
+     */
+    const AUTOFILTER_COLUMN_RULE_EQUAL              = 'equal';
+    const AUTOFILTER_COLUMN_RULE_NOTEQUAL           = 'notEqual';
+    const AUTOFILTER_COLUMN_RULE_GREATERTHAN        = 'greaterThan';
+    const AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL = 'greaterThanOrEqual';
+    const AUTOFILTER_COLUMN_RULE_LESSTHAN           = 'lessThan';
+    const AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL    = 'lessThanOrEqual';
+
+    private static $operators = array(
+        self::AUTOFILTER_COLUMN_RULE_EQUAL,
+        self::AUTOFILTER_COLUMN_RULE_NOTEQUAL,
+        self::AUTOFILTER_COLUMN_RULE_GREATERTHAN,
+        self::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
+        self::AUTOFILTER_COLUMN_RULE_LESSTHAN,
+        self::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
+    );
+
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE = 'byValue';
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT  = 'byPercent';
+
+    private static $topTenValue = array(
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
+    );
+
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_TOP    = 'top';
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM = 'bottom';
+
+    private static $topTenType = array(
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP,
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM,
+    );
+
+
+    /* Rule Operators (Numeric, Boolean etc) */
+//    const AUTOFILTER_COLUMN_RULE_BETWEEN            = 'between';        //    greaterThanOrEqual 1 && lessThanOrEqual 2
+    /* Rule Operators (Numeric Special) which are translated to standard numeric operators with calculated values */
+//    const AUTOFILTER_COLUMN_RULE_TOPTEN                = 'topTen';            //    greaterThan calculated value
+//    const AUTOFILTER_COLUMN_RULE_TOPTENPERCENT        = 'topTenPercent';    //    greaterThan calculated value
+//    const AUTOFILTER_COLUMN_RULE_ABOVEAVERAGE        = 'aboveAverage';    //    Value is calculated as the average
+//    const AUTOFILTER_COLUMN_RULE_BELOWAVERAGE        = 'belowAverage';    //    Value is calculated as the average
+    /* Rule Operators (String) which are set as wild-carded values */
+//    const AUTOFILTER_COLUMN_RULE_BEGINSWITH            = 'beginsWith';            // A*
+//    const AUTOFILTER_COLUMN_RULE_ENDSWITH            = 'endsWith';            // *Z
+//    const AUTOFILTER_COLUMN_RULE_CONTAINS            = 'contains';            // *B*
+//    const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN        = 'notEqual';            //    notEqual *B*
+    /* Rule Operators (Date Special) which are translated to standard numeric operators with calculated values */
+//    const AUTOFILTER_COLUMN_RULE_BEFORE                = 'lessThan';
+//    const AUTOFILTER_COLUMN_RULE_AFTER                = 'greaterThan';
+//    const AUTOFILTER_COLUMN_RULE_YESTERDAY            = 'yesterday';
+//    const AUTOFILTER_COLUMN_RULE_TODAY                = 'today';
+//    const AUTOFILTER_COLUMN_RULE_TOMORROW            = 'tomorrow';
+//    const AUTOFILTER_COLUMN_RULE_LASTWEEK            = 'lastWeek';
+//    const AUTOFILTER_COLUMN_RULE_THISWEEK            = 'thisWeek';
+//    const AUTOFILTER_COLUMN_RULE_NEXTWEEK            = 'nextWeek';
+//    const AUTOFILTER_COLUMN_RULE_LASTMONTH            = 'lastMonth';
+//    const AUTOFILTER_COLUMN_RULE_THISMONTH            = 'thisMonth';
+//    const AUTOFILTER_COLUMN_RULE_NEXTMONTH            = 'nextMonth';
+//    const AUTOFILTER_COLUMN_RULE_LASTQUARTER        = 'lastQuarter';
+//    const AUTOFILTER_COLUMN_RULE_THISQUARTER        = 'thisQuarter';
+//    const AUTOFILTER_COLUMN_RULE_NEXTQUARTER        = 'nextQuarter';
+//    const AUTOFILTER_COLUMN_RULE_LASTYEAR            = 'lastYear';
+//    const AUTOFILTER_COLUMN_RULE_THISYEAR            = 'thisYear';
+//    const AUTOFILTER_COLUMN_RULE_NEXTYEAR            = 'nextYear';
+//    const AUTOFILTER_COLUMN_RULE_YEARTODATE            = 'yearToDate';            //    <dynamicFilter val="40909" type="yearToDate" maxVal="41113"/>
+//    const AUTOFILTER_COLUMN_RULE_ALLDATESINMONTH    = 'allDatesInMonth';    //    <dynamicFilter type="M2"/> for Month/February
+//    const AUTOFILTER_COLUMN_RULE_ALLDATESINQUARTER    = 'allDatesInQuarter';    //    <dynamicFilter type="Q2"/> for Quarter 2
+
+    /**
+     * Autofilter Column
+     *
+     * @var PHPExcel_Worksheet_AutoFilter_Column
+     */
+    private $parent = null;
+
+
+    /**
+     * Autofilter Rule Type
+     *
+     * @var string
+     */
+    private $ruleType = self::AUTOFILTER_RULETYPE_FILTER;
+
+
+    /**
+     * Autofilter Rule Value
+     *
+     * @var string
+     */
+    private $value = '';
+
+    /**
+     * Autofilter Rule Operator
+     *
+     * @var string
+     */
+    private $operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+
+    /**
+     * DateTimeGrouping Group Value
+     *
+     * @var string
+     */
+    private $grouping = '';
+
+
+    /**
+     * Create a new PHPExcel_Worksheet_AutoFilter_Column_Rule
+     *
+     * @param PHPExcel_Worksheet_AutoFilter_Column $pParent
+     */
+    public function __construct(PHPExcel_Worksheet_AutoFilter_Column $pParent = null)
+    {
+        $this->parent = $pParent;
+    }
+
+    /**
+     * Get AutoFilter Rule Type
+     *
+     * @return string
+     */
+    public function getRuleType()
+    {
+        return $this->ruleType;
+    }
+
+    /**
+     *    Set AutoFilter Rule Type
+     *
+     *    @param    string        $pRuleType
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER)
+    {
+        if (!in_array($pRuleType, self::$ruleTypes)) {
+            throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
+        }
+
+        $this->ruleType = $pRuleType;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Rule Value
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     *    Set AutoFilter Rule Value
+     *
+     *    @param    string|string[]        $pValue
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function setValue($pValue = '')
+    {
+        if (is_array($pValue)) {
+            $grouping = -1;
+            foreach ($pValue as $key => $value) {
+                //    Validate array entries
+                if (!in_array($key, self::$dateTimeGroups)) {
+                    //    Remove any invalid entries from the value array
+                    unset($pValue[$key]);
+                } else {
+                    //    Work out what the dateTime grouping will be
+                    $grouping = max($grouping, array_search($key, self::$dateTimeGroups));
+                }
+            }
+            if (count($pValue) == 0) {
+                throw new PHPExcel_Exception('Invalid rule value for column AutoFilter Rule.');
+            }
+            //    Set the dateTime grouping that we've anticipated
+            $this->setGrouping(self::$dateTimeGroups[$grouping]);
+        }
+        $this->value = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Rule Operator
+     *
+     * @return string
+     */
+    public function getOperator()
+    {
+        return $this->operator;
+    }
+
+    /**
+     *    Set AutoFilter Rule Operator
+     *
+     *    @param    string        $pOperator
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL)
+    {
+        if (empty($pOperator)) {
+            $pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+        }
+        if ((!in_array($pOperator, self::$operators)) &&
+            (!in_array($pOperator, self::$topTenValue))) {
+            throw new PHPExcel_Exception('Invalid operator for column AutoFilter Rule.');
+        }
+        $this->operator = $pOperator;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Rule Grouping
+     *
+     * @return string
+     */
+    public function getGrouping()
+    {
+        return $this->grouping;
+    }
+
+    /**
+     *    Set AutoFilter Rule Grouping
+     *
+     *    @param    string        $pGrouping
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function setGrouping($pGrouping = null)
+    {
+        if (($pGrouping !== null) &&
+            (!in_array($pGrouping, self::$dateTimeGroups)) &&
+            (!in_array($pGrouping, self::$dynamicTypes)) &&
+            (!in_array($pGrouping, self::$topTenType))) {
+            throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
+        }
+        $this->grouping = $pGrouping;
+
+        return $this;
+    }
+
+    /**
+     *    Set AutoFilter Rule
+     *
+     *    @param    string                $pOperator
+     *    @param    string|string[]        $pValue
+     *    @param    string                $pGrouping
+     *    @throws    PHPExcel_Exception
+     *    @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = null)
+    {
+        $this->setOperator($pOperator);
+        $this->setValue($pValue);
+        //    Only set grouping if it's been passed in as a user-supplied argument,
+        //        otherwise we're calculating it when we setValue() and don't want to overwrite that
+        //        If the user supplies an argumnet for grouping, then on their own head be it
+        if ($pGrouping !== null) {
+            $this->setGrouping($pGrouping);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get this Rule's AutoFilter Column Parent
+     *
+     * @return PHPExcel_Worksheet_AutoFilter_Column
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set this Rule's AutoFilter Column Parent
+     *
+     * @param PHPExcel_Worksheet_AutoFilter_Column
+     * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+     */
+    public function setParent(PHPExcel_Worksheet_AutoFilter_Column $pParent = null)
+    {
+        $this->parent = $pParent;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key == 'parent') {
+                    //    Detach from autofilter column parent
+                    $this->$key = null;
+                } else {
+                    $this->$key = clone $value;
+                }
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/BaseDrawing.php b/lib/PHPExcel/Worksheet/BaseDrawing.php
new file mode 100644
index 000000000..9ad15c70f
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/BaseDrawing.php
@@ -0,0 +1,507 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_BaseDrawing
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
+{
+    /**
+     * Image counter
+     *
+     * @var int
+     */
+    private static $imageCounter = 0;
+
+    /**
+     * Image index
+     *
+     * @var int
+     */
+    private $imageIndex = 0;
+
+    /**
+     * Name
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Description
+     *
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * Worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * Coordinates
+     *
+     * @var string
+     */
+    protected $coordinates;
+
+    /**
+     * Offset X
+     *
+     * @var int
+     */
+    protected $offsetX;
+
+    /**
+     * Offset Y
+     *
+     * @var int
+     */
+    protected $offsetY;
+
+    /**
+     * Width
+     *
+     * @var int
+     */
+    protected $width;
+
+    /**
+     * Height
+     *
+     * @var int
+     */
+    protected $height;
+
+    /**
+     * Proportional resize
+     *
+     * @var boolean
+     */
+    protected $resizeProportional;
+
+    /**
+     * Rotation
+     *
+     * @var int
+     */
+    protected $rotation;
+
+    /**
+     * Shadow
+     *
+     * @var PHPExcel_Worksheet_Drawing_Shadow
+     */
+    protected $shadow;
+
+    /**
+     * Create a new PHPExcel_Worksheet_BaseDrawing
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->name                = '';
+        $this->description        = '';
+        $this->worksheet          = null;
+        $this->coordinates        = 'A1';
+        $this->offsetX            = 0;
+        $this->offsetY            = 0;
+        $this->width              = 0;
+        $this->height             = 0;
+        $this->resizeProportional = true;
+        $this->rotation           = 0;
+        $this->shadow             = new PHPExcel_Worksheet_Drawing_Shadow();
+
+        // Set image index
+        self::$imageCounter++;
+        $this->imageIndex             = self::$imageCounter;
+    }
+
+    /**
+     * Get image index
+     *
+     * @return int
+     */
+    public function getImageIndex()
+    {
+        return $this->imageIndex;
+    }
+
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set Name
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setName($pValue = '')
+    {
+        $this->name = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Set Description
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setDescription($pValue = '')
+    {
+        $this->description = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Worksheet
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function getWorksheet()
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set Worksheet
+     *
+     * @param     PHPExcel_Worksheet     $pValue
+     * @param     bool                $pOverrideOld    If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false)
+    {
+        if (is_null($this->worksheet)) {
+            // Add drawing to PHPExcel_Worksheet
+            $this->worksheet = $pValue;
+            $this->worksheet->getCell($this->coordinates);
+            $this->worksheet->getDrawingCollection()->append($this);
+        } else {
+            if ($pOverrideOld) {
+                // Remove drawing from old PHPExcel_Worksheet
+                $iterator = $this->worksheet->getDrawingCollection()->getIterator();
+
+                while ($iterator->valid()) {
+                    if ($iterator->current()->getHashCode() == $this->getHashCode()) {
+                        $this->worksheet->getDrawingCollection()->offsetUnset($iterator->key());
+                        $this->worksheet = null;
+                        break;
+                    }
+                }
+
+                // Set new PHPExcel_Worksheet
+                $this->setWorksheet($pValue);
+            } else {
+                throw new PHPExcel_Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get Coordinates
+     *
+     * @return string
+     */
+    public function getCoordinates()
+    {
+        return $this->coordinates;
+    }
+
+    /**
+     * Set Coordinates
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setCoordinates($pValue = 'A1')
+    {
+        $this->coordinates = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get OffsetX
+     *
+     * @return int
+     */
+    public function getOffsetX()
+    {
+        return $this->offsetX;
+    }
+
+    /**
+     * Set OffsetX
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setOffsetX($pValue = 0)
+    {
+        $this->offsetX = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get OffsetY
+     *
+     * @return int
+     */
+    public function getOffsetY()
+    {
+        return $this->offsetY;
+    }
+
+    /**
+     * Set OffsetY
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setOffsetY($pValue = 0)
+    {
+        $this->offsetY = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Width
+     *
+     * @return int
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set Width
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setWidth($pValue = 0)
+    {
+        // Resize proportional?
+        if ($this->resizeProportional && $pValue != 0) {
+            $ratio = $this->height / ($this->width != 0 ? $this->width : 1);
+            $this->height = round($ratio * $pValue);
+        }
+
+        // Set width
+        $this->width = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get Height
+     *
+     * @return int
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set Height
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setHeight($pValue = 0)
+    {
+        // Resize proportional?
+        if ($this->resizeProportional && $pValue != 0) {
+            $ratio = $this->width / ($this->height != 0 ? $this->height : 1);
+            $this->width = round($ratio * $pValue);
+        }
+
+        // Set height
+        $this->height = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Set width and height with proportional resize
+     * Example:
+     * <code>
+     * $objDrawing->setResizeProportional(true);
+     * $objDrawing->setWidthAndHeight(160,120);
+     * </code>
+     *
+     * @author Vincent@luo MSN:kele_100@hotmail.com
+     * @param int $width
+     * @param int $height
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setWidthAndHeight($width = 0, $height = 0)
+    {
+        $xratio = $width / ($this->width != 0 ? $this->width : 1);
+        $yratio = $height / ($this->height != 0 ? $this->height : 1);
+        if ($this->resizeProportional && !($width == 0 || $height == 0)) {
+            if (($xratio * $this->height) < $height) {
+                $this->height = ceil($xratio * $this->height);
+                $this->width  = $width;
+            } else {
+                $this->width    = ceil($yratio * $this->width);
+                $this->height    = $height;
+            }
+        } else {
+            $this->width = $width;
+            $this->height = $height;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get ResizeProportional
+     *
+     * @return boolean
+     */
+    public function getResizeProportional()
+    {
+        return $this->resizeProportional;
+    }
+
+    /**
+     * Set ResizeProportional
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setResizeProportional($pValue = true)
+    {
+        $this->resizeProportional = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Rotation
+     *
+     * @return int
+     */
+    public function getRotation()
+    {
+        return $this->rotation;
+    }
+
+    /**
+     * Set Rotation
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setRotation($pValue = 0)
+    {
+        $this->rotation = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Shadow
+     *
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function getShadow()
+    {
+        return $this->shadow;
+    }
+
+    /**
+     * Set Shadow
+     *
+     * @param     PHPExcel_Worksheet_Drawing_Shadow $pValue
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_BaseDrawing
+     */
+    public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null)
+    {
+           $this->shadow = $pValue;
+           return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->name .
+            $this->description .
+            $this->worksheet->getHashCode() .
+            $this->coordinates .
+            $this->offsetX .
+            $this->offsetY .
+            $this->width .
+            $this->height .
+            $this->rotation .
+            $this->shadow->getHashCode() .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/CellIterator.php b/lib/PHPExcel/Worksheet/CellIterator.php
new file mode 100644
index 000000000..151c17f53
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/CellIterator.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_CellIterator
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Worksheet_CellIterator
+{
+    /**
+     * PHPExcel_Worksheet to iterate
+     *
+     * @var PHPExcel_Worksheet
+     */
+    protected $subject;
+
+    /**
+     * Current iterator position
+     *
+     * @var mixed
+     */
+    protected $position = null;
+
+    /**
+     * Iterate only existing cells
+     *
+     * @var boolean
+     */
+    protected $onlyExistingCells = false;
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * Get loop only existing cells
+     *
+     * @return boolean
+     */
+    public function getIterateOnlyExistingCells()
+    {
+        return $this->onlyExistingCells;
+    }
+
+    /**
+     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
+     *
+     * @throws PHPExcel_Exception
+     */
+    abstract protected function adjustForExistingOnlyRange();
+
+    /**
+     * Set the iterator to loop only existing cells
+     *
+     * @param    boolean        $value
+     * @throws PHPExcel_Exception
+     */
+    public function setIterateOnlyExistingCells($value = true)
+    {
+        $this->onlyExistingCells = (boolean) $value;
+
+        $this->adjustForExistingOnlyRange();
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/Column.php b/lib/PHPExcel/Worksheet/Column.php
new file mode 100644
index 000000000..6d3f36d17
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/Column.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_Column
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_Column
+{
+    /**
+     * PHPExcel_Worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $parent;
+
+    /**
+     * Column index
+     *
+     * @var string
+     */
+    private $columnIndex;
+
+    /**
+     * Create a new column
+     *
+     * @param PHPExcel_Worksheet     $parent
+     * @param string                $columnIndex
+     */
+    public function __construct(PHPExcel_Worksheet $parent = null, $columnIndex = 'A')
+    {
+        // Set parent and column index
+        $this->parent         = $parent;
+        $this->columnIndex = $columnIndex;
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->parent);
+    }
+
+    /**
+     * Get column index
+     *
+     * @return string
+     */
+    public function getColumnIndex()
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Get cell iterator
+     *
+     * @param    integer                $startRow        The row number at which to start iterating
+     * @param    integer                $endRow            Optionally, the row number at which to stop iterating
+     * @return PHPExcel_Worksheet_CellIterator
+     */
+    public function getCellIterator($startRow = 1, $endRow = null)
+    {
+        return new PHPExcel_Worksheet_ColumnCellIterator($this->parent, $this->columnIndex, $startRow, $endRow);
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/ColumnCellIterator.php b/lib/PHPExcel/Worksheet/ColumnCellIterator.php
new file mode 100644
index 000000000..7b8c2190a
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/ColumnCellIterator.php
@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_ColumnCellIterator
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_ColumnCellIterator extends PHPExcel_Worksheet_CellIterator implements Iterator
+{
+    /**
+     * Column index
+     *
+     * @var string
+     */
+    protected $columnIndex;
+
+    /**
+     * Start position
+     *
+     * @var int
+     */
+    protected $startRow = 1;
+
+    /**
+     * End position
+     *
+     * @var int
+     */
+    protected $endRow = 1;
+
+    /**
+     * Create a new row iterator
+     *
+     * @param    PHPExcel_Worksheet    $subject        The worksheet to iterate over
+     * @param   string              $columnIndex    The column that we want to iterate
+     * @param    integer                $startRow        The row number at which to start iterating
+     * @param    integer                $endRow            Optionally, the row number at which to stop iterating
+     */
+    public function __construct(PHPExcel_Worksheet $subject = null, $columnIndex = 'A', $startRow = 1, $endRow = null)
+    {
+        // Set subject
+        $this->subject = $subject;
+        $this->columnIndex = PHPExcel_Cell::columnIndexFromString($columnIndex) - 1;
+        $this->resetEnd($endRow);
+        $this->resetStart($startRow);
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * (Re)Set the start row and the current row pointer
+     *
+     * @param integer    $startRow    The row number at which to start iterating
+     * @return PHPExcel_Worksheet_ColumnCellIterator
+     * @throws PHPExcel_Exception
+     */
+    public function resetStart($startRow = 1)
+    {
+        $this->startRow = $startRow;
+        $this->adjustForExistingOnlyRange();
+        $this->seek($startRow);
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end row
+     *
+     * @param integer    $endRow    The row number at which to stop iterating
+     * @return PHPExcel_Worksheet_ColumnCellIterator
+     * @throws PHPExcel_Exception
+     */
+    public function resetEnd($endRow = null)
+    {
+        $this->endRow = ($endRow) ? $endRow : $this->subject->getHighestRow();
+        $this->adjustForExistingOnlyRange();
+
+        return $this;
+    }
+
+    /**
+     * Set the row pointer to the selected row
+     *
+     * @param integer    $row    The row number to set the current pointer at
+     * @return PHPExcel_Worksheet_ColumnCellIterator
+     * @throws PHPExcel_Exception
+     */
+    public function seek($row = 1)
+    {
+        if (($row < $this->startRow) || ($row > $this->endRow)) {
+            throw new PHPExcel_Exception("Row $row is out of range ({$this->startRow} - {$this->endRow})");
+        } elseif ($this->onlyExistingCells && !($this->subject->cellExistsByColumnAndRow($this->columnIndex, $row))) {
+            throw new PHPExcel_Exception('In "IterateOnlyExistingCells" mode and Cell does not exist');
+        }
+        $this->position = $row;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting row
+     */
+    public function rewind()
+    {
+        $this->position = $this->startRow;
+    }
+
+    /**
+     * Return the current cell in this worksheet column
+     *
+     * @return PHPExcel_Worksheet_Row
+     */
+    public function current()
+    {
+        return $this->subject->getCellByColumnAndRow($this->columnIndex, $this->position);
+    }
+
+    /**
+     * Return the current iterator key
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Set the iterator to its next value
+     */
+    public function next()
+    {
+        do {
+            ++$this->position;
+        } while (($this->onlyExistingCells) &&
+            (!$this->subject->cellExistsByColumnAndRow($this->columnIndex, $this->position)) &&
+            ($this->position <= $this->endRow));
+    }
+
+    /**
+     * Set the iterator to its previous value
+     */
+    public function prev()
+    {
+        if ($this->position <= $this->startRow) {
+            throw new PHPExcel_Exception("Row is already at the beginning of range ({$this->startRow} - {$this->endRow})");
+        }
+
+        do {
+            --$this->position;
+        } while (($this->onlyExistingCells) &&
+            (!$this->subject->cellExistsByColumnAndRow($this->columnIndex, $this->position)) &&
+            ($this->position >= $this->startRow));
+    }
+
+    /**
+     * Indicate if more rows exist in the worksheet range of rows that we're iterating
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->position <= $this->endRow;
+    }
+
+    /**
+     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
+     *
+     * @throws PHPExcel_Exception
+     */
+    protected function adjustForExistingOnlyRange()
+    {
+        if ($this->onlyExistingCells) {
+            while ((!$this->subject->cellExistsByColumnAndRow($this->columnIndex, $this->startRow)) &&
+                ($this->startRow <= $this->endRow)) {
+                ++$this->startRow;
+            }
+            if ($this->startRow > $this->endRow) {
+                throw new PHPExcel_Exception('No cells exist within the specified range');
+            }
+            while ((!$this->subject->cellExistsByColumnAndRow($this->columnIndex, $this->endRow)) &&
+                ($this->endRow >= $this->startRow)) {
+                --$this->endRow;
+            }
+            if ($this->endRow < $this->startRow) {
+                throw new PHPExcel_Exception('No cells exist within the specified range');
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/ColumnDimension.php b/lib/PHPExcel/Worksheet/ColumnDimension.php
new file mode 100644
index 000000000..405b8258e
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/ColumnDimension.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_ColumnDimension
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_ColumnDimension extends PHPExcel_Worksheet_Dimension
+{
+    /**
+     * Column index
+     *
+     * @var int
+     */
+    private $columnIndex;
+
+    /**
+     * Column width
+     *
+     * When this is set to a negative value, the column width should be ignored by IWriter
+     *
+     * @var double
+     */
+    private $width = -1;
+
+    /**
+     * Auto size?
+     *
+     * @var bool
+     */
+    private $autoSize = false;
+
+    /**
+     * Create a new PHPExcel_Worksheet_ColumnDimension
+     *
+     * @param string $pIndex Character column index
+     */
+    public function __construct($pIndex = 'A')
+    {
+        // Initialise values
+        $this->columnIndex = $pIndex;
+
+        // set dimension as unformatted by default
+        parent::__construct(0);
+    }
+
+    /**
+     * Get ColumnIndex
+     *
+     * @return string
+     */
+    public function getColumnIndex()
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Set ColumnIndex
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_ColumnDimension
+     */
+    public function setColumnIndex($pValue)
+    {
+        $this->columnIndex = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Width
+     *
+     * @return double
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set Width
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_ColumnDimension
+     */
+    public function setWidth($pValue = -1)
+    {
+        $this->width = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Auto Size
+     *
+     * @return bool
+     */
+    public function getAutoSize()
+    {
+        return $this->autoSize;
+    }
+
+    /**
+     * Set Auto Size
+     *
+     * @param bool $pValue
+     * @return PHPExcel_Worksheet_ColumnDimension
+     */
+    public function setAutoSize($pValue = false)
+    {
+        $this->autoSize = $pValue;
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/ColumnIterator.php b/lib/PHPExcel/Worksheet/ColumnIterator.php
new file mode 100644
index 000000000..0db3e5347
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/ColumnIterator.php
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_ColumnIterator
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_ColumnIterator implements Iterator
+{
+    /**
+     * PHPExcel_Worksheet to iterate
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $subject;
+
+    /**
+     * Current iterator position
+     *
+     * @var int
+     */
+    private $position = 0;
+
+    /**
+     * Start position
+     *
+     * @var int
+     */
+    private $startColumn = 0;
+
+
+    /**
+     * End position
+     *
+     * @var int
+     */
+    private $endColumn = 0;
+
+
+    /**
+     * Create a new column iterator
+     *
+     * @param    PHPExcel_Worksheet    $subject    The worksheet to iterate over
+     * @param    string                $startColumn    The column address at which to start iterating
+     * @param    string                $endColumn        Optionally, the column address at which to stop iterating
+     */
+    public function __construct(PHPExcel_Worksheet $subject = null, $startColumn = 'A', $endColumn = null)
+    {
+        // Set subject
+        $this->subject = $subject;
+        $this->resetEnd($endColumn);
+        $this->resetStart($startColumn);
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * (Re)Set the start column and the current column pointer
+     *
+     * @param integer    $startColumn    The column address at which to start iterating
+     * @return PHPExcel_Worksheet_ColumnIterator
+     * @throws PHPExcel_Exception
+     */
+    public function resetStart($startColumn = 'A')
+    {
+        $startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1;
+        if ($startColumnIndex > PHPExcel_Cell::columnIndexFromString($this->subject->getHighestColumn()) - 1) {
+            throw new PHPExcel_Exception("Start column ({$startColumn}) is beyond highest column ({$this->subject->getHighestColumn()})");
+        }
+
+        $this->startColumn = $startColumnIndex;
+        if ($this->endColumn < $this->startColumn) {
+            $this->endColumn = $this->startColumn;
+        }
+        $this->seek($startColumn);
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end column
+     *
+     * @param string    $endColumn    The column address at which to stop iterating
+     * @return PHPExcel_Worksheet_ColumnIterator
+     */
+    public function resetEnd($endColumn = null)
+    {
+        $endColumn = ($endColumn) ? $endColumn : $this->subject->getHighestColumn();
+        $this->endColumn = PHPExcel_Cell::columnIndexFromString($endColumn) - 1;
+
+        return $this;
+    }
+
+    /**
+     * Set the column pointer to the selected column
+     *
+     * @param string    $column    The column address to set the current pointer at
+     * @return PHPExcel_Worksheet_ColumnIterator
+     * @throws PHPExcel_Exception
+     */
+    public function seek($column = 'A')
+    {
+        $column = PHPExcel_Cell::columnIndexFromString($column) - 1;
+        if (($column < $this->startColumn) || ($column > $this->endColumn)) {
+            throw new PHPExcel_Exception("Column $column is out of range ({$this->startColumn} - {$this->endColumn})");
+        }
+        $this->position = $column;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting column
+     */
+    public function rewind()
+    {
+        $this->position = $this->startColumn;
+    }
+
+    /**
+     * Return the current column in this worksheet
+     *
+     * @return PHPExcel_Worksheet_Column
+     */
+    public function current()
+    {
+        return new PHPExcel_Worksheet_Column($this->subject, PHPExcel_Cell::stringFromColumnIndex($this->position));
+    }
+
+    /**
+     * Return the current iterator key
+     *
+     * @return string
+     */
+    public function key()
+    {
+        return PHPExcel_Cell::stringFromColumnIndex($this->position);
+    }
+
+    /**
+     * Set the iterator to its next value
+     */
+    public function next()
+    {
+        ++$this->position;
+    }
+
+    /**
+     * Set the iterator to its previous value
+     *
+     * @throws PHPExcel_Exception
+     */
+    public function prev()
+    {
+        if ($this->position <= $this->startColumn) {
+            throw new PHPExcel_Exception(
+                "Column is already at the beginning of range (" .
+                PHPExcel_Cell::stringFromColumnIndex($this->endColumn) . " - " .
+                PHPExcel_Cell::stringFromColumnIndex($this->endColumn) . ")"
+            );
+        }
+
+        --$this->position;
+    }
+
+    /**
+     * Indicate if more columns exist in the worksheet range of columns that we're iterating
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->position <= $this->endColumn;
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/Dimension.php b/lib/PHPExcel/Worksheet/Dimension.php
new file mode 100644
index 000000000..84f692cb5
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/Dimension.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_Dimension
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Worksheet_Dimension
+{
+    /**
+     * Visible?
+     *
+     * @var bool
+     */
+    private $visible = true;
+
+    /**
+     * Outline level
+     *
+     * @var int
+     */
+    private $outlineLevel = 0;
+
+    /**
+     * Collapsed
+     *
+     * @var bool
+     */
+    private $collapsed = false;
+
+    /**
+     * Index to cellXf. Null value means row has no explicit cellXf format.
+     *
+     * @var int|null
+     */
+    private $xfIndex;
+
+    /**
+     * Create a new PHPExcel_Worksheet_Dimension
+     *
+     * @param int $pIndex Numeric row index
+     */
+    public function __construct($initialValue = null)
+    {
+        // set dimension as unformatted by default
+        $this->xfIndex = $initialValue;
+    }
+
+    /**
+     * Get Visible
+     *
+     * @return bool
+     */
+    public function getVisible()
+    {
+        return $this->visible;
+    }
+
+    /**
+     * Set Visible
+     *
+     * @param bool $pValue
+     * @return PHPExcel_Worksheet_Dimension
+     */
+    public function setVisible($pValue = true)
+    {
+        $this->visible = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Outline Level
+     *
+     * @return int
+     */
+    public function getOutlineLevel()
+    {
+        return $this->outlineLevel;
+    }
+
+    /**
+     * Set Outline Level
+     *
+     * Value must be between 0 and 7
+     *
+     * @param int $pValue
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet_Dimension
+     */
+    public function setOutlineLevel($pValue)
+    {
+        if ($pValue < 0 || $pValue > 7) {
+            throw new PHPExcel_Exception("Outline level must range between 0 and 7.");
+        }
+
+        $this->outlineLevel = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Collapsed
+     *
+     * @return bool
+     */
+    public function getCollapsed()
+    {
+        return $this->collapsed;
+    }
+
+    /**
+     * Set Collapsed
+     *
+     * @param bool $pValue
+     * @return PHPExcel_Worksheet_Dimension
+     */
+    public function setCollapsed($pValue = true)
+    {
+        $this->collapsed = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get index to cellXf
+     *
+     * @return int
+     */
+    public function getXfIndex()
+    {
+        return $this->xfIndex;
+    }
+
+    /**
+     * Set index to cellXf
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_Dimension
+     */
+    public function setXfIndex($pValue = 0)
+    {
+        $this->xfIndex = $pValue;
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/Drawing.php b/lib/PHPExcel/Worksheet/Drawing.php
new file mode 100644
index 000000000..e39d3eb91
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/Drawing.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_Drawing
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet_Drawing
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
+{
+    /**
+     * Path
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * Create a new PHPExcel_Worksheet_Drawing
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->path = '';
+
+        // Initialize parent
+        parent::__construct();
+    }
+
+    /**
+     * Get Filename
+     *
+     * @return string
+     */
+    public function getFilename()
+    {
+        return basename($this->path);
+    }
+
+    /**
+     * Get indexed filename (using image index)
+     *
+     * @return string
+     */
+    public function getIndexedFilename()
+    {
+        $fileName = $this->getFilename();
+        $fileName = str_replace(' ', '_', $fileName);
+        return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension();
+    }
+
+    /**
+     * Get Extension
+     *
+     * @return string
+     */
+    public function getExtension()
+    {
+        $exploded = explode(".", basename($this->path));
+        return $exploded[count($exploded) - 1];
+    }
+
+    /**
+     * Get Path
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Set Path
+     *
+     * @param     string         $pValue            File path
+     * @param     boolean        $pVerifyFile    Verify file
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_Drawing
+     */
+    public function setPath($pValue = '', $pVerifyFile = true)
+    {
+        if ($pVerifyFile) {
+            if (file_exists($pValue)) {
+                $this->path = $pValue;
+
+                if ($this->width == 0 && $this->height == 0) {
+                    // Get width/height
+                    list($this->width, $this->height) = getimagesize($pValue);
+                }
+            } else {
+                throw new PHPExcel_Exception("File $pValue not found!");
+            }
+        } else {
+            $this->path = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->path .
+            parent::getHashCode() .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/Drawing/Shadow.php b/lib/PHPExcel/Worksheet/Drawing/Shadow.php
new file mode 100644
index 000000000..84db91d57
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/Drawing/Shadow.php
@@ -0,0 +1,296 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_Drawing_Shadow
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet_Drawing
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
+{
+    /* Shadow alignment */
+    const SHADOW_BOTTOM       = 'b';
+    const SHADOW_BOTTOM_LEFT  = 'bl';
+    const SHADOW_BOTTOM_RIGHT = 'br';
+    const SHADOW_CENTER       = 'ctr';
+    const SHADOW_LEFT         = 'l';
+    const SHADOW_TOP          = 't';
+    const SHADOW_TOP_LEFT     = 'tl';
+    const SHADOW_TOP_RIGHT    = 'tr';
+
+    /**
+     * Visible
+     *
+     * @var boolean
+     */
+    private $visible;
+
+    /**
+     * Blur radius
+     *
+     * Defaults to 6
+     *
+     * @var int
+     */
+    private $blurRadius;
+
+    /**
+     * Shadow distance
+     *
+     * Defaults to 2
+     *
+     * @var int
+     */
+    private $distance;
+
+    /**
+     * Shadow direction (in degrees)
+     *
+     * @var int
+     */
+    private $direction;
+
+    /**
+     * Shadow alignment
+     *
+     * @var int
+     */
+    private $alignment;
+
+    /**
+     * Color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    private $color;
+
+    /**
+     * Alpha
+     *
+     * @var int
+     */
+    private $alpha;
+
+    /**
+     * Create a new PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->visible     = false;
+        $this->blurRadius  = 6;
+        $this->distance    = 2;
+        $this->direction   = 0;
+        $this->alignment   = PHPExcel_Worksheet_Drawing_Shadow::SHADOW_BOTTOM_RIGHT;
+        $this->color       = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK);
+        $this->alpha       = 50;
+    }
+
+    /**
+     * Get Visible
+     *
+     * @return boolean
+     */
+    public function getVisible()
+    {
+        return $this->visible;
+    }
+
+    /**
+     * Set Visible
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setVisible($pValue = false)
+    {
+        $this->visible = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Blur radius
+     *
+     * @return int
+     */
+    public function getBlurRadius()
+    {
+        return $this->blurRadius;
+    }
+
+    /**
+     * Set Blur radius
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setBlurRadius($pValue = 6)
+    {
+        $this->blurRadius = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Shadow distance
+     *
+     * @return int
+     */
+    public function getDistance()
+    {
+        return $this->distance;
+    }
+
+    /**
+     * Set Shadow distance
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setDistance($pValue = 2)
+    {
+        $this->distance = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Shadow direction (in degrees)
+     *
+     * @return int
+     */
+    public function getDirection()
+    {
+        return $this->direction;
+    }
+
+    /**
+     * Set Shadow direction (in degrees)
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setDirection($pValue = 0)
+    {
+        $this->direction = $pValue;
+        return $this;
+    }
+
+   /**
+     * Get Shadow alignment
+     *
+     * @return int
+     */
+    public function getAlignment()
+    {
+        return $this->alignment;
+    }
+
+    /**
+     * Set Shadow alignment
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setAlignment($pValue = 0)
+    {
+        $this->alignment = $pValue;
+        return $this;
+    }
+
+   /**
+     * Get Color
+     *
+     * @return PHPExcel_Style_Color
+     */
+    public function getColor()
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set Color
+     *
+     * @param     PHPExcel_Style_Color $pValue
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setColor(PHPExcel_Style_Color $pValue = null)
+    {
+           $this->color = $pValue;
+           return $this;
+    }
+
+   /**
+     * Get Alpha
+     *
+     * @return int
+     */
+    public function getAlpha()
+    {
+        return $this->alpha;
+    }
+
+    /**
+     * Set Alpha
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_Drawing_Shadow
+     */
+    public function setAlpha($pValue = 0)
+    {
+        $this->alpha = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            ($this->visible ? 't' : 'f') .
+            $this->blurRadius .
+            $this->distance .
+            $this->direction .
+            $this->alignment .
+            $this->color->getHashCode() .
+            $this->alpha .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/HeaderFooter.php b/lib/PHPExcel/Worksheet/HeaderFooter.php
new file mode 100644
index 000000000..3a88923fc
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/HeaderFooter.php
@@ -0,0 +1,494 @@
+<?php
+/**
+ * PHPExcel_Worksheet_HeaderFooter
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not,241 write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ *
+ * <code>
+ * Header/Footer Formatting Syntax taken from Office Open XML Part 4 - Markup Language Reference, page 1970:
+ *
+ * There are a number of formatting codes that can be written inline with the actual header / footer text, which
+ * affect the formatting in the header or footer.
+ *
+ * Example: This example shows the text "Center Bold Header" on the first line (center section), and the date on
+ * the second line (center section).
+ *         &CCenter &"-,Bold"Bold&"-,Regular"Header_x000A_&D
+ *
+ * General Rules:
+ * There is no required order in which these codes must appear.
+ *
+ * The first occurrence of the following codes turns the formatting ON, the second occurrence turns it OFF again:
+ * - strikethrough
+ * - superscript
+ * - subscript
+ * Superscript and subscript cannot both be ON at same time. Whichever comes first wins and the other is ignored,
+ * while the first is ON.
+ * &L - code for "left section" (there are three header / footer locations, "left", "center", and "right"). When
+ * two or more occurrences of this section marker exist, the contents from all markers are concatenated, in the
+ * order of appearance, and placed into the left section.
+ * &P - code for "current page #"
+ * &N - code for "total pages"
+ * &font size - code for "text font size", where font size is a font size in points.
+ * &K - code for "text font color"
+ * RGB Color is specified as RRGGBB
+ * Theme Color is specifed as TTSNN where TT is the theme color Id, S is either "+" or "-" of the tint/shade
+ * value, NN is the tint/shade value.
+ * &S - code for "text strikethrough" on / off
+ * &X - code for "text super script" on / off
+ * &Y - code for "text subscript" on / off
+ * &C - code for "center section". When two or more occurrences of this section marker exist, the contents
+ * from all markers are concatenated, in the order of appearance, and placed into the center section.
+ *
+ * &D - code for "date"
+ * &T - code for "time"
+ * &G - code for "picture as background"
+ * &U - code for "text single underline"
+ * &E - code for "double underline"
+ * &R - code for "right section". When two or more occurrences of this section marker exist, the contents
+ * from all markers are concatenated, in the order of appearance, and placed into the right section.
+ * &Z - code for "this workbook's file path"
+ * &F - code for "this workbook's file name"
+ * &A - code for "sheet tab name"
+ * &+ - code for add to page #.
+ * &- - code for subtract from page #.
+ * &"font name,font type" - code for "text font name" and "text font type", where font name and font type
+ * are strings specifying the name and type of the font, separated by a comma. When a hyphen appears in font
+ * name, it means "none specified". Both of font name and font type can be localized values.
+ * &"-,Bold" - code for "bold font style"
+ * &B - also means "bold font style".
+ * &"-,Regular" - code for "regular font style"
+ * &"-,Italic" - code for "italic font style"
+ * &I - also means "italic font style"
+ * &"-,Bold Italic" code for "bold italic font style"
+ * &O - code for "outline style"
+ * &H - code for "shadow style"
+ * </code>
+ *
+ */
+class PHPExcel_Worksheet_HeaderFooter
+{
+    /* Header/footer image location */
+    const IMAGE_HEADER_LEFT   = 'LH';
+    const IMAGE_HEADER_CENTER = 'CH';
+    const IMAGE_HEADER_RIGHT  = 'RH';
+    const IMAGE_FOOTER_LEFT   = 'LF';
+    const IMAGE_FOOTER_CENTER = 'CF';
+    const IMAGE_FOOTER_RIGHT  = 'RF';
+
+    /**
+     * OddHeader
+     *
+     * @var string
+     */
+    private $oddHeader = '';
+
+    /**
+     * OddFooter
+     *
+     * @var string
+     */
+    private $oddFooter = '';
+
+    /**
+     * EvenHeader
+     *
+     * @var string
+     */
+    private $evenHeader = '';
+
+    /**
+     * EvenFooter
+     *
+     * @var string
+     */
+    private $evenFooter = '';
+
+    /**
+     * FirstHeader
+     *
+     * @var string
+     */
+    private $firstHeader = '';
+
+    /**
+     * FirstFooter
+     *
+     * @var string
+     */
+    private $firstFooter = '';
+
+    /**
+     * Different header for Odd/Even, defaults to false
+     *
+     * @var boolean
+     */
+    private $differentOddEven = false;
+
+    /**
+     * Different header for first page, defaults to false
+     *
+     * @var boolean
+     */
+    private $differentFirst = false;
+
+    /**
+     * Scale with document, defaults to true
+     *
+     * @var boolean
+     */
+    private $scaleWithDocument = true;
+
+    /**
+     * Align with margins, defaults to true
+     *
+     * @var boolean
+     */
+    private $alignWithMargins = true;
+
+    /**
+     * Header/footer images
+     *
+     * @var PHPExcel_Worksheet_HeaderFooterDrawing[]
+     */
+    private $headerFooterImages = array();
+
+    /**
+     * Create a new PHPExcel_Worksheet_HeaderFooter
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get OddHeader
+     *
+     * @return string
+     */
+    public function getOddHeader()
+    {
+        return $this->oddHeader;
+    }
+
+    /**
+     * Set OddHeader
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setOddHeader($pValue)
+    {
+        $this->oddHeader = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get OddFooter
+     *
+     * @return string
+     */
+    public function getOddFooter()
+    {
+        return $this->oddFooter;
+    }
+
+    /**
+     * Set OddFooter
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setOddFooter($pValue)
+    {
+        $this->oddFooter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get EvenHeader
+     *
+     * @return string
+     */
+    public function getEvenHeader()
+    {
+        return $this->evenHeader;
+    }
+
+    /**
+     * Set EvenHeader
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setEvenHeader($pValue)
+    {
+        $this->evenHeader = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get EvenFooter
+     *
+     * @return string
+     */
+    public function getEvenFooter()
+    {
+        return $this->evenFooter;
+    }
+
+    /**
+     * Set EvenFooter
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setEvenFooter($pValue)
+    {
+        $this->evenFooter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get FirstHeader
+     *
+     * @return string
+     */
+    public function getFirstHeader()
+    {
+        return $this->firstHeader;
+    }
+
+    /**
+     * Set FirstHeader
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setFirstHeader($pValue)
+    {
+        $this->firstHeader = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get FirstFooter
+     *
+     * @return string
+     */
+    public function getFirstFooter()
+    {
+        return $this->firstFooter;
+    }
+
+    /**
+     * Set FirstFooter
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setFirstFooter($pValue)
+    {
+        $this->firstFooter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get DifferentOddEven
+     *
+     * @return boolean
+     */
+    public function getDifferentOddEven()
+    {
+        return $this->differentOddEven;
+    }
+
+    /**
+     * Set DifferentOddEven
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setDifferentOddEven($pValue = false)
+    {
+        $this->differentOddEven = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get DifferentFirst
+     *
+     * @return boolean
+     */
+    public function getDifferentFirst()
+    {
+        return $this->differentFirst;
+    }
+
+    /**
+     * Set DifferentFirst
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setDifferentFirst($pValue = false)
+    {
+        $this->differentFirst = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get ScaleWithDocument
+     *
+     * @return boolean
+     */
+    public function getScaleWithDocument()
+    {
+        return $this->scaleWithDocument;
+    }
+
+    /**
+     * Set ScaleWithDocument
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setScaleWithDocument($pValue = true)
+    {
+        $this->scaleWithDocument = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get AlignWithMargins
+     *
+     * @return boolean
+     */
+    public function getAlignWithMargins()
+    {
+        return $this->alignWithMargins;
+    }
+
+    /**
+     * Set AlignWithMargins
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setAlignWithMargins($pValue = true)
+    {
+        $this->alignWithMargins = $pValue;
+        return $this;
+    }
+
+    /**
+     * Add header/footer image
+     *
+     * @param PHPExcel_Worksheet_HeaderFooterDrawing $image
+     * @param string $location
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function addImage(PHPExcel_Worksheet_HeaderFooterDrawing $image = null, $location = self::IMAGE_HEADER_LEFT)
+    {
+        $this->headerFooterImages[$location] = $image;
+        return $this;
+    }
+
+    /**
+     * Remove header/footer image
+     *
+     * @param string $location
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function removeImage($location = self::IMAGE_HEADER_LEFT)
+    {
+        if (isset($this->headerFooterImages[$location])) {
+            unset($this->headerFooterImages[$location]);
+        }
+        return $this;
+    }
+
+    /**
+     * Set header/footer images
+     *
+     * @param PHPExcel_Worksheet_HeaderFooterDrawing[] $images
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setImages($images)
+    {
+        if (!is_array($images)) {
+            throw new PHPExcel_Exception('Invalid parameter!');
+        }
+
+        $this->headerFooterImages = $images;
+        return $this;
+    }
+
+    /**
+     * Get header/footer images
+     *
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing[]
+     */
+    public function getImages()
+    {
+        // Sort array
+        $images = array();
+        if (isset($this->headerFooterImages[self::IMAGE_HEADER_LEFT])) {
+            $images[self::IMAGE_HEADER_LEFT] =         $this->headerFooterImages[self::IMAGE_HEADER_LEFT];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_HEADER_CENTER])) {
+            $images[self::IMAGE_HEADER_CENTER] =     $this->headerFooterImages[self::IMAGE_HEADER_CENTER];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_HEADER_RIGHT])) {
+            $images[self::IMAGE_HEADER_RIGHT] =     $this->headerFooterImages[self::IMAGE_HEADER_RIGHT];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_FOOTER_LEFT])) {
+            $images[self::IMAGE_FOOTER_LEFT] =         $this->headerFooterImages[self::IMAGE_FOOTER_LEFT];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_FOOTER_CENTER])) {
+            $images[self::IMAGE_FOOTER_CENTER] =     $this->headerFooterImages[self::IMAGE_FOOTER_CENTER];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_FOOTER_RIGHT])) {
+            $images[self::IMAGE_FOOTER_RIGHT] =     $this->headerFooterImages[self::IMAGE_FOOTER_RIGHT];
+        }
+        $this->headerFooterImages = $images;
+
+        return $this->headerFooterImages;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/HeaderFooterDrawing.php b/lib/PHPExcel/Worksheet/HeaderFooterDrawing.php
new file mode 100644
index 000000000..a491f4ba6
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/HeaderFooterDrawing.php
@@ -0,0 +1,361 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_HeaderFooterDrawing
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing implements PHPExcel_IComparable
+{
+    /**
+     * Path
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * Name
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Offset X
+     *
+     * @var int
+     */
+    protected $offsetX;
+
+    /**
+     * Offset Y
+     *
+     * @var int
+     */
+    protected $offsetY;
+
+    /**
+     * Width
+     *
+     * @var int
+     */
+    protected $width;
+
+    /**
+     * Height
+     *
+     * @var int
+     */
+    protected $height;
+
+    /**
+     * Proportional resize
+     *
+     * @var boolean
+     */
+    protected $resizeProportional;
+
+    /**
+     * Create a new PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->path                = '';
+        $this->name                = '';
+        $this->offsetX             = 0;
+        $this->offsetY             = 0;
+        $this->width               = 0;
+        $this->height              = 0;
+        $this->resizeProportional  = true;
+    }
+
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set Name
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setName($pValue = '')
+    {
+        $this->name = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get OffsetX
+     *
+     * @return int
+     */
+    public function getOffsetX()
+    {
+        return $this->offsetX;
+    }
+
+    /**
+     * Set OffsetX
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setOffsetX($pValue = 0)
+    {
+        $this->offsetX = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get OffsetY
+     *
+     * @return int
+     */
+    public function getOffsetY()
+    {
+        return $this->offsetY;
+    }
+
+    /**
+     * Set OffsetY
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setOffsetY($pValue = 0)
+    {
+        $this->offsetY = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Width
+     *
+     * @return int
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set Width
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setWidth($pValue = 0)
+    {
+        // Resize proportional?
+        if ($this->resizeProportional && $pValue != 0) {
+            $ratio = $this->width / $this->height;
+            $this->height = round($ratio * $pValue);
+        }
+
+        // Set width
+        $this->width = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get Height
+     *
+     * @return int
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set Height
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setHeight($pValue = 0)
+    {
+        // Resize proportional?
+        if ($this->resizeProportional && $pValue != 0) {
+            $ratio = $this->width / $this->height;
+            $this->width = round($ratio * $pValue);
+        }
+
+        // Set height
+        $this->height = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Set width and height with proportional resize
+     * Example:
+     * <code>
+     * $objDrawing->setResizeProportional(true);
+     * $objDrawing->setWidthAndHeight(160,120);
+     * </code>
+     *
+     * @author Vincent@luo MSN:kele_100@hotmail.com
+     * @param int $width
+     * @param int $height
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setWidthAndHeight($width = 0, $height = 0)
+    {
+        $xratio = $width / $this->width;
+        $yratio = $height / $this->height;
+        if ($this->resizeProportional && !($width == 0 || $height == 0)) {
+            if (($xratio * $this->height) < $height) {
+                $this->height = ceil($xratio * $this->height);
+                $this->width  = $width;
+            } else {
+                $this->width    = ceil($yratio * $this->width);
+                $this->height    = $height;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get ResizeProportional
+     *
+     * @return boolean
+     */
+    public function getResizeProportional()
+    {
+        return $this->resizeProportional;
+    }
+
+    /**
+     * Set ResizeProportional
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setResizeProportional($pValue = true)
+    {
+        $this->resizeProportional = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Filename
+     *
+     * @return string
+     */
+    public function getFilename()
+    {
+        return basename($this->path);
+    }
+
+    /**
+     * Get Extension
+     *
+     * @return string
+     */
+    public function getExtension()
+    {
+        $parts = explode(".", basename($this->path));
+        return end($parts);
+    }
+
+    /**
+     * Get Path
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Set Path
+     *
+     * @param     string         $pValue            File path
+     * @param     boolean        $pVerifyFile    Verify file
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_HeaderFooterDrawing
+     */
+    public function setPath($pValue = '', $pVerifyFile = true)
+    {
+        if ($pVerifyFile) {
+            if (file_exists($pValue)) {
+                $this->path = $pValue;
+
+                if ($this->width == 0 && $this->height == 0) {
+                    // Get width/height
+                    list($this->width, $this->height) = getimagesize($pValue);
+                }
+            } else {
+                throw new PHPExcel_Exception("File $pValue not found!");
+            }
+        } else {
+            $this->path = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->path .
+            $this->name .
+            $this->offsetX .
+            $this->offsetY .
+            $this->width .
+            $this->height .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/MemoryDrawing.php b/lib/PHPExcel/Worksheet/MemoryDrawing.php
new file mode 100644
index 000000000..438ed2c58
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/MemoryDrawing.php
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_MemoryDrawing
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
+{
+    /* Rendering functions */
+    const RENDERING_DEFAULT = 'imagepng';
+    const RENDERING_PNG     = 'imagepng';
+    const RENDERING_GIF     = 'imagegif';
+    const RENDERING_JPEG    = 'imagejpeg';
+
+    /* MIME types */
+    const MIMETYPE_DEFAULT  = 'image/png';
+    const MIMETYPE_PNG      = 'image/png';
+    const MIMETYPE_GIF      = 'image/gif';
+    const MIMETYPE_JPEG     = 'image/jpeg';
+
+    /**
+     * Image resource
+     *
+     * @var resource
+     */
+    private $imageResource;
+
+    /**
+     * Rendering function
+     *
+     * @var string
+     */
+    private $renderingFunction;
+
+    /**
+     * Mime type
+     *
+     * @var string
+     */
+    private $mimeType;
+
+    /**
+     * Unique name
+     *
+     * @var string
+     */
+    private $uniqueName;
+
+    /**
+     * Create a new PHPExcel_Worksheet_MemoryDrawing
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->imageResource     = null;
+        $this->renderingFunction = self::RENDERING_DEFAULT;
+        $this->mimeType          = self::MIMETYPE_DEFAULT;
+        $this->uniqueName        = md5(rand(0, 9999). time() . rand(0, 9999));
+
+        // Initialize parent
+        parent::__construct();
+    }
+
+    /**
+     * Get image resource
+     *
+     * @return resource
+     */
+    public function getImageResource()
+    {
+        return $this->imageResource;
+    }
+
+    /**
+     * Set image resource
+     *
+     * @param    $value resource
+     * @return PHPExcel_Worksheet_MemoryDrawing
+     */
+    public function setImageResource($value = null)
+    {
+        $this->imageResource = $value;
+
+        if (!is_null($this->imageResource)) {
+            // Get width/height
+            $this->width  = imagesx($this->imageResource);
+            $this->height = imagesy($this->imageResource);
+        }
+        return $this;
+    }
+
+    /**
+     * Get rendering function
+     *
+     * @return string
+     */
+    public function getRenderingFunction()
+    {
+        return $this->renderingFunction;
+    }
+
+    /**
+     * Set rendering function
+     *
+     * @param string $value
+     * @return PHPExcel_Worksheet_MemoryDrawing
+     */
+    public function setRenderingFunction($value = PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT)
+    {
+        $this->renderingFunction = $value;
+        return $this;
+    }
+
+    /**
+     * Get mime type
+     *
+     * @return string
+     */
+    public function getMimeType()
+    {
+        return $this->mimeType;
+    }
+
+    /**
+     * Set mime type
+     *
+     * @param string $value
+     * @return PHPExcel_Worksheet_MemoryDrawing
+     */
+    public function setMimeType($value = PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_DEFAULT)
+    {
+        $this->mimeType = $value;
+        return $this;
+    }
+
+    /**
+     * Get indexed filename (using image index)
+     *
+     * @return string
+     */
+    public function getIndexedFilename()
+    {
+        $extension = strtolower($this->getMimeType());
+        $extension = explode('/', $extension);
+        $extension = $extension[1];
+
+        return $this->uniqueName . $this->getImageIndex() . '.' . $extension;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->renderingFunction .
+            $this->mimeType .
+            $this->uniqueName .
+            parent::getHashCode() .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/PageMargins.php b/lib/PHPExcel/Worksheet/PageMargins.php
new file mode 100644
index 000000000..70f5ee0f5
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/PageMargins.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Worksheet_PageMargins
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Worksheet_PageMargins
+{
+    /**
+     * Left
+     *
+     * @var double
+     */
+    private $left        = 0.7;
+
+    /**
+     * Right
+     *
+     * @var double
+     */
+    private $right        = 0.7;
+
+    /**
+     * Top
+     *
+     * @var double
+     */
+    private $top        = 0.75;
+
+    /**
+     * Bottom
+     *
+     * @var double
+     */
+    private $bottom    = 0.75;
+
+    /**
+     * Header
+     *
+     * @var double
+     */
+    private $header     = 0.3;
+
+    /**
+     * Footer
+     *
+     * @var double
+     */
+    private $footer     = 0.3;
+
+    /**
+     * Create a new PHPExcel_Worksheet_PageMargins
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get Left
+     *
+     * @return double
+     */
+    public function getLeft()
+    {
+        return $this->left;
+    }
+
+    /**
+     * Set Left
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function setLeft($pValue)
+    {
+        $this->left = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Right
+     *
+     * @return double
+     */
+    public function getRight()
+    {
+        return $this->right;
+    }
+
+    /**
+     * Set Right
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function setRight($pValue)
+    {
+        $this->right = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Top
+     *
+     * @return double
+     */
+    public function getTop()
+    {
+        return $this->top;
+    }
+
+    /**
+     * Set Top
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function setTop($pValue)
+    {
+        $this->top = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Bottom
+     *
+     * @return double
+     */
+    public function getBottom()
+    {
+        return $this->bottom;
+    }
+
+    /**
+     * Set Bottom
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function setBottom($pValue)
+    {
+        $this->bottom = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Header
+     *
+     * @return double
+     */
+    public function getHeader()
+    {
+        return $this->header;
+    }
+
+    /**
+     * Set Header
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function setHeader($pValue)
+    {
+        $this->header = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Footer
+     *
+     * @return double
+     */
+    public function getFooter()
+    {
+        return $this->footer;
+    }
+
+    /**
+     * Set Footer
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_PageMargins
+     */
+    public function setFooter($pValue)
+    {
+        $this->footer = $pValue;
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/PageSetup.php b/lib/PHPExcel/Worksheet/PageSetup.php
new file mode 100644
index 000000000..c67053e6b
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/PageSetup.php
@@ -0,0 +1,839 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Worksheet_PageSetup
+ *
+ * <code>
+ * Paper size taken from Office Open XML Part 4 - Markup Language Reference, page 1988:
+ *
+ * 1 = Letter paper (8.5 in. by 11 in.)
+ * 2 = Letter small paper (8.5 in. by 11 in.)
+ * 3 = Tabloid paper (11 in. by 17 in.)
+ * 4 = Ledger paper (17 in. by 11 in.)
+ * 5 = Legal paper (8.5 in. by 14 in.)
+ * 6 = Statement paper (5.5 in. by 8.5 in.)
+ * 7 = Executive paper (7.25 in. by 10.5 in.)
+ * 8 = A3 paper (297 mm by 420 mm)
+ * 9 = A4 paper (210 mm by 297 mm)
+ * 10 = A4 small paper (210 mm by 297 mm)
+ * 11 = A5 paper (148 mm by 210 mm)
+ * 12 = B4 paper (250 mm by 353 mm)
+ * 13 = B5 paper (176 mm by 250 mm)
+ * 14 = Folio paper (8.5 in. by 13 in.)
+ * 15 = Quarto paper (215 mm by 275 mm)
+ * 16 = Standard paper (10 in. by 14 in.)
+ * 17 = Standard paper (11 in. by 17 in.)
+ * 18 = Note paper (8.5 in. by 11 in.)
+ * 19 = #9 envelope (3.875 in. by 8.875 in.)
+ * 20 = #10 envelope (4.125 in. by 9.5 in.)
+ * 21 = #11 envelope (4.5 in. by 10.375 in.)
+ * 22 = #12 envelope (4.75 in. by 11 in.)
+ * 23 = #14 envelope (5 in. by 11.5 in.)
+ * 24 = C paper (17 in. by 22 in.)
+ * 25 = D paper (22 in. by 34 in.)
+ * 26 = E paper (34 in. by 44 in.)
+ * 27 = DL envelope (110 mm by 220 mm)
+ * 28 = C5 envelope (162 mm by 229 mm)
+ * 29 = C3 envelope (324 mm by 458 mm)
+ * 30 = C4 envelope (229 mm by 324 mm)
+ * 31 = C6 envelope (114 mm by 162 mm)
+ * 32 = C65 envelope (114 mm by 229 mm)
+ * 33 = B4 envelope (250 mm by 353 mm)
+ * 34 = B5 envelope (176 mm by 250 mm)
+ * 35 = B6 envelope (176 mm by 125 mm)
+ * 36 = Italy envelope (110 mm by 230 mm)
+ * 37 = Monarch envelope (3.875 in. by 7.5 in.).
+ * 38 = 6 3/4 envelope (3.625 in. by 6.5 in.)
+ * 39 = US standard fanfold (14.875 in. by 11 in.)
+ * 40 = German standard fanfold (8.5 in. by 12 in.)
+ * 41 = German legal fanfold (8.5 in. by 13 in.)
+ * 42 = ISO B4 (250 mm by 353 mm)
+ * 43 = Japanese double postcard (200 mm by 148 mm)
+ * 44 = Standard paper (9 in. by 11 in.)
+ * 45 = Standard paper (10 in. by 11 in.)
+ * 46 = Standard paper (15 in. by 11 in.)
+ * 47 = Invite envelope (220 mm by 220 mm)
+ * 50 = Letter extra paper (9.275 in. by 12 in.)
+ * 51 = Legal extra paper (9.275 in. by 15 in.)
+ * 52 = Tabloid extra paper (11.69 in. by 18 in.)
+ * 53 = A4 extra paper (236 mm by 322 mm)
+ * 54 = Letter transverse paper (8.275 in. by 11 in.)
+ * 55 = A4 transverse paper (210 mm by 297 mm)
+ * 56 = Letter extra transverse paper (9.275 in. by 12 in.)
+ * 57 = SuperA/SuperA/A4 paper (227 mm by 356 mm)
+ * 58 = SuperB/SuperB/A3 paper (305 mm by 487 mm)
+ * 59 = Letter plus paper (8.5 in. by 12.69 in.)
+ * 60 = A4 plus paper (210 mm by 330 mm)
+ * 61 = A5 transverse paper (148 mm by 210 mm)
+ * 62 = JIS B5 transverse paper (182 mm by 257 mm)
+ * 63 = A3 extra paper (322 mm by 445 mm)
+ * 64 = A5 extra paper (174 mm by 235 mm)
+ * 65 = ISO B5 extra paper (201 mm by 276 mm)
+ * 66 = A2 paper (420 mm by 594 mm)
+ * 67 = A3 transverse paper (297 mm by 420 mm)
+ * 68 = A3 extra transverse paper (322 mm by 445 mm)
+ * </code>
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Worksheet_PageSetup
+{
+    /* Paper size */
+    const PAPERSIZE_LETTER                          = 1;
+    const PAPERSIZE_LETTER_SMALL                    = 2;
+    const PAPERSIZE_TABLOID                         = 3;
+    const PAPERSIZE_LEDGER                          = 4;
+    const PAPERSIZE_LEGAL                           = 5;
+    const PAPERSIZE_STATEMENT                       = 6;
+    const PAPERSIZE_EXECUTIVE                       = 7;
+    const PAPERSIZE_A3                              = 8;
+    const PAPERSIZE_A4                              = 9;
+    const PAPERSIZE_A4_SMALL                        = 10;
+    const PAPERSIZE_A5                              = 11;
+    const PAPERSIZE_B4                              = 12;
+    const PAPERSIZE_B5                              = 13;
+    const PAPERSIZE_FOLIO                           = 14;
+    const PAPERSIZE_QUARTO                          = 15;
+    const PAPERSIZE_STANDARD_1                      = 16;
+    const PAPERSIZE_STANDARD_2                      = 17;
+    const PAPERSIZE_NOTE                            = 18;
+    const PAPERSIZE_NO9_ENVELOPE                    = 19;
+    const PAPERSIZE_NO10_ENVELOPE                   = 20;
+    const PAPERSIZE_NO11_ENVELOPE                   = 21;
+    const PAPERSIZE_NO12_ENVELOPE                   = 22;
+    const PAPERSIZE_NO14_ENVELOPE                   = 23;
+    const PAPERSIZE_C                               = 24;
+    const PAPERSIZE_D                               = 25;
+    const PAPERSIZE_E                               = 26;
+    const PAPERSIZE_DL_ENVELOPE                     = 27;
+    const PAPERSIZE_C5_ENVELOPE                     = 28;
+    const PAPERSIZE_C3_ENVELOPE                     = 29;
+    const PAPERSIZE_C4_ENVELOPE                     = 30;
+    const PAPERSIZE_C6_ENVELOPE                     = 31;
+    const PAPERSIZE_C65_ENVELOPE                    = 32;
+    const PAPERSIZE_B4_ENVELOPE                     = 33;
+    const PAPERSIZE_B5_ENVELOPE                     = 34;
+    const PAPERSIZE_B6_ENVELOPE                     = 35;
+    const PAPERSIZE_ITALY_ENVELOPE                  = 36;
+    const PAPERSIZE_MONARCH_ENVELOPE                = 37;
+    const PAPERSIZE_6_3_4_ENVELOPE                  = 38;
+    const PAPERSIZE_US_STANDARD_FANFOLD             = 39;
+    const PAPERSIZE_GERMAN_STANDARD_FANFOLD         = 40;
+    const PAPERSIZE_GERMAN_LEGAL_FANFOLD            = 41;
+    const PAPERSIZE_ISO_B4                          = 42;
+    const PAPERSIZE_JAPANESE_DOUBLE_POSTCARD        = 43;
+    const PAPERSIZE_STANDARD_PAPER_1                = 44;
+    const PAPERSIZE_STANDARD_PAPER_2                = 45;
+    const PAPERSIZE_STANDARD_PAPER_3                = 46;
+    const PAPERSIZE_INVITE_ENVELOPE                 = 47;
+    const PAPERSIZE_LETTER_EXTRA_PAPER              = 48;
+    const PAPERSIZE_LEGAL_EXTRA_PAPER               = 49;
+    const PAPERSIZE_TABLOID_EXTRA_PAPER             = 50;
+    const PAPERSIZE_A4_EXTRA_PAPER                  = 51;
+    const PAPERSIZE_LETTER_TRANSVERSE_PAPER         = 52;
+    const PAPERSIZE_A4_TRANSVERSE_PAPER             = 53;
+    const PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER   = 54;
+    const PAPERSIZE_SUPERA_SUPERA_A4_PAPER          = 55;
+    const PAPERSIZE_SUPERB_SUPERB_A3_PAPER          = 56;
+    const PAPERSIZE_LETTER_PLUS_PAPER               = 57;
+    const PAPERSIZE_A4_PLUS_PAPER                   = 58;
+    const PAPERSIZE_A5_TRANSVERSE_PAPER             = 59;
+    const PAPERSIZE_JIS_B5_TRANSVERSE_PAPER         = 60;
+    const PAPERSIZE_A3_EXTRA_PAPER                  = 61;
+    const PAPERSIZE_A5_EXTRA_PAPER                  = 62;
+    const PAPERSIZE_ISO_B5_EXTRA_PAPER              = 63;
+    const PAPERSIZE_A2_PAPER                        = 64;
+    const PAPERSIZE_A3_TRANSVERSE_PAPER             = 65;
+    const PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER       = 66;
+
+    /* Page orientation */
+    const ORIENTATION_DEFAULT                       = 'default';
+    const ORIENTATION_LANDSCAPE                     = 'landscape';
+    const ORIENTATION_PORTRAIT                      = 'portrait';
+
+    /* Print Range Set Method */
+    const SETPRINTRANGE_OVERWRITE                   = 'O';
+    const SETPRINTRANGE_INSERT                      = 'I';
+
+
+    /**
+     * Paper size
+     *
+     * @var int
+     */
+    private $paperSize = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER;
+
+    /**
+     * Orientation
+     *
+     * @var string
+     */
+    private $orientation = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT;
+
+    /**
+     * Scale (Print Scale)
+     *
+     * Print scaling. Valid values range from 10 to 400
+     * This setting is overridden when fitToWidth and/or fitToHeight are in use
+     *
+     * @var int?
+     */
+    private $scale = 100;
+
+    /**
+      * Fit To Page
+      * Whether scale or fitToWith / fitToHeight applies
+      *
+      * @var boolean
+      */
+    private $fitToPage = false;
+
+    /**
+      * Fit To Height
+      * Number of vertical pages to fit on
+      *
+      * @var int?
+      */
+    private $fitToHeight    = 1;
+
+    /**
+      * Fit To Width
+      * Number of horizontal pages to fit on
+      *
+      * @var int?
+      */
+    private $fitToWidth    = 1;
+
+    /**
+     * Columns to repeat at left
+     *
+     * @var array Containing start column and end column, empty array if option unset
+     */
+    private $columnsToRepeatAtLeft = array('', '');
+
+    /**
+     * Rows to repeat at top
+     *
+     * @var array Containing start row number and end row number, empty array if option unset
+     */
+    private $rowsToRepeatAtTop = array(0, 0);
+
+    /**
+     * Center page horizontally
+     *
+     * @var boolean
+     */
+    private $horizontalCentered = false;
+
+    /**
+     * Center page vertically
+     *
+     * @var boolean
+     */
+    private $verticalCentered = false;
+
+    /**
+     * Print area
+     *
+     * @var string
+     */
+    private $printArea = null;
+
+    /**
+     * First page number
+     *
+     * @var int
+     */
+    private $firstPageNumber = null;
+
+    /**
+     * Create a new PHPExcel_Worksheet_PageSetup
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get Paper Size
+     *
+     * @return int
+     */
+    public function getPaperSize()
+    {
+        return $this->paperSize;
+    }
+
+    /**
+     * Set Paper Size
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER)
+    {
+        $this->paperSize = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Orientation
+     *
+     * @return string
+     */
+    public function getOrientation()
+    {
+        return $this->orientation;
+    }
+
+    /**
+     * Set Orientation
+     *
+     * @param string $pValue
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
+    {
+        $this->orientation = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Scale
+     *
+     * @return int?
+     */
+    public function getScale()
+    {
+        return $this->scale;
+    }
+
+    /**
+     * Set Scale
+     *
+     * Print scaling. Valid values range from 10 to 400
+     * This setting is overridden when fitToWidth and/or fitToHeight are in use
+     *
+     * @param     int?    $pValue
+     * @param boolean    $pUpdate    Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
+     * @return PHPExcel_Worksheet_PageSetup
+     * @throws     PHPExcel_Exception
+     */
+    public function setScale($pValue = 100, $pUpdate = true)
+    {
+        // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
+        // but it is apparently still able to handle any scale >= 0, where 0 results in 100
+        if (($pValue >= 0) || is_null($pValue)) {
+            $this->scale = $pValue;
+            if ($pUpdate) {
+                $this->fitToPage = false;
+            }
+        } else {
+            throw new PHPExcel_Exception("Scale must not be negative");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Fit To Page
+     *
+     * @return boolean
+     */
+    public function getFitToPage()
+    {
+        return $this->fitToPage;
+    }
+
+    /**
+     * Set Fit To Page
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setFitToPage($pValue = true)
+    {
+        $this->fitToPage = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Fit To Height
+     *
+     * @return int?
+     */
+    public function getFitToHeight()
+    {
+        return $this->fitToHeight;
+    }
+
+    /**
+     * Set Fit To Height
+     *
+     * @param int? $pValue
+     * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setFitToHeight($pValue = 1, $pUpdate = true)
+    {
+        $this->fitToHeight = $pValue;
+        if ($pUpdate) {
+            $this->fitToPage = true;
+        }
+        return $this;
+    }
+
+    /**
+     * Get Fit To Width
+     *
+     * @return int?
+     */
+    public function getFitToWidth()
+    {
+        return $this->fitToWidth;
+    }
+
+    /**
+     * Set Fit To Width
+     *
+     * @param int? $pValue
+     * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setFitToWidth($pValue = 1, $pUpdate = true)
+    {
+        $this->fitToWidth = $pValue;
+        if ($pUpdate) {
+            $this->fitToPage = true;
+        }
+        return $this;
+    }
+
+    /**
+     * Is Columns to repeat at left set?
+     *
+     * @return boolean
+     */
+    public function isColumnsToRepeatAtLeftSet()
+    {
+        if (is_array($this->columnsToRepeatAtLeft)) {
+            if ($this->columnsToRepeatAtLeft[0] != '' && $this->columnsToRepeatAtLeft[1] != '') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Columns to repeat at left
+     *
+     * @return array Containing start column and end column, empty array if option unset
+     */
+    public function getColumnsToRepeatAtLeft()
+    {
+        return $this->columnsToRepeatAtLeft;
+    }
+
+    /**
+     * Set Columns to repeat at left
+     *
+     * @param array $pValue Containing start column and end column, empty array if option unset
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setColumnsToRepeatAtLeft($pValue = null)
+    {
+        if (is_array($pValue)) {
+            $this->columnsToRepeatAtLeft = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Set Columns to repeat at left by start and end
+     *
+     * @param string $pStart
+     * @param string $pEnd
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setColumnsToRepeatAtLeftByStartAndEnd($pStart = 'A', $pEnd = 'A')
+    {
+        $this->columnsToRepeatAtLeft = array($pStart, $pEnd);
+        return $this;
+    }
+
+    /**
+     * Is Rows to repeat at top set?
+     *
+     * @return boolean
+     */
+    public function isRowsToRepeatAtTopSet()
+    {
+        if (is_array($this->rowsToRepeatAtTop)) {
+            if ($this->rowsToRepeatAtTop[0] != 0 && $this->rowsToRepeatAtTop[1] != 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Rows to repeat at top
+     *
+     * @return array Containing start column and end column, empty array if option unset
+     */
+    public function getRowsToRepeatAtTop()
+    {
+        return $this->rowsToRepeatAtTop;
+    }
+
+    /**
+     * Set Rows to repeat at top
+     *
+     * @param array    $pValue    Containing start column and end column, empty array if option unset
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setRowsToRepeatAtTop($pValue = null)
+    {
+        if (is_array($pValue)) {
+            $this->rowsToRepeatAtTop = $pValue;
+        }
+        return $this;
+    }
+
+    /**
+     * Set Rows to repeat at top by start and end
+     *
+     * @param int $pStart
+     * @param int $pEnd
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setRowsToRepeatAtTopByStartAndEnd($pStart = 1, $pEnd = 1)
+    {
+        $this->rowsToRepeatAtTop = array($pStart, $pEnd);
+        return $this;
+    }
+
+    /**
+     * Get center page horizontally
+     *
+     * @return bool
+     */
+    public function getHorizontalCentered()
+    {
+        return $this->horizontalCentered;
+    }
+
+    /**
+     * Set center page horizontally
+     *
+     * @param bool $value
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setHorizontalCentered($value = false)
+    {
+        $this->horizontalCentered = $value;
+        return $this;
+    }
+
+    /**
+     * Get center page vertically
+     *
+     * @return bool
+     */
+    public function getVerticalCentered()
+    {
+        return $this->verticalCentered;
+    }
+
+    /**
+     * Set center page vertically
+     *
+     * @param bool $value
+     * @return PHPExcel_Worksheet_PageSetup
+     */
+    public function setVerticalCentered($value = false)
+    {
+        $this->verticalCentered = $value;
+        return $this;
+    }
+
+    /**
+     *    Get print area
+     *
+     * @param    int        $index    Identifier for a specific print area range if several ranges have been set
+     *                            Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
+     *                            Otherwise, the specific range identified by the value of $index will be returned
+     *                            Print areas are numbered from 1
+     * @throws    PHPExcel_Exception
+     * @return    string
+     */
+    public function getPrintArea($index = 0)
+    {
+        if ($index == 0) {
+            return $this->printArea;
+        }
+        $printAreas = explode(',', $this->printArea);
+        if (isset($printAreas[$index-1])) {
+            return $printAreas[$index-1];
+        }
+        throw new PHPExcel_Exception("Requested Print Area does not exist");
+    }
+
+    /**
+     * Is print area set?
+     *
+     * @param    int        $index    Identifier for a specific print area range if several ranges have been set
+     *                            Default behaviour, or an index value of 0, will identify whether any print range is set
+     *                            Otherwise, existence of the range identified by the value of $index will be returned
+     *                            Print areas are numbered from 1
+     * @return    boolean
+     */
+    public function isPrintAreaSet($index = 0)
+    {
+        if ($index == 0) {
+            return !is_null($this->printArea);
+        }
+        $printAreas = explode(',', $this->printArea);
+        return isset($printAreas[$index-1]);
+    }
+
+    /**
+     * Clear a print area
+     *
+     * @param    int        $index    Identifier for a specific print area range if several ranges have been set
+     *                            Default behaviour, or an index value of 0, will clear all print ranges that are set
+     *                            Otherwise, the range identified by the value of $index will be removed from the series
+     *                            Print areas are numbered from 1
+     * @return    PHPExcel_Worksheet_PageSetup
+     */
+    public function clearPrintArea($index = 0)
+    {
+        if ($index == 0) {
+            $this->printArea = null;
+        } else {
+            $printAreas = explode(',', $this->printArea);
+            if (isset($printAreas[$index-1])) {
+                unset($printAreas[$index-1]);
+                $this->printArea = implode(',', $printAreas);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'
+     *
+     * @param    string    $value
+     * @param    int        $index    Identifier for a specific print area range allowing several ranges to be set
+     *                            When the method is "O"verwrite, then a positive integer index will overwrite that indexed
+     *                                entry in the print areas list; a negative index value will identify which entry to
+     *                                overwrite working bacward through the print area to the list, with the last entry as -1.
+     *                                Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
+     *                            When the method is "I"nsert, then a positive index will insert after that indexed entry in
+     *                                the print areas list, while a negative index will insert before the indexed entry.
+     *                                Specifying an index value of 0, will always append the new print range at the end of the
+     *                                list.
+     *                            Print areas are numbered from 1
+     * @param    string    $method    Determines the method used when setting multiple print areas
+     *                            Default behaviour, or the "O" method, overwrites existing print area
+     *                            The "I" method, inserts the new print area before any specified index, or at the end of the list
+     * @return    PHPExcel_Worksheet_PageSetup
+     * @throws    PHPExcel_Exception
+     */
+    public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
+    {
+        if (strpos($value, '!') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate must not specify a worksheet.');
+        } elseif (strpos($value, ':') === false) {
+            throw new PHPExcel_Exception('Cell coordinate must be a range of cells.');
+        } elseif (strpos($value, '$') !== false) {
+            throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
+        }
+        $value = strtoupper($value);
+
+        if ($method == self::SETPRINTRANGE_OVERWRITE) {
+            if ($index == 0) {
+                $this->printArea = $value;
+            } else {
+                $printAreas = explode(',', $this->printArea);
+                if ($index < 0) {
+                    $index = count($printAreas) - abs($index) + 1;
+                }
+                if (($index <= 0) || ($index > count($printAreas))) {
+                    throw new PHPExcel_Exception('Invalid index for setting print range.');
+                }
+                $printAreas[$index-1] = $value;
+                $this->printArea = implode(',', $printAreas);
+            }
+        } elseif ($method == self::SETPRINTRANGE_INSERT) {
+            if ($index == 0) {
+                $this->printArea .= ($this->printArea == '') ? $value : ','.$value;
+            } else {
+                $printAreas = explode(',', $this->printArea);
+                if ($index < 0) {
+                    $index = abs($index) - 1;
+                }
+                if ($index > count($printAreas)) {
+                    throw new PHPExcel_Exception('Invalid index for setting print range.');
+                }
+                $printAreas = array_merge(array_slice($printAreas, 0, $index), array($value), array_slice($printAreas, $index));
+                $this->printArea = implode(',', $printAreas);
+            }
+        } else {
+            throw new PHPExcel_Exception('Invalid method for setting print range.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas
+     *
+     * @param    string    $value
+     * @param    int        $index    Identifier for a specific print area range allowing several ranges to be set
+     *                            A positive index will insert after that indexed entry in the print areas list, while a
+     *                                negative index will insert before the indexed entry.
+     *                                Specifying an index value of 0, will always append the new print range at the end of the
+     *                                list.
+     *                            Print areas are numbered from 1
+     * @return    PHPExcel_Worksheet_PageSetup
+     * @throws    PHPExcel_Exception
+     */
+    public function addPrintArea($value, $index = -1)
+    {
+        return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
+    }
+
+    /**
+     * Set print area
+     *
+     * @param    int        $column1    Column 1
+     * @param    int        $row1        Row 1
+     * @param    int        $column2    Column 2
+     * @param    int        $row2        Row 2
+     * @param    int        $index        Identifier for a specific print area range allowing several ranges to be set
+     *                                When the method is "O"verwrite, then a positive integer index will overwrite that indexed
+     *                                    entry in the print areas list; a negative index value will identify which entry to
+     *                                    overwrite working bacward through the print area to the list, with the last entry as -1.
+     *                                    Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
+     *                                When the method is "I"nsert, then a positive index will insert after that indexed entry in
+     *                                    the print areas list, while a negative index will insert before the indexed entry.
+     *                                    Specifying an index value of 0, will always append the new print range at the end of the
+     *                                    list.
+     *                                Print areas are numbered from 1
+     * @param    string    $method        Determines the method used when setting multiple print areas
+     *                                Default behaviour, or the "O" method, overwrites existing print area
+     *                                The "I" method, inserts the new print area before any specified index, or at the end of the list
+     * @return    PHPExcel_Worksheet_PageSetup
+     * @throws    PHPExcel_Exception
+     */
+    public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
+    {
+        return $this->setPrintArea(
+            PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2,
+            $index,
+            $method
+        );
+    }
+
+    /**
+     * Add a new print area to the list of print areas
+     *
+     * @param    int        $column1    Start Column for the print area
+     * @param    int        $row1        Start Row for the print area
+     * @param    int        $column2    End Column for the print area
+     * @param    int        $row2        End Row for the print area
+     * @param    int        $index        Identifier for a specific print area range allowing several ranges to be set
+     *                                A positive index will insert after that indexed entry in the print areas list, while a
+     *                                    negative index will insert before the indexed entry.
+     *                                    Specifying an index value of 0, will always append the new print range at the end of the
+     *                                    list.
+     *                                Print areas are numbered from 1
+     * @return    PHPExcel_Worksheet_PageSetup
+     * @throws    PHPExcel_Exception
+     */
+    public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
+    {
+        return $this->setPrintArea(
+            PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2,
+            $index,
+            self::SETPRINTRANGE_INSERT
+        );
+    }
+
+    /**
+     * Get first page number
+     *
+     * @return int
+     */
+    public function getFirstPageNumber()
+    {
+        return $this->firstPageNumber;
+    }
+
+    /**
+     * Set first page number
+     *
+     * @param int $value
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function setFirstPageNumber($value = null)
+    {
+        $this->firstPageNumber = $value;
+        return $this;
+    }
+
+    /**
+     * Reset first page number
+     *
+     * @return PHPExcel_Worksheet_HeaderFooter
+     */
+    public function resetFirstPageNumber()
+    {
+        return $this->setFirstPageNumber(null);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/Protection.php b/lib/PHPExcel/Worksheet/Protection.php
new file mode 100644
index 000000000..00633eeb7
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/Protection.php
@@ -0,0 +1,581 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Worksheet_Protection
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Worksheet_Protection
+{
+    /**
+     * Sheet
+     *
+     * @var boolean
+     */
+    private $sheet                    = false;
+
+    /**
+     * Objects
+     *
+     * @var boolean
+     */
+    private $objects                = false;
+
+    /**
+     * Scenarios
+     *
+     * @var boolean
+     */
+    private $scenarios                = false;
+
+    /**
+     * Format cells
+     *
+     * @var boolean
+     */
+    private $formatCells            = false;
+
+    /**
+     * Format columns
+     *
+     * @var boolean
+     */
+    private $formatColumns            = false;
+
+    /**
+     * Format rows
+     *
+     * @var boolean
+     */
+    private $formatRows            = false;
+
+    /**
+     * Insert columns
+     *
+     * @var boolean
+     */
+    private $insertColumns            = false;
+
+    /**
+     * Insert rows
+     *
+     * @var boolean
+     */
+    private $insertRows            = false;
+
+    /**
+     * Insert hyperlinks
+     *
+     * @var boolean
+     */
+    private $insertHyperlinks        = false;
+
+    /**
+     * Delete columns
+     *
+     * @var boolean
+     */
+    private $deleteColumns            = false;
+
+    /**
+     * Delete rows
+     *
+     * @var boolean
+     */
+    private $deleteRows            = false;
+
+    /**
+     * Select locked cells
+     *
+     * @var boolean
+     */
+    private $selectLockedCells        = false;
+
+    /**
+     * Sort
+     *
+     * @var boolean
+     */
+    private $sort                    = false;
+
+    /**
+     * AutoFilter
+     *
+     * @var boolean
+     */
+    private $autoFilter            = false;
+
+    /**
+     * Pivot tables
+     *
+     * @var boolean
+     */
+    private $pivotTables            = false;
+
+    /**
+     * Select unlocked cells
+     *
+     * @var boolean
+     */
+    private $selectUnlockedCells    = false;
+
+    /**
+     * Password
+     *
+     * @var string
+     */
+    private $password                = '';
+
+    /**
+     * Create a new PHPExcel_Worksheet_Protection
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Is some sort of protection enabled?
+     *
+     * @return boolean
+     */
+    public function isProtectionEnabled()
+    {
+        return $this->sheet ||
+            $this->objects ||
+            $this->scenarios ||
+            $this->formatCells ||
+            $this->formatColumns ||
+            $this->formatRows ||
+            $this->insertColumns ||
+            $this->insertRows ||
+            $this->insertHyperlinks ||
+            $this->deleteColumns ||
+            $this->deleteRows ||
+            $this->selectLockedCells ||
+            $this->sort ||
+            $this->autoFilter ||
+            $this->pivotTables ||
+            $this->selectUnlockedCells;
+    }
+
+    /**
+     * Get Sheet
+     *
+     * @return boolean
+     */
+    public function getSheet()
+    {
+        return $this->sheet;
+    }
+
+    /**
+     * Set Sheet
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setSheet($pValue = false)
+    {
+        $this->sheet = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Objects
+     *
+     * @return boolean
+     */
+    public function getObjects()
+    {
+        return $this->objects;
+    }
+
+    /**
+     * Set Objects
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setObjects($pValue = false)
+    {
+        $this->objects = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Scenarios
+     *
+     * @return boolean
+     */
+    public function getScenarios()
+    {
+        return $this->scenarios;
+    }
+
+    /**
+     * Set Scenarios
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setScenarios($pValue = false)
+    {
+        $this->scenarios = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get FormatCells
+     *
+     * @return boolean
+     */
+    public function getFormatCells()
+    {
+        return $this->formatCells;
+    }
+
+    /**
+     * Set FormatCells
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setFormatCells($pValue = false)
+    {
+        $this->formatCells = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get FormatColumns
+     *
+     * @return boolean
+     */
+    public function getFormatColumns()
+    {
+        return $this->formatColumns;
+    }
+
+    /**
+     * Set FormatColumns
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setFormatColumns($pValue = false)
+    {
+        $this->formatColumns = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get FormatRows
+     *
+     * @return boolean
+     */
+    public function getFormatRows()
+    {
+        return $this->formatRows;
+    }
+
+    /**
+     * Set FormatRows
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setFormatRows($pValue = false)
+    {
+        $this->formatRows = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get InsertColumns
+     *
+     * @return boolean
+     */
+    public function getInsertColumns()
+    {
+        return $this->insertColumns;
+    }
+
+    /**
+     * Set InsertColumns
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setInsertColumns($pValue = false)
+    {
+        $this->insertColumns = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get InsertRows
+     *
+     * @return boolean
+     */
+    public function getInsertRows()
+    {
+        return $this->insertRows;
+    }
+
+    /**
+     * Set InsertRows
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setInsertRows($pValue = false)
+    {
+        $this->insertRows = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get InsertHyperlinks
+     *
+     * @return boolean
+     */
+    public function getInsertHyperlinks()
+    {
+        return $this->insertHyperlinks;
+    }
+
+    /**
+     * Set InsertHyperlinks
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setInsertHyperlinks($pValue = false)
+    {
+        $this->insertHyperlinks = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get DeleteColumns
+     *
+     * @return boolean
+     */
+    public function getDeleteColumns()
+    {
+        return $this->deleteColumns;
+    }
+
+    /**
+     * Set DeleteColumns
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setDeleteColumns($pValue = false)
+    {
+        $this->deleteColumns = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get DeleteRows
+     *
+     * @return boolean
+     */
+    public function getDeleteRows()
+    {
+        return $this->deleteRows;
+    }
+
+    /**
+     * Set DeleteRows
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setDeleteRows($pValue = false)
+    {
+        $this->deleteRows = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get SelectLockedCells
+     *
+     * @return boolean
+     */
+    public function getSelectLockedCells()
+    {
+        return $this->selectLockedCells;
+    }
+
+    /**
+     * Set SelectLockedCells
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setSelectLockedCells($pValue = false)
+    {
+        $this->selectLockedCells = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Sort
+     *
+     * @return boolean
+     */
+    public function getSort()
+    {
+        return $this->sort;
+    }
+
+    /**
+     * Set Sort
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setSort($pValue = false)
+    {
+        $this->sort = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter
+     *
+     * @return boolean
+     */
+    public function getAutoFilter()
+    {
+        return $this->autoFilter;
+    }
+
+    /**
+     * Set AutoFilter
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setAutoFilter($pValue = false)
+    {
+        $this->autoFilter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get PivotTables
+     *
+     * @return boolean
+     */
+    public function getPivotTables()
+    {
+        return $this->pivotTables;
+    }
+
+    /**
+     * Set PivotTables
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setPivotTables($pValue = false)
+    {
+        $this->pivotTables = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get SelectUnlockedCells
+     *
+     * @return boolean
+     */
+    public function getSelectUnlockedCells()
+    {
+        return $this->selectUnlockedCells;
+    }
+
+    /**
+     * Set SelectUnlockedCells
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setSelectUnlockedCells($pValue = false)
+    {
+        $this->selectUnlockedCells = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Password (hashed)
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set Password
+     *
+     * @param string     $pValue
+     * @param boolean     $pAlreadyHashed If the password has already been hashed, set this to true
+     * @return PHPExcel_Worksheet_Protection
+     */
+    public function setPassword($pValue = '', $pAlreadyHashed = false)
+    {
+        if (!$pAlreadyHashed) {
+            $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
+        }
+        $this->password = $pValue;
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/Row.php b/lib/PHPExcel/Worksheet/Row.php
new file mode 100644
index 000000000..4f6034f53
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/Row.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_Row
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_Row
+{
+    /**
+     * PHPExcel_Worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $parent;
+
+    /**
+     * Row index
+     *
+     * @var int
+     */
+    private $rowIndex = 0;
+
+    /**
+     * Create a new row
+     *
+     * @param PHPExcel_Worksheet         $parent
+     * @param int                        $rowIndex
+     */
+    public function __construct(PHPExcel_Worksheet $parent = null, $rowIndex = 1)
+    {
+        // Set parent and row index
+        $this->parent   = $parent;
+        $this->rowIndex = $rowIndex;
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->parent);
+    }
+
+    /**
+     * Get row index
+     *
+     * @return int
+     */
+    public function getRowIndex()
+    {
+        return $this->rowIndex;
+    }
+
+    /**
+     * Get cell iterator
+     *
+     * @param    string                $startColumn    The column address at which to start iterating
+     * @param    string                $endColumn        Optionally, the column address at which to stop iterating
+     * @return PHPExcel_Worksheet_CellIterator
+     */
+    public function getCellIterator($startColumn = 'A', $endColumn = null)
+    {
+        return new PHPExcel_Worksheet_RowCellIterator($this->parent, $this->rowIndex, $startColumn, $endColumn);
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/RowCellIterator.php b/lib/PHPExcel/Worksheet/RowCellIterator.php
new file mode 100644
index 000000000..90eb9c9f2
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/RowCellIterator.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_RowCellIterator
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_RowCellIterator extends PHPExcel_Worksheet_CellIterator implements Iterator
+{
+    /**
+     * Row index
+     *
+     * @var int
+     */
+    protected $rowIndex;
+
+    /**
+     * Start position
+     *
+     * @var int
+     */
+    protected $startColumn = 0;
+
+    /**
+     * End position
+     *
+     * @var int
+     */
+    protected $endColumn = 0;
+
+    /**
+     * Create a new column iterator
+     *
+     * @param    PHPExcel_Worksheet    $subject        The worksheet to iterate over
+     * @param   integer             $rowIndex       The row that we want to iterate
+     * @param    string                $startColumn    The column address at which to start iterating
+     * @param    string                $endColumn        Optionally, the column address at which to stop iterating
+     */
+    public function __construct(PHPExcel_Worksheet $subject = null, $rowIndex = 1, $startColumn = 'A', $endColumn = null)
+    {
+        // Set subject and row index
+        $this->subject = $subject;
+        $this->rowIndex = $rowIndex;
+        $this->resetEnd($endColumn);
+        $this->resetStart($startColumn);
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * (Re)Set the start column and the current column pointer
+     *
+     * @param integer    $startColumn    The column address at which to start iterating
+     * @return PHPExcel_Worksheet_RowCellIterator
+     * @throws PHPExcel_Exception
+     */
+    public function resetStart($startColumn = 'A')
+    {
+        $startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1;
+        $this->startColumn = $startColumnIndex;
+        $this->adjustForExistingOnlyRange();
+        $this->seek(PHPExcel_Cell::stringFromColumnIndex($this->startColumn));
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end column
+     *
+     * @param string    $endColumn    The column address at which to stop iterating
+     * @return PHPExcel_Worksheet_RowCellIterator
+     * @throws PHPExcel_Exception
+     */
+    public function resetEnd($endColumn = null)
+    {
+        $endColumn = ($endColumn) ? $endColumn : $this->subject->getHighestColumn();
+        $this->endColumn = PHPExcel_Cell::columnIndexFromString($endColumn) - 1;
+        $this->adjustForExistingOnlyRange();
+
+        return $this;
+    }
+
+    /**
+     * Set the column pointer to the selected column
+     *
+     * @param string    $column    The column address to set the current pointer at
+     * @return PHPExcel_Worksheet_RowCellIterator
+     * @throws PHPExcel_Exception
+     */
+    public function seek($column = 'A')
+    {
+        $column = PHPExcel_Cell::columnIndexFromString($column) - 1;
+        if (($column < $this->startColumn) || ($column > $this->endColumn)) {
+            throw new PHPExcel_Exception("Column $column is out of range ({$this->startColumn} - {$this->endColumn})");
+        } elseif ($this->onlyExistingCells && !($this->subject->cellExistsByColumnAndRow($column, $this->rowIndex))) {
+            throw new PHPExcel_Exception('In "IterateOnlyExistingCells" mode and Cell does not exist');
+        }
+        $this->position = $column;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting column
+     */
+    public function rewind()
+    {
+        $this->position = $this->startColumn;
+    }
+
+    /**
+     * Return the current cell in this worksheet row
+     *
+     * @return PHPExcel_Cell
+     */
+    public function current()
+    {
+        return $this->subject->getCellByColumnAndRow($this->position, $this->rowIndex);
+    }
+
+    /**
+     * Return the current iterator key
+     *
+     * @return string
+     */
+    public function key()
+    {
+        return PHPExcel_Cell::stringFromColumnIndex($this->position);
+    }
+
+    /**
+     * Set the iterator to its next value
+     */
+    public function next()
+    {
+        do {
+            ++$this->position;
+        } while (($this->onlyExistingCells) &&
+            (!$this->subject->cellExistsByColumnAndRow($this->position, $this->rowIndex)) &&
+            ($this->position <= $this->endColumn));
+    }
+
+    /**
+     * Set the iterator to its previous value
+     *
+     * @throws PHPExcel_Exception
+     */
+    public function prev()
+    {
+        if ($this->position <= $this->startColumn) {
+            throw new PHPExcel_Exception(
+                "Column is already at the beginning of range (" .
+                PHPExcel_Cell::stringFromColumnIndex($this->endColumn) . " - " .
+                PHPExcel_Cell::stringFromColumnIndex($this->endColumn) . ")"
+            );
+        }
+
+        do {
+            --$this->position;
+        } while (($this->onlyExistingCells) &&
+            (!$this->subject->cellExistsByColumnAndRow($this->position, $this->rowIndex)) &&
+            ($this->position >= $this->startColumn));
+    }
+
+    /**
+     * Indicate if more columns exist in the worksheet range of columns that we're iterating
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->position <= $this->endColumn;
+    }
+
+    /**
+     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
+     *
+     * @throws PHPExcel_Exception
+     */
+    protected function adjustForExistingOnlyRange()
+    {
+        if ($this->onlyExistingCells) {
+            while ((!$this->subject->cellExistsByColumnAndRow($this->startColumn, $this->rowIndex)) &&
+                ($this->startColumn <= $this->endColumn)) {
+                ++$this->startColumn;
+            }
+            if ($this->startColumn > $this->endColumn) {
+                throw new PHPExcel_Exception('No cells exist within the specified range');
+            }
+            while ((!$this->subject->cellExistsByColumnAndRow($this->endColumn, $this->rowIndex)) &&
+                ($this->endColumn >= $this->startColumn)) {
+                --$this->endColumn;
+            }
+            if ($this->endColumn < $this->startColumn) {
+                throw new PHPExcel_Exception('No cells exist within the specified range');
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/RowDimension.php b/lib/PHPExcel/Worksheet/RowDimension.php
new file mode 100644
index 000000000..c1474862c
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/RowDimension.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_RowDimension
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_RowDimension extends PHPExcel_Worksheet_Dimension
+{
+    /**
+     * Row index
+     *
+     * @var int
+     */
+    private $rowIndex;
+
+    /**
+     * Row height (in pt)
+     *
+     * When this is set to a negative value, the row height should be ignored by IWriter
+     *
+     * @var double
+     */
+    private $height = -1;
+
+     /**
+     * ZeroHeight for Row?
+     *
+     * @var bool
+     */
+    private $zeroHeight = false;
+
+    /**
+     * Create a new PHPExcel_Worksheet_RowDimension
+     *
+     * @param int $pIndex Numeric row index
+     */
+    public function __construct($pIndex = 0)
+    {
+        // Initialise values
+        $this->rowIndex = $pIndex;
+
+        // set dimension as unformatted by default
+        parent::__construct(null);
+    }
+
+    /**
+     * Get Row Index
+     *
+     * @return int
+     */
+    public function getRowIndex()
+    {
+        return $this->rowIndex;
+    }
+
+    /**
+     * Set Row Index
+     *
+     * @param int $pValue
+     * @return PHPExcel_Worksheet_RowDimension
+     */
+    public function setRowIndex($pValue)
+    {
+        $this->rowIndex = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Row Height
+     *
+     * @return double
+     */
+    public function getRowHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set Row Height
+     *
+     * @param double $pValue
+     * @return PHPExcel_Worksheet_RowDimension
+     */
+    public function setRowHeight($pValue = -1)
+    {
+        $this->height = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get ZeroHeight
+     *
+     * @return bool
+     */
+    public function getZeroHeight()
+    {
+        return $this->zeroHeight;
+    }
+
+    /**
+     * Set ZeroHeight
+     *
+     * @param bool $pValue
+     * @return PHPExcel_Worksheet_RowDimension
+     */
+    public function setZeroHeight($pValue = false)
+    {
+        $this->zeroHeight = $pValue;
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/RowIterator.php b/lib/PHPExcel/Worksheet/RowIterator.php
new file mode 100644
index 000000000..9ddb3e030
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/RowIterator.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_RowIterator
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_RowIterator implements Iterator
+{
+    /**
+     * PHPExcel_Worksheet to iterate
+     *
+     * @var PHPExcel_Worksheet
+     */
+    private $subject;
+
+    /**
+     * Current iterator position
+     *
+     * @var int
+     */
+    private $position = 1;
+
+    /**
+     * Start position
+     *
+     * @var int
+     */
+    private $startRow = 1;
+
+
+    /**
+     * End position
+     *
+     * @var int
+     */
+    private $endRow = 1;
+
+
+    /**
+     * Create a new row iterator
+     *
+     * @param    PHPExcel_Worksheet    $subject    The worksheet to iterate over
+     * @param    integer                $startRow    The row number at which to start iterating
+     * @param    integer                $endRow        Optionally, the row number at which to stop iterating
+     */
+    public function __construct(PHPExcel_Worksheet $subject, $startRow = 1, $endRow = null)
+    {
+        // Set subject
+        $this->subject = $subject;
+        $this->resetEnd($endRow);
+        $this->resetStart($startRow);
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * (Re)Set the start row and the current row pointer
+     *
+     * @param integer    $startRow    The row number at which to start iterating
+     * @return PHPExcel_Worksheet_RowIterator
+     * @throws PHPExcel_Exception
+     */
+    public function resetStart($startRow = 1)
+    {
+        if ($startRow > $this->subject->getHighestRow()) {
+            throw new PHPExcel_Exception("Start row ({$startRow}) is beyond highest row ({$this->subject->getHighestRow()})");
+        }
+
+        $this->startRow = $startRow;
+        if ($this->endRow < $this->startRow) {
+            $this->endRow = $this->startRow;
+        }
+        $this->seek($startRow);
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end row
+     *
+     * @param integer    $endRow    The row number at which to stop iterating
+     * @return PHPExcel_Worksheet_RowIterator
+     */
+    public function resetEnd($endRow = null)
+    {
+        $this->endRow = ($endRow) ? $endRow : $this->subject->getHighestRow();
+
+        return $this;
+    }
+
+    /**
+     * Set the row pointer to the selected row
+     *
+     * @param integer    $row    The row number to set the current pointer at
+     * @return PHPExcel_Worksheet_RowIterator
+     * @throws PHPExcel_Exception
+     */
+    public function seek($row = 1)
+    {
+        if (($row < $this->startRow) || ($row > $this->endRow)) {
+            throw new PHPExcel_Exception("Row $row is out of range ({$this->startRow} - {$this->endRow})");
+        }
+        $this->position = $row;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting row
+     */
+    public function rewind()
+    {
+        $this->position = $this->startRow;
+    }
+
+    /**
+     * Return the current row in this worksheet
+     *
+     * @return PHPExcel_Worksheet_Row
+     */
+    public function current()
+    {
+        return new PHPExcel_Worksheet_Row($this->subject, $this->position);
+    }
+
+    /**
+     * Return the current iterator key
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Set the iterator to its next value
+     */
+    public function next()
+    {
+        ++$this->position;
+    }
+
+    /**
+     * Set the iterator to its previous value
+     */
+    public function prev()
+    {
+        if ($this->position <= $this->startRow) {
+            throw new PHPExcel_Exception("Row is already at the beginning of range ({$this->startRow} - {$this->endRow})");
+        }
+
+        --$this->position;
+    }
+
+    /**
+     * Indicate if more rows exist in the worksheet range of rows that we're iterating
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->position <= $this->endRow;
+    }
+}
diff --git a/lib/PHPExcel/Worksheet/SheetView.php b/lib/PHPExcel/Worksheet/SheetView.php
new file mode 100644
index 000000000..5aaef3ba3
--- /dev/null
+++ b/lib/PHPExcel/Worksheet/SheetView.php
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * PHPExcel_Worksheet_SheetView
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Worksheet_SheetView
+{
+
+    /* Sheet View types */
+    const SHEETVIEW_NORMAL             = 'normal';
+    const SHEETVIEW_PAGE_LAYOUT        = 'pageLayout';
+    const SHEETVIEW_PAGE_BREAK_PREVIEW = 'pageBreakPreview';
+
+    private static $sheetViewTypes = array(
+        self::SHEETVIEW_NORMAL,
+        self::SHEETVIEW_PAGE_LAYOUT,
+        self::SHEETVIEW_PAGE_BREAK_PREVIEW,
+    );
+
+    /**
+     * ZoomScale
+     *
+     * Valid values range from 10 to 400.
+     *
+     * @var int
+     */
+    private $zoomScale = 100;
+
+    /**
+     * ZoomScaleNormal
+     *
+     * Valid values range from 10 to 400.
+     *
+     * @var int
+     */
+    private $zoomScaleNormal = 100;
+
+    /**
+     * View
+     *
+     * Valid values range from 10 to 400.
+     *
+     * @var string
+     */
+    private $sheetviewType = self::SHEETVIEW_NORMAL;
+
+    /**
+     * Create a new PHPExcel_Worksheet_SheetView
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get ZoomScale
+     *
+     * @return int
+     */
+    public function getZoomScale()
+    {
+        return $this->zoomScale;
+    }
+
+    /**
+     * Set ZoomScale
+     *
+     * Valid values range from 10 to 400.
+     *
+     * @param     int     $pValue
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_SheetView
+     */
+    public function setZoomScale($pValue = 100)
+    {
+        // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
+        // but it is apparently still able to handle any scale >= 1
+        if (($pValue >= 1) || is_null($pValue)) {
+            $this->zoomScale = $pValue;
+        } else {
+            throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get ZoomScaleNormal
+     *
+     * @return int
+     */
+    public function getZoomScaleNormal()
+    {
+        return $this->zoomScaleNormal;
+    }
+
+    /**
+     * Set ZoomScale
+     *
+     * Valid values range from 10 to 400.
+     *
+     * @param     int     $pValue
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_SheetView
+     */
+    public function setZoomScaleNormal($pValue = 100)
+    {
+        if (($pValue >= 1) || is_null($pValue)) {
+            $this->zoomScaleNormal = $pValue;
+        } else {
+            throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
+        }
+        return $this;
+    }
+
+    /**
+     * Get View
+     *
+     * @return string
+     */
+    public function getView()
+    {
+        return $this->sheetviewType;
+    }
+
+    /**
+     * Set View
+     *
+     * Valid values are
+     *        'normal'            self::SHEETVIEW_NORMAL
+     *        'pageLayout'        self::SHEETVIEW_PAGE_LAYOUT
+     *        'pageBreakPreview'  self::SHEETVIEW_PAGE_BREAK_PREVIEW
+     *
+     * @param     string     $pValue
+     * @throws     PHPExcel_Exception
+     * @return PHPExcel_Worksheet_SheetView
+     */
+    public function setView($pValue = null)
+    {
+        // MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview' via the user interface
+        if ($pValue === null) {
+            $pValue = self::SHEETVIEW_NORMAL;
+        }
+        if (in_array($pValue, self::$sheetViewTypes)) {
+            $this->sheetviewType = $pValue;
+        } else {
+            throw new PHPExcel_Exception("Invalid sheetview layout type.");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/lib/PHPExcel/WorksheetIterator.php b/lib/PHPExcel/WorksheetIterator.php
new file mode 100644
index 000000000..cb1b28118
--- /dev/null
+++ b/lib/PHPExcel/WorksheetIterator.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * PHPExcel_WorksheetIterator
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_WorksheetIterator implements Iterator
+{
+    /**
+     * Spreadsheet to iterate
+     *
+     * @var PHPExcel
+     */
+    private $subject;
+
+    /**
+     * Current iterator position
+     *
+     * @var int
+     */
+    private $position = 0;
+
+    /**
+     * Create a new worksheet iterator
+     *
+     * @param PHPExcel         $subject
+     */
+    public function __construct(PHPExcel $subject = null)
+    {
+        // Set subject
+        $this->subject = $subject;
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * Rewind iterator
+     */
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    /**
+     * Current PHPExcel_Worksheet
+     *
+     * @return PHPExcel_Worksheet
+     */
+    public function current()
+    {
+        return $this->subject->getSheet($this->position);
+    }
+
+    /**
+     * Current key
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Next value
+     */
+    public function next()
+    {
+        ++$this->position;
+    }
+
+    /**
+     * More PHPExcel_Worksheet instances available?
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->position < $this->subject->getSheetCount();
+    }
+}
diff --git a/lib/PHPExcel/Writer/Abstract.php b/lib/PHPExcel/Writer/Abstract.php
new file mode 100644
index 000000000..2a797a948
--- /dev/null
+++ b/lib/PHPExcel/Writer/Abstract.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Abstract
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+{
+    /**
+     * Write charts that are defined in the workbook?
+     * Identifies whether the Writer should write definitions for any charts that exist in the PHPExcel object;
+     *
+     * @var    boolean
+     */
+    protected $includeCharts = false;
+
+    /**
+     * Pre-calculate formulas
+     * Forces PHPExcel to recalculate all formulae in a workbook when saving, so that the pre-calculated values are
+     *    immediately available to MS Excel or other office spreadsheet viewer when opening the file
+     *
+     * @var boolean
+     */
+    protected $preCalculateFormulas = true;
+
+    /**
+     * Use disk caching where possible?
+     *
+     * @var boolean
+     */
+    protected $_useDiskCaching = false;
+
+    /**
+     * Disk caching directory
+     *
+     * @var string
+     */
+    protected $_diskCachingDirectory    = './';
+
+    /**
+     * Write charts in workbook?
+     *        If this is true, then the Writer will write definitions for any charts that exist in the PHPExcel object.
+     *        If false (the default) it will ignore any charts defined in the PHPExcel object.
+     *
+     * @return    boolean
+     */
+    public function getIncludeCharts()
+    {
+        return $this->includeCharts;
+    }
+
+    /**
+     * Set write charts in workbook
+     *        Set to true, to advise the Writer to include any charts that exist in the PHPExcel object.
+     *        Set to false (the default) to ignore charts.
+     *
+     * @param    boolean    $pValue
+     * @return    PHPExcel_Writer_IWriter
+     */
+    public function setIncludeCharts($pValue = false)
+    {
+        $this->includeCharts = (boolean) $pValue;
+        return $this;
+    }
+
+    /**
+     * Get Pre-Calculate Formulas flag
+     *     If this is true (the default), then the writer will recalculate all formulae in a workbook when saving,
+     *        so that the pre-calculated values are immediately available to MS Excel or other office spreadsheet
+     *        viewer when opening the file
+     *     If false, then formulae are not calculated on save. This is faster for saving in PHPExcel, but slower
+     *        when opening the resulting file in MS Excel, because Excel has to recalculate the formulae itself
+     *
+     * @return boolean
+     */
+    public function getPreCalculateFormulas()
+    {
+        return $this->preCalculateFormulas;
+    }
+
+    /**
+     * Set Pre-Calculate Formulas
+     *        Set to true (the default) to advise the Writer to calculate all formulae on save
+     *        Set to false to prevent precalculation of formulae on save.
+     *
+     * @param boolean $pValue    Pre-Calculate Formulas?
+     * @return    PHPExcel_Writer_IWriter
+     */
+    public function setPreCalculateFormulas($pValue = true)
+    {
+        $this->preCalculateFormulas = (boolean) $pValue;
+        return $this;
+    }
+
+    /**
+     * Get use disk caching where possible?
+     *
+     * @return boolean
+     */
+    public function getUseDiskCaching()
+    {
+        return $this->_useDiskCaching;
+    }
+
+    /**
+     * Set use disk caching where possible?
+     *
+     * @param     boolean     $pValue
+     * @param    string        $pDirectory        Disk caching directory
+     * @throws    PHPExcel_Writer_Exception    when directory does not exist
+     * @return PHPExcel_Writer_Excel2007
+     */
+    public function setUseDiskCaching($pValue = false, $pDirectory = null)
+    {
+        $this->_useDiskCaching = $pValue;
+
+        if ($pDirectory !== null) {
+            if (is_dir($pDirectory)) {
+                $this->_diskCachingDirectory = $pDirectory;
+            } else {
+                throw new PHPExcel_Writer_Exception("Directory does not exist: $pDirectory");
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get disk caching directory
+     *
+     * @return string
+     */
+    public function getDiskCachingDirectory()
+    {
+        return $this->_diskCachingDirectory;
+    }
+}
diff --git a/lib/PHPExcel/Writer/CSV.php b/lib/PHPExcel/Writer/CSV.php
new file mode 100644
index 000000000..e59c30130
--- /dev/null
+++ b/lib/PHPExcel/Writer/CSV.php
@@ -0,0 +1,352 @@
+<?php
+
+/**
+ * PHPExcel_Writer_CSV
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_CSV
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+{
+    /**
+     * PHPExcel object
+     *
+     * @var PHPExcel
+     */
+    private $phpExcel;
+
+    /**
+     * Delimiter
+     *
+     * @var string
+     */
+    private $delimiter    = ',';
+
+    /**
+     * Enclosure
+     *
+     * @var string
+     */
+    private $enclosure    = '"';
+
+    /**
+     * Line ending
+     *
+     * @var string
+     */
+    private $lineEnding    = PHP_EOL;
+
+    /**
+     * Sheet index to write
+     *
+     * @var int
+     */
+    private $sheetIndex    = 0;
+
+    /**
+     * Whether to write a BOM (for UTF8).
+     *
+     * @var boolean
+     */
+    private $useBOM = false;
+
+    /**
+     * Whether to write a Separator line as the first line of the file
+     *     sep=x
+     *
+     * @var boolean
+     */
+    private $includeSeparatorLine = false;
+
+    /**
+     * Whether to write a fully Excel compatible CSV file.
+     *
+     * @var boolean
+     */
+    private $excelCompatibility = false;
+
+    /**
+     * Create a new PHPExcel_Writer_CSV
+     *
+     * @param    PHPExcel    $phpExcel    PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        $this->phpExcel    = $phpExcel;
+    }
+
+    /**
+     * Save PHPExcel to file
+     *
+     * @param    string        $pFilename
+     * @throws    PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        // Fetch sheet
+        $sheet = $this->phpExcel->getSheet($this->sheetIndex);
+
+        $saveDebugLog = PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->getWriteDebugLog();
+        PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog(false);
+        $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
+        PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+
+        // Open file
+        $fileHandle = fopen($pFilename, 'wb+');
+        if ($fileHandle === false) {
+            throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
+        }
+
+        if ($this->excelCompatibility) {
+            $this->setUseBOM(true);                //  Enforce UTF-8 BOM Header
+            $this->setIncludeSeparatorLine(true);  //  Set separator line
+            $this->setEnclosure('"');              //  Set enclosure to "
+            $this->setDelimiter(";");              //  Set delimiter to a semi-colon
+            $this->setLineEnding("\r\n");
+        }
+        if ($this->useBOM) {
+            // Write the UTF-8 BOM code if required
+            fwrite($fileHandle, "\xEF\xBB\xBF");
+        }
+        if ($this->includeSeparatorLine) {
+            // Write the separator line if required
+            fwrite($fileHandle, 'sep=' . $this->getDelimiter() . $this->lineEnding);
+        }
+
+        //    Identify the range that we need to extract from the worksheet
+        $maxCol = $sheet->getHighestDataColumn();
+        $maxRow = $sheet->getHighestDataRow();
+
+        // Write rows to file
+        for ($row = 1; $row <= $maxRow; ++$row) {
+            // Convert the row to an array...
+            $cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row, '', $this->preCalculateFormulas);
+            // ... and write to the file
+            $this->writeLine($fileHandle, $cellsArray[0]);
+        }
+
+        // Close file
+        fclose($fileHandle);
+
+        PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
+        PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+    }
+
+    /**
+     * Get delimiter
+     *
+     * @return string
+     */
+    public function getDelimiter()
+    {
+        return $this->delimiter;
+    }
+
+    /**
+     * Set delimiter
+     *
+     * @param    string    $pValue        Delimiter, defaults to ,
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setDelimiter($pValue = ',')
+    {
+        $this->delimiter = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get enclosure
+     *
+     * @return string
+     */
+    public function getEnclosure()
+    {
+        return $this->enclosure;
+    }
+
+    /**
+     * Set enclosure
+     *
+     * @param    string    $pValue        Enclosure, defaults to "
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setEnclosure($pValue = '"')
+    {
+        if ($pValue == '') {
+            $pValue = null;
+        }
+        $this->enclosure = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get line ending
+     *
+     * @return string
+     */
+    public function getLineEnding()
+    {
+        return $this->lineEnding;
+    }
+
+    /**
+     * Set line ending
+     *
+     * @param    string    $pValue        Line ending, defaults to OS line ending (PHP_EOL)
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setLineEnding($pValue = PHP_EOL)
+    {
+        $this->lineEnding = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get whether BOM should be used
+     *
+     * @return boolean
+     */
+    public function getUseBOM()
+    {
+        return $this->useBOM;
+    }
+
+    /**
+     * Set whether BOM should be used
+     *
+     * @param    boolean    $pValue        Use UTF-8 byte-order mark? Defaults to false
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setUseBOM($pValue = false)
+    {
+        $this->useBOM = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get whether a separator line should be included
+     *
+     * @return boolean
+     */
+    public function getIncludeSeparatorLine()
+    {
+        return $this->includeSeparatorLine;
+    }
+
+    /**
+     * Set whether a separator line should be included as the first line of the file
+     *
+     * @param    boolean    $pValue        Use separator line? Defaults to false
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setIncludeSeparatorLine($pValue = false)
+    {
+        $this->includeSeparatorLine = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get whether the file should be saved with full Excel Compatibility
+     *
+     * @return boolean
+     */
+    public function getExcelCompatibility()
+    {
+        return $this->excelCompatibility;
+    }
+
+    /**
+     * Set whether the file should be saved with full Excel Compatibility
+     *
+     * @param    boolean    $pValue        Set the file to be written as a fully Excel compatible csv file
+     *                                Note that this overrides other settings such as useBOM, enclosure and delimiter
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setExcelCompatibility($pValue = false)
+    {
+        $this->excelCompatibility = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return int
+     */
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param    int        $pValue        Sheet index
+     * @return PHPExcel_Writer_CSV
+     */
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+        return $this;
+    }
+
+    /**
+     * Write line to CSV file
+     *
+     * @param    mixed    $pFileHandle    PHP filehandle
+     * @param    array    $pValues        Array containing values in a row
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeLine($pFileHandle = null, $pValues = null)
+    {
+        if (is_array($pValues)) {
+            // No leading delimiter
+            $writeDelimiter = false;
+
+            // Build the line
+            $line = '';
+
+            foreach ($pValues as $element) {
+                // Escape enclosures
+                $element = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $element);
+
+                // Add delimiter
+                if ($writeDelimiter) {
+                    $line .= $this->delimiter;
+                } else {
+                    $writeDelimiter = true;
+                }
+
+                // Add enclosed string
+                $line .= $this->enclosure . $element . $this->enclosure;
+            }
+
+            // Add line ending
+            $line .= $this->lineEnding;
+
+            // Write to file
+            fwrite($pFileHandle, $line);
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid data row passed to CSV writer.");
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007.php b/lib/PHPExcel/Writer/Excel2007.php
new file mode 100644
index 000000000..11d354b4a
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007.php
@@ -0,0 +1,533 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+{
+    /**
+     * Pre-calculate formulas
+     * Forces PHPExcel to recalculate all formulae in a workbook when saving, so that the pre-calculated values are
+     *    immediately available to MS Excel or other office spreadsheet viewer when opening the file
+     *
+     * Overrides the default TRUE for this specific writer for performance reasons
+     *
+     * @var boolean
+     */
+    protected $preCalculateFormulas = false;
+
+    /**
+     * Office2003 compatibility
+     *
+     * @var boolean
+     */
+    private $office2003compatibility = false;
+
+    /**
+     * Private writer parts
+     *
+     * @var PHPExcel_Writer_Excel2007_WriterPart[]
+     */
+    private $writerParts    = array();
+
+    /**
+     * Private PHPExcel
+     *
+     * @var PHPExcel
+     */
+    private $spreadSheet;
+
+    /**
+     * Private string table
+     *
+     * @var string[]
+     */
+    private $stringTable    = array();
+
+    /**
+     * Private unique PHPExcel_Style_Conditional HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $stylesConditionalHashTable;
+
+    /**
+     * Private unique PHPExcel_Style HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $styleHashTable;
+
+    /**
+     * Private unique PHPExcel_Style_Fill HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $fillHashTable;
+
+    /**
+     * Private unique PHPExcel_Style_Font HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $fontHashTable;
+
+    /**
+     * Private unique PHPExcel_Style_Borders HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $bordersHashTable ;
+
+    /**
+     * Private unique PHPExcel_Style_NumberFormat HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $numFmtHashTable;
+
+    /**
+     * Private unique PHPExcel_Worksheet_BaseDrawing HashTable
+     *
+     * @var PHPExcel_HashTable
+     */
+    private $drawingHashTable;
+
+    /**
+     * Create a new PHPExcel_Writer_Excel2007
+     *
+     * @param     PHPExcel    $pPHPExcel
+     */
+    public function __construct(PHPExcel $pPHPExcel = null)
+    {
+        // Assign PHPExcel
+        $this->setPHPExcel($pPHPExcel);
+
+        $writerPartsArray = array(  'stringtable'       => 'PHPExcel_Writer_Excel2007_StringTable',
+                                    'contenttypes'      => 'PHPExcel_Writer_Excel2007_ContentTypes',
+                                    'docprops'          => 'PHPExcel_Writer_Excel2007_DocProps',
+                                    'rels'              => 'PHPExcel_Writer_Excel2007_Rels',
+                                    'theme'             => 'PHPExcel_Writer_Excel2007_Theme',
+                                    'style'             => 'PHPExcel_Writer_Excel2007_Style',
+                                    'workbook'          => 'PHPExcel_Writer_Excel2007_Workbook',
+                                    'worksheet'         => 'PHPExcel_Writer_Excel2007_Worksheet',
+                                    'drawing'           => 'PHPExcel_Writer_Excel2007_Drawing',
+                                    'comments'          => 'PHPExcel_Writer_Excel2007_Comments',
+                                    'chart'             => 'PHPExcel_Writer_Excel2007_Chart',
+                                    'relsvba'           => 'PHPExcel_Writer_Excel2007_RelsVBA',
+                                    'relsribbonobjects' => 'PHPExcel_Writer_Excel2007_RelsRibbon'
+                                 );
+
+        //    Initialise writer parts
+        //        and Assign their parent IWriters
+        foreach ($writerPartsArray as $writer => $class) {
+            $this->writerParts[$writer] = new $class($this);
+        }
+
+        $hashTablesArray = array( 'stylesConditionalHashTable',    'fillHashTable',        'fontHashTable',
+                                  'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
+                                  'styleHashTable'
+                                );
+
+        // Set HashTable variables
+        foreach ($hashTablesArray as $tableName) {
+            $this->$tableName     = new PHPExcel_HashTable();
+        }
+    }
+
+    /**
+     * Get writer part
+     *
+     * @param     string     $pPartName        Writer part name
+     * @return     PHPExcel_Writer_Excel2007_WriterPart
+     */
+    public function getWriterPart($pPartName = '')
+    {
+        if ($pPartName != '' && isset($this->writerParts[strtolower($pPartName)])) {
+            return $this->writerParts[strtolower($pPartName)];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Save PHPExcel to file
+     *
+     * @param     string         $pFilename
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        if ($this->spreadSheet !== null) {
+            // garbage collect
+            $this->spreadSheet->garbageCollect();
+
+            // If $pFilename is php://output or php://stdout, make it a temporary file...
+            $originalFilename = $pFilename;
+            if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
+                $pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
+                if ($pFilename == '') {
+                    $pFilename = $originalFilename;
+                }
+            }
+
+            $saveDebugLog = PHPExcel_Calculation::getInstance($this->spreadSheet)->getDebugLog()->getWriteDebugLog();
+            PHPExcel_Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog(false);
+            $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
+            PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+
+            // Create string lookup table
+            $this->stringTable = array();
+            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+                $this->stringTable = $this->getWriterPart('StringTable')->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
+            }
+
+            // Create styles dictionaries
+            $this->styleHashTable->addFromSource($this->getWriterPart('Style')->allStyles($this->spreadSheet));
+            $this->stylesConditionalHashTable->addFromSource($this->getWriterPart('Style')->allConditionalStyles($this->spreadSheet));
+            $this->fillHashTable->addFromSource($this->getWriterPart('Style')->allFills($this->spreadSheet));
+            $this->fontHashTable->addFromSource($this->getWriterPart('Style')->allFonts($this->spreadSheet));
+            $this->bordersHashTable->addFromSource($this->getWriterPart('Style')->allBorders($this->spreadSheet));
+            $this->numFmtHashTable->addFromSource($this->getWriterPart('Style')->allNumberFormats($this->spreadSheet));
+
+            // Create drawing dictionary
+            $this->drawingHashTable->addFromSource($this->getWriterPart('Drawing')->allDrawings($this->spreadSheet));
+
+            // Create new ZIP file and open it for writing
+            $zipClass = PHPExcel_Settings::getZipClass();
+            $objZip = new $zipClass();
+
+            //    Retrieve OVERWRITE and CREATE constants from the instantiated zip class
+            //    This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
+            $ro = new ReflectionObject($objZip);
+            $zipOverWrite = $ro->getConstant('OVERWRITE');
+            $zipCreate = $ro->getConstant('CREATE');
+
+            if (file_exists($pFilename)) {
+                unlink($pFilename);
+            }
+            // Try opening the ZIP file
+            if ($objZip->open($pFilename, $zipOverWrite) !== true) {
+                if ($objZip->open($pFilename, $zipCreate) !== true) {
+                    throw new PHPExcel_Writer_Exception("Could not open " . $pFilename . " for writing.");
+                }
+            }
+
+            // Add [Content_Types].xml to ZIP file
+            $objZip->addFromString('[Content_Types].xml', $this->getWriterPart('ContentTypes')->writeContentTypes($this->spreadSheet, $this->includeCharts));
+
+            //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
+            if ($this->spreadSheet->hasMacros()) {
+                $macrosCode=$this->spreadSheet->getMacrosCode();
+                if (!is_null($macrosCode)) {// we have the code ?
+                    $objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin
+                    if ($this->spreadSheet->hasMacrosCertificate()) {//signed macros ?
+                        // Yes : add the certificate file and the related rels file
+                        $objZip->addFromString('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
+                        $objZip->addFromString('xl/_rels/vbaProject.bin.rels', $this->getWriterPart('RelsVBA')->writeVBARelationships($this->spreadSheet));
+                    }
+                }
+            }
+            //a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
+            if ($this->spreadSheet->hasRibbon()) {
+                $tmpRibbonTarget=$this->spreadSheet->getRibbonXMLData('target');
+                $objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
+                if ($this->spreadSheet->hasRibbonBinObjects()) {
+                    $tmpRootPath=dirname($tmpRibbonTarget).'/';
+                    $ribbonBinObjects=$this->spreadSheet->getRibbonBinObjects('data');//the files to write
+                    foreach ($ribbonBinObjects as $aPath => $aContent) {
+                        $objZip->addFromString($tmpRootPath.$aPath, $aContent);
+                    }
+                    //the rels for files
+                    $objZip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
+                }
+            }
+            
+            // Add relationships to ZIP file
+            $objZip->addFromString('_rels/.rels', $this->getWriterPart('Rels')->writeRelationships($this->spreadSheet));
+            $objZip->addFromString('xl/_rels/workbook.xml.rels', $this->getWriterPart('Rels')->writeWorkbookRelationships($this->spreadSheet));
+
+            // Add document properties to ZIP file
+            $objZip->addFromString('docProps/app.xml', $this->getWriterPart('DocProps')->writeDocPropsApp($this->spreadSheet));
+            $objZip->addFromString('docProps/core.xml', $this->getWriterPart('DocProps')->writeDocPropsCore($this->spreadSheet));
+            $customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->spreadSheet);
+            if ($customPropertiesPart !== null) {
+                $objZip->addFromString('docProps/custom.xml', $customPropertiesPart);
+            }
+
+            // Add theme to ZIP file
+            $objZip->addFromString('xl/theme/theme1.xml', $this->getWriterPart('Theme')->writeTheme($this->spreadSheet));
+
+            // Add string table to ZIP file
+            $objZip->addFromString('xl/sharedStrings.xml', $this->getWriterPart('StringTable')->writeStringTable($this->stringTable));
+
+            // Add styles to ZIP file
+            $objZip->addFromString('xl/styles.xml', $this->getWriterPart('Style')->writeStyles($this->spreadSheet));
+
+            // Add workbook to ZIP file
+            $objZip->addFromString('xl/workbook.xml', $this->getWriterPart('Workbook')->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas));
+
+            $chartCount = 0;
+            // Add worksheets
+            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+                $objZip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
+                if ($this->includeCharts) {
+                    $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
+                    if (count($charts) > 0) {
+                        foreach ($charts as $chart) {
+                            $objZip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
+                            $chartCount++;
+                        }
+                    }
+                }
+            }
+
+            $chartRef1 = $chartRef2 = 0;
+            // Add worksheet relationships (drawings, ...)
+            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+                // Add relationships
+                $objZip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
+
+                $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
+                $drawingCount = count($drawings);
+                if ($this->includeCharts) {
+                    $chartCount = $this->spreadSheet->getSheet($i)->getChartCount();
+                }
+
+                // Add drawing and image relationship parts
+                if (($drawingCount > 0) || ($chartCount > 0)) {
+                    // Drawing relationships
+                    $objZip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
+
+                    // Drawings
+                    $objZip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $chartRef2, $this->includeCharts));
+                }
+
+                // Add comment relationship parts
+                if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
+                    // VML Comments
+                    $objZip->addFromString('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
+
+                    // Comments
+                    $objZip->addFromString('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
+                }
+
+                // Add header/footer relationship parts
+                if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
+                    // VML Drawings
+                    $objZip->addFromString('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
+
+                    // VML Drawing relationships
+                    $objZip->addFromString('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
+
+                    // Media
+                    foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
+                        $objZip->addFromString('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
+                    }
+                }
+            }
+
+            // Add media
+            for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
+                if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
+                    $imageContents = null;
+                    $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
+                    if (strpos($imagePath, 'zip://') !== false) {
+                        $imagePath = substr($imagePath, 6);
+                        $imagePathSplitted = explode('#', $imagePath);
+
+                        $imageZip = new ZipArchive();
+                        $imageZip->open($imagePathSplitted[0]);
+                        $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
+                        $imageZip->close();
+                        unset($imageZip);
+                    } else {
+                        $imageContents = file_get_contents($imagePath);
+                    }
+
+                    $objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+                } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
+                    ob_start();
+                    call_user_func(
+                        $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
+                        $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
+                    );
+                    $imageContents = ob_get_contents();
+                    ob_end_clean();
+
+                    $objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+                }
+            }
+
+            PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
+            PHPExcel_Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+
+            // Close file
+            if ($objZip->close() === false) {
+                throw new PHPExcel_Writer_Exception("Could not close zip file $pFilename.");
+            }
+
+            // If a temporary file was used, copy it to the correct file stream
+            if ($originalFilename != $pFilename) {
+                if (copy($pFilename, $originalFilename) === false) {
+                    throw new PHPExcel_Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
+                }
+                @unlink($pFilename);
+            }
+        } else {
+            throw new PHPExcel_Writer_Exception("PHPExcel object unassigned.");
+        }
+    }
+
+    /**
+     * Get PHPExcel object
+     *
+     * @return PHPExcel
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function getPHPExcel()
+    {
+        if ($this->spreadSheet !== null) {
+            return $this->spreadSheet;
+        } else {
+            throw new PHPExcel_Writer_Exception("No PHPExcel object assigned.");
+        }
+    }
+
+    /**
+     * Set PHPExcel object
+     *
+     * @param     PHPExcel     $pPHPExcel    PHPExcel object
+     * @throws    PHPExcel_Writer_Exception
+     * @return PHPExcel_Writer_Excel2007
+     */
+    public function setPHPExcel(PHPExcel $pPHPExcel = null)
+    {
+        $this->spreadSheet = $pPHPExcel;
+        return $this;
+    }
+
+    /**
+     * Get string table
+     *
+     * @return string[]
+     */
+    public function getStringTable()
+    {
+        return $this->stringTable;
+    }
+
+    /**
+     * Get PHPExcel_Style HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getStyleHashTable()
+    {
+        return $this->styleHashTable;
+    }
+
+    /**
+     * Get PHPExcel_Style_Conditional HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getStylesConditionalHashTable()
+    {
+        return $this->stylesConditionalHashTable;
+    }
+
+    /**
+     * Get PHPExcel_Style_Fill HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getFillHashTable()
+    {
+        return $this->fillHashTable;
+    }
+
+    /**
+     * Get PHPExcel_Style_Font HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getFontHashTable()
+    {
+        return $this->fontHashTable;
+    }
+
+    /**
+     * Get PHPExcel_Style_Borders HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getBordersHashTable()
+    {
+        return $this->bordersHashTable;
+    }
+
+    /**
+     * Get PHPExcel_Style_NumberFormat HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getNumFmtHashTable()
+    {
+        return $this->numFmtHashTable;
+    }
+
+    /**
+     * Get PHPExcel_Worksheet_BaseDrawing HashTable
+     *
+     * @return PHPExcel_HashTable
+     */
+    public function getDrawingHashTable()
+    {
+        return $this->drawingHashTable;
+    }
+
+    /**
+     * Get Office2003 compatibility
+     *
+     * @return boolean
+     */
+    public function getOffice2003Compatibility()
+    {
+        return $this->office2003compatibility;
+    }
+
+    /**
+     * Set Office2003 compatibility
+     *
+     * @param boolean $pValue    Office2003 compatibility?
+     * @return PHPExcel_Writer_Excel2007
+     */
+    public function setOffice2003Compatibility($pValue = false)
+    {
+        $this->office2003compatibility = $pValue;
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Chart.php b/lib/PHPExcel/Writer/Excel2007/Chart.php
new file mode 100644
index 000000000..92fa21506
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Chart.php
@@ -0,0 +1,1520 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_Chart
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    protected $calculateCellValues;
+
+    /**
+     * Write charts to XML format
+     *
+     * @param  PHPExcel_Chart $pChart
+     *
+     * @return  string            XML Output
+     * @throws  PHPExcel_Writer_Exception
+     */
+    public function writeChart(PHPExcel_Chart $pChart = null, $calculateCellValues = true)
+    {
+        $this->calculateCellValues = $calculateCellValues;
+
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+        //    Ensure that data series values are up-to-date before we save
+        if ($this->calculateCellValues) {
+            $pChart->refresh();
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // c:chartSpace
+        $objWriter->startElement('c:chartSpace');
+        $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+        $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+
+        $objWriter->startElement('c:date1904');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+        $objWriter->startElement('c:lang');
+        $objWriter->writeAttribute('val', "en-GB");
+        $objWriter->endElement();
+        $objWriter->startElement('c:roundedCorners');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+
+        $this->writeAlternateContent($objWriter);
+
+        $objWriter->startElement('c:chart');
+
+        $this->writeTitle($pChart->getTitle(), $objWriter);
+
+        $objWriter->startElement('c:autoTitleDeleted');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+
+        $this->writePlotArea($pChart->getPlotArea(), $pChart->getXAxisLabel(), $pChart->getYAxisLabel(), $objWriter, $pChart->getWorksheet(), $pChart->getChartAxisX(), $pChart->getChartAxisY(), $pChart->getMajorGridlines(), $pChart->getMinorGridlines());
+
+        $this->writeLegend($pChart->getLegend(), $objWriter);
+
+        $objWriter->startElement('c:plotVisOnly');
+        $objWriter->writeAttribute('val', 1);
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:dispBlanksAs');
+        $objWriter->writeAttribute('val', "gap");
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showDLblsOverMax');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $this->writePrintSettings($objWriter);
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write Chart Title
+     *
+     * @param  PHPExcel_Chart_Title $title
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeTitle(PHPExcel_Chart_Title $title = null, $objWriter)
+    {
+        if (is_null($title)) {
+            return;
+        }
+
+        $objWriter->startElement('c:title');
+        $objWriter->startElement('c:tx');
+        $objWriter->startElement('c:rich');
+
+        $objWriter->startElement('a:bodyPr');
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:lstStyle');
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:p');
+
+        $caption = $title->getCaption();
+        if ((is_array($caption)) && (count($caption) > 0)) {
+            $caption = $caption[0];
+        }
+        $this->getParentWriter()->getWriterPart('stringtable')->writeRichTextForCharts($objWriter, $caption, 'a');
+
+        $objWriter->endElement();
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $this->writeLayout($title->getLayout(), $objWriter);
+
+        $objWriter->startElement('c:overlay');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Chart Legend
+     *
+     * @param  PHPExcel_Chart_Legend $legend
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeLegend(PHPExcel_Chart_Legend $legend = null, $objWriter)
+    {
+        if (is_null($legend)) {
+            return;
+        }
+
+        $objWriter->startElement('c:legend');
+
+        $objWriter->startElement('c:legendPos');
+        $objWriter->writeAttribute('val', $legend->getPosition());
+        $objWriter->endElement();
+
+        $this->writeLayout($legend->getLayout(), $objWriter);
+
+        $objWriter->startElement('c:overlay');
+        $objWriter->writeAttribute('val', ($legend->getOverlay()) ? '1' : '0');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:txPr');
+        $objWriter->startElement('a:bodyPr');
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:lstStyle');
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:p');
+        $objWriter->startElement('a:pPr');
+        $objWriter->writeAttribute('rtl', 0);
+
+        $objWriter->startElement('a:defRPr');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:endParaRPr');
+        $objWriter->writeAttribute('lang', "en-US");
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Chart Plot Area
+     *
+     * @param  PHPExcel_Chart_PlotArea $plotArea
+     * @param  PHPExcel_Chart_Title $xAxisLabel
+     * @param  PHPExcel_Chart_Title $yAxisLabel
+     * @param  PHPExcel_Chart_Axis $xAxis
+     * @param  PHPExcel_Chart_Axis $yAxis
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writePlotArea(PHPExcel_Chart_PlotArea $plotArea, PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, $objWriter, PHPExcel_Worksheet $pSheet, PHPExcel_Chart_Axis $xAxis, PHPExcel_Chart_Axis $yAxis, PHPExcel_Chart_GridLines $majorGridlines, PHPExcel_Chart_GridLines $minorGridlines)
+    {
+        if (is_null($plotArea)) {
+            return;
+        }
+
+        $id1 = $id2 = 0;
+        $this->_seriesIndex = 0;
+        $objWriter->startElement('c:plotArea');
+
+        $layout = $plotArea->getLayout();
+
+        $this->writeLayout($layout, $objWriter);
+
+        $chartTypes = self::getChartType($plotArea);
+        $catIsMultiLevelSeries = $valIsMultiLevelSeries = false;
+        $plotGroupingType = '';
+        foreach ($chartTypes as $chartType) {
+            $objWriter->startElement('c:' . $chartType);
+
+            $groupCount = $plotArea->getPlotGroupCount();
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $plotGroup = $plotArea->getPlotGroupByIndex($i);
+                $groupType = $plotGroup->getPlotType();
+                if ($groupType == $chartType) {
+                    $plotStyle = $plotGroup->getPlotStyle();
+                    if ($groupType === PHPExcel_Chart_DataSeries::TYPE_RADARCHART) {
+                        $objWriter->startElement('c:radarStyle');
+                        $objWriter->writeAttribute('val', $plotStyle);
+                        $objWriter->endElement();
+                    } elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART) {
+                        $objWriter->startElement('c:scatterStyle');
+                        $objWriter->writeAttribute('val', $plotStyle);
+                        $objWriter->endElement();
+                    }
+
+                    $this->writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType, $pSheet);
+                }
+            }
+
+            $this->writeDataLabels($objWriter, $layout);
+
+            if ($chartType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+                //    Line only, Line3D can't be smoothed
+
+                $objWriter->startElement('c:smooth');
+                $objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine());
+                $objWriter->endElement();
+            } elseif (($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
+                $objWriter->startElement('c:gapWidth');
+                $objWriter->writeAttribute('val', 150);
+                $objWriter->endElement();
+
+                if ($plotGroupingType == 'percentStacked' || $plotGroupingType == 'stacked') {
+                    $objWriter->startElement('c:overlap');
+                    $objWriter->writeAttribute('val', 100);
+                    $objWriter->endElement();
+                }
+            } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+                $objWriter->startElement('c:bubbleScale');
+                $objWriter->writeAttribute('val', 25);
+                $objWriter->endElement();
+
+                $objWriter->startElement('c:showNegBubbles');
+                $objWriter->writeAttribute('val', 0);
+                $objWriter->endElement();
+            } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
+                $objWriter->startElement('c:hiLowLines');
+                $objWriter->endElement();
+
+                $objWriter->startElement('c:upDownBars');
+
+                $objWriter->startElement('c:gapWidth');
+                $objWriter->writeAttribute('val', 300);
+                $objWriter->endElement();
+
+                $objWriter->startElement('c:upBars');
+                $objWriter->endElement();
+
+                $objWriter->startElement('c:downBars');
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+            }
+
+            //    Generate 2 unique numbers to use for axId values
+            //                    $id1 = $id2 = rand(10000000,99999999);
+            //                    do {
+            //                        $id2 = rand(10000000,99999999);
+            //                    } while ($id1 == $id2);
+            $id1 = '75091328';
+            $id2 = '75089408';
+
+            if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) && ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) && ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+                $objWriter->startElement('c:axId');
+                $objWriter->writeAttribute('val', $id1);
+                $objWriter->endElement();
+                $objWriter->startElement('c:axId');
+                $objWriter->writeAttribute('val', $id2);
+                $objWriter->endElement();
+            } else {
+                $objWriter->startElement('c:firstSliceAng');
+                $objWriter->writeAttribute('val', 0);
+                $objWriter->endElement();
+
+                if ($chartType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) {
+                    $objWriter->startElement('c:holeSize');
+                    $objWriter->writeAttribute('val', 50);
+                    $objWriter->endElement();
+                }
+            }
+
+            $objWriter->endElement();
+        }
+
+        if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) && ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) && ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+            if ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+                $this->writeValueAxis($objWriter, $plotArea, $xAxisLabel, $chartType, $id1, $id2, $catIsMultiLevelSeries, $xAxis, $yAxis, $majorGridlines, $minorGridlines);
+            } else {
+                $this->writeCategoryAxis($objWriter, $plotArea, $xAxisLabel, $chartType, $id1, $id2, $catIsMultiLevelSeries, $xAxis, $yAxis);
+            }
+
+            $this->writeValueAxis($objWriter, $plotArea, $yAxisLabel, $chartType, $id1, $id2, $valIsMultiLevelSeries, $xAxis, $yAxis, $majorGridlines, $minorGridlines);
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Data Labels
+     *
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     * @param  PHPExcel_Chart_Layout $chartLayout Chart layout
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeDataLabels($objWriter, $chartLayout)
+    {
+        $objWriter->startElement('c:dLbls');
+
+        $objWriter->startElement('c:showLegendKey');
+        $showLegendKey = (empty($chartLayout)) ? 0 : $chartLayout->getShowLegendKey();
+        $objWriter->writeAttribute('val', ((empty($showLegendKey)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showVal');
+        $showVal = (empty($chartLayout)) ? 0 : $chartLayout->getShowVal();
+        $objWriter->writeAttribute('val', ((empty($showVal)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showCatName');
+        $showCatName = (empty($chartLayout)) ? 0 : $chartLayout->getShowCatName();
+        $objWriter->writeAttribute('val', ((empty($showCatName)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showSerName');
+        $showSerName = (empty($chartLayout)) ? 0 : $chartLayout->getShowSerName();
+        $objWriter->writeAttribute('val', ((empty($showSerName)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showPercent');
+        $showPercent = (empty($chartLayout)) ? 0 : $chartLayout->getShowPercent();
+        $objWriter->writeAttribute('val', ((empty($showPercent)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showBubbleSize');
+        $showBubbleSize = (empty($chartLayout)) ? 0 : $chartLayout->getShowBubbleSize();
+        $objWriter->writeAttribute('val', ((empty($showBubbleSize)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:showLeaderLines');
+        $showLeaderLines = (empty($chartLayout)) ? 1 : $chartLayout->getShowLeaderLines();
+        $objWriter->writeAttribute('val', ((empty($showLeaderLines)) ? 0 : 1));
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Category Axis
+     *
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     * @param  PHPExcel_Chart_PlotArea $plotArea
+     * @param  PHPExcel_Chart_Title $xAxisLabel
+     * @param  string $groupType Chart type
+     * @param  string $id1
+     * @param  string $id2
+     * @param  boolean $isMultiLevelSeries
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeCategoryAxis($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, $xAxis, $yAxis)
+    {
+        $objWriter->startElement('c:catAx');
+
+        if ($id1 > 0) {
+            $objWriter->startElement('c:axId');
+            $objWriter->writeAttribute('val', $id1);
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:scaling');
+        $objWriter->startElement('c:orientation');
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('orientation'));
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:delete');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:axPos');
+        $objWriter->writeAttribute('val', "b");
+        $objWriter->endElement();
+
+        if (!is_null($xAxisLabel)) {
+            $objWriter->startElement('c:title');
+            $objWriter->startElement('c:tx');
+            $objWriter->startElement('c:rich');
+
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->endElement();
+
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement();
+
+            $objWriter->startElement('a:p');
+            $objWriter->startElement('a:r');
+
+            $caption = $xAxisLabel->getCaption();
+            if (is_array($caption)) {
+                $caption = $caption[0];
+            }
+            $objWriter->startElement('a:t');
+            //                                        $objWriter->writeAttribute('xml:space', 'preserve');
+            $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML($caption));
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+
+            $layout = $xAxisLabel->getLayout();
+            $this->writeLayout($layout, $objWriter);
+
+            $objWriter->startElement('c:overlay');
+            $objWriter->writeAttribute('val', 0);
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:numFmt');
+        $objWriter->writeAttribute('formatCode', $yAxis->getAxisNumberFormat());
+        $objWriter->writeAttribute('sourceLinked', $yAxis->getAxisNumberSourceLinked());
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:majorTickMark');
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_tick_mark'));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:minorTickMark');
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_tick_mark'));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:tickLblPos');
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('axis_labels'));
+        $objWriter->endElement();
+
+        if ($id2 > 0) {
+            $objWriter->startElement('c:crossAx');
+            $objWriter->writeAttribute('val', $id2);
+            $objWriter->endElement();
+
+            $objWriter->startElement('c:crosses');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('horizontal_crosses'));
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:auto');
+        $objWriter->writeAttribute('val', 1);
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:lblAlgn');
+        $objWriter->writeAttribute('val', "ctr");
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:lblOffset');
+        $objWriter->writeAttribute('val', 100);
+        $objWriter->endElement();
+
+        if ($isMultiLevelSeries) {
+            $objWriter->startElement('c:noMultiLvlLbl');
+            $objWriter->writeAttribute('val', 0);
+            $objWriter->endElement();
+        }
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Value Axis
+     *
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     * @param  PHPExcel_Chart_PlotArea $plotArea
+     * @param  PHPExcel_Chart_Title $yAxisLabel
+     * @param  string $groupType Chart type
+     * @param  string $id1
+     * @param  string $id2
+     * @param  boolean $isMultiLevelSeries
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeValueAxis($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, $xAxis, $yAxis, $majorGridlines, $minorGridlines)
+    {
+        $objWriter->startElement('c:valAx');
+
+        if ($id2 > 0) {
+            $objWriter->startElement('c:axId');
+            $objWriter->writeAttribute('val', $id2);
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:scaling');
+
+        if (!is_null($xAxis->getAxisOptionsProperty('maximum'))) {
+            $objWriter->startElement('c:max');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('maximum'));
+            $objWriter->endElement();
+        }
+
+        if (!is_null($xAxis->getAxisOptionsProperty('minimum'))) {
+            $objWriter->startElement('c:min');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minimum'));
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:orientation');
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('orientation'));
+
+
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:delete');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:axPos');
+        $objWriter->writeAttribute('val', "l");
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:majorGridlines');
+        $objWriter->startElement('c:spPr');
+
+        if (!is_null($majorGridlines->getLineColorProperty('value'))) {
+            $objWriter->startElement('a:ln');
+            $objWriter->writeAttribute('w', $majorGridlines->getLineStyleProperty('width'));
+            $objWriter->startElement('a:solidFill');
+            $objWriter->startElement("a:{$majorGridlines->getLineColorProperty('type')}");
+            $objWriter->writeAttribute('val', $majorGridlines->getLineColorProperty('value'));
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $majorGridlines->getLineColorProperty('alpha'));
+            $objWriter->endElement(); //end alpha
+            $objWriter->endElement(); //end srgbClr
+            $objWriter->endElement(); //end solidFill
+
+            $objWriter->startElement('a:prstDash');
+            $objWriter->writeAttribute('val', $majorGridlines->getLineStyleProperty('dash'));
+            $objWriter->endElement();
+
+            if ($majorGridlines->getLineStyleProperty('join') == 'miter') {
+                $objWriter->startElement('a:miter');
+                $objWriter->writeAttribute('lim', '800000');
+                $objWriter->endElement();
+            } else {
+                $objWriter->startElement('a:bevel');
+                $objWriter->endElement();
+            }
+
+            if (!is_null($majorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')))) {
+                $objWriter->startElement('a:headEnd');
+                $objWriter->writeAttribute('type', $majorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')));
+                $objWriter->writeAttribute('w', $majorGridlines->getLineStyleArrowParameters('head', 'w'));
+                $objWriter->writeAttribute('len', $majorGridlines->getLineStyleArrowParameters('head', 'len'));
+                $objWriter->endElement();
+            }
+
+            if (!is_null($majorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')))) {
+                $objWriter->startElement('a:tailEnd');
+                $objWriter->writeAttribute('type', $majorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')));
+                $objWriter->writeAttribute('w', $majorGridlines->getLineStyleArrowParameters('end', 'w'));
+                $objWriter->writeAttribute('len', $majorGridlines->getLineStyleArrowParameters('end', 'len'));
+                $objWriter->endElement();
+            }
+            $objWriter->endElement(); //end ln
+        }
+        $objWriter->startElement('a:effectLst');
+
+        if (!is_null($majorGridlines->getGlowSize())) {
+            $objWriter->startElement('a:glow');
+            $objWriter->writeAttribute('rad', $majorGridlines->getGlowSize());
+            $objWriter->startElement("a:{$majorGridlines->getGlowColor('type')}");
+            $objWriter->writeAttribute('val', $majorGridlines->getGlowColor('value'));
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $majorGridlines->getGlowColor('alpha'));
+            $objWriter->endElement(); //end alpha
+            $objWriter->endElement(); //end schemeClr
+            $objWriter->endElement(); //end glow
+        }
+
+        if (!is_null($majorGridlines->getShadowProperty('presets'))) {
+            $objWriter->startElement("a:{$majorGridlines->getShadowProperty('effect')}");
+            if (!is_null($majorGridlines->getShadowProperty('blur'))) {
+                $objWriter->writeAttribute('blurRad', $majorGridlines->getShadowProperty('blur'));
+            }
+            if (!is_null($majorGridlines->getShadowProperty('distance'))) {
+                $objWriter->writeAttribute('dist', $majorGridlines->getShadowProperty('distance'));
+            }
+            if (!is_null($majorGridlines->getShadowProperty('direction'))) {
+                $objWriter->writeAttribute('dir', $majorGridlines->getShadowProperty('direction'));
+            }
+            if (!is_null($majorGridlines->getShadowProperty('algn'))) {
+                $objWriter->writeAttribute('algn', $majorGridlines->getShadowProperty('algn'));
+            }
+            if (!is_null($majorGridlines->getShadowProperty(array('size', 'sx')))) {
+                $objWriter->writeAttribute('sx', $majorGridlines->getShadowProperty(array('size', 'sx')));
+            }
+            if (!is_null($majorGridlines->getShadowProperty(array('size', 'sy')))) {
+                $objWriter->writeAttribute('sy', $majorGridlines->getShadowProperty(array('size', 'sy')));
+            }
+            if (!is_null($majorGridlines->getShadowProperty(array('size', 'kx')))) {
+                $objWriter->writeAttribute('kx', $majorGridlines->getShadowProperty(array('size', 'kx')));
+            }
+            if (!is_null($majorGridlines->getShadowProperty('rotWithShape'))) {
+                $objWriter->writeAttribute('rotWithShape', $majorGridlines->getShadowProperty('rotWithShape'));
+            }
+            $objWriter->startElement("a:{$majorGridlines->getShadowProperty(array('color', 'type'))}");
+            $objWriter->writeAttribute('val', $majorGridlines->getShadowProperty(array('color', 'value')));
+
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $majorGridlines->getShadowProperty(array('color', 'alpha')));
+            $objWriter->endElement(); //end alpha
+
+            $objWriter->endElement(); //end color:type
+            $objWriter->endElement(); //end shadow
+        }
+
+        if (!is_null($majorGridlines->getSoftEdgesSize())) {
+            $objWriter->startElement('a:softEdge');
+            $objWriter->writeAttribute('rad', $majorGridlines->getSoftEdgesSize());
+            $objWriter->endElement(); //end softEdge
+        }
+
+        $objWriter->endElement(); //end effectLst
+        $objWriter->endElement(); //end spPr
+        $objWriter->endElement(); //end majorGridLines
+
+        if ($minorGridlines->getObjectState()) {
+            $objWriter->startElement('c:minorGridlines');
+            $objWriter->startElement('c:spPr');
+
+            if (!is_null($minorGridlines->getLineColorProperty('value'))) {
+                $objWriter->startElement('a:ln');
+                $objWriter->writeAttribute('w', $minorGridlines->getLineStyleProperty('width'));
+                $objWriter->startElement('a:solidFill');
+                $objWriter->startElement("a:{$minorGridlines->getLineColorProperty('type')}");
+                $objWriter->writeAttribute('val', $minorGridlines->getLineColorProperty('value'));
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', $minorGridlines->getLineColorProperty('alpha'));
+                $objWriter->endElement(); //end alpha
+                $objWriter->endElement(); //end srgbClr
+                $objWriter->endElement(); //end solidFill
+
+                $objWriter->startElement('a:prstDash');
+                $objWriter->writeAttribute('val', $minorGridlines->getLineStyleProperty('dash'));
+                $objWriter->endElement();
+
+                if ($minorGridlines->getLineStyleProperty('join') == 'miter') {
+                    $objWriter->startElement('a:miter');
+                    $objWriter->writeAttribute('lim', '800000');
+                    $objWriter->endElement();
+                } else {
+                    $objWriter->startElement('a:bevel');
+                    $objWriter->endElement();
+                }
+
+                if (!is_null($minorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')))) {
+                    $objWriter->startElement('a:headEnd');
+                    $objWriter->writeAttribute('type', $minorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')));
+                    $objWriter->writeAttribute('w', $minorGridlines->getLineStyleArrowParameters('head', 'w'));
+                    $objWriter->writeAttribute('len', $minorGridlines->getLineStyleArrowParameters('head', 'len'));
+                    $objWriter->endElement();
+                }
+
+                if (!is_null($minorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')))) {
+                    $objWriter->startElement('a:tailEnd');
+                    $objWriter->writeAttribute('type', $minorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')));
+                    $objWriter->writeAttribute('w', $minorGridlines->getLineStyleArrowParameters('end', 'w'));
+                    $objWriter->writeAttribute('len', $minorGridlines->getLineStyleArrowParameters('end', 'len'));
+                    $objWriter->endElement();
+                }
+                $objWriter->endElement(); //end ln
+            }
+
+            $objWriter->startElement('a:effectLst');
+
+            if (!is_null($minorGridlines->getGlowSize())) {
+                $objWriter->startElement('a:glow');
+                $objWriter->writeAttribute('rad', $minorGridlines->getGlowSize());
+                $objWriter->startElement("a:{$minorGridlines->getGlowColor('type')}");
+                $objWriter->writeAttribute('val', $minorGridlines->getGlowColor('value'));
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', $minorGridlines->getGlowColor('alpha'));
+                $objWriter->endElement(); //end alpha
+                $objWriter->endElement(); //end schemeClr
+                $objWriter->endElement(); //end glow
+            }
+
+            if (!is_null($minorGridlines->getShadowProperty('presets'))) {
+                $objWriter->startElement("a:{$minorGridlines->getShadowProperty('effect')}");
+                if (!is_null($minorGridlines->getShadowProperty('blur'))) {
+                    $objWriter->writeAttribute('blurRad', $minorGridlines->getShadowProperty('blur'));
+                }
+                if (!is_null($minorGridlines->getShadowProperty('distance'))) {
+                    $objWriter->writeAttribute('dist', $minorGridlines->getShadowProperty('distance'));
+                }
+                if (!is_null($minorGridlines->getShadowProperty('direction'))) {
+                    $objWriter->writeAttribute('dir', $minorGridlines->getShadowProperty('direction'));
+                }
+                if (!is_null($minorGridlines->getShadowProperty('algn'))) {
+                    $objWriter->writeAttribute('algn', $minorGridlines->getShadowProperty('algn'));
+                }
+                if (!is_null($minorGridlines->getShadowProperty(array('size', 'sx')))) {
+                    $objWriter->writeAttribute('sx', $minorGridlines->getShadowProperty(array('size', 'sx')));
+                }
+                if (!is_null($minorGridlines->getShadowProperty(array('size', 'sy')))) {
+                    $objWriter->writeAttribute('sy', $minorGridlines->getShadowProperty(array('size', 'sy')));
+                }
+                if (!is_null($minorGridlines->getShadowProperty(array('size', 'kx')))) {
+                    $objWriter->writeAttribute('kx', $minorGridlines->getShadowProperty(array('size', 'kx')));
+                }
+                if (!is_null($minorGridlines->getShadowProperty('rotWithShape'))) {
+                    $objWriter->writeAttribute('rotWithShape', $minorGridlines->getShadowProperty('rotWithShape'));
+                }
+                $objWriter->startElement("a:{$minorGridlines->getShadowProperty(array('color', 'type'))}");
+                $objWriter->writeAttribute('val', $minorGridlines->getShadowProperty(array('color', 'value')));
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', $minorGridlines->getShadowProperty(array('color', 'alpha')));
+                $objWriter->endElement(); //end alpha
+                $objWriter->endElement(); //end color:type
+                $objWriter->endElement(); //end shadow
+            }
+
+            if (!is_null($minorGridlines->getSoftEdgesSize())) {
+                $objWriter->startElement('a:softEdge');
+                $objWriter->writeAttribute('rad', $minorGridlines->getSoftEdgesSize());
+                $objWriter->endElement(); //end softEdge
+            }
+
+            $objWriter->endElement(); //end effectLst
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end minorGridLines
+        }
+
+        if (!is_null($yAxisLabel)) {
+            $objWriter->startElement('c:title');
+            $objWriter->startElement('c:tx');
+            $objWriter->startElement('c:rich');
+
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->endElement();
+
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement();
+
+            $objWriter->startElement('a:p');
+            $objWriter->startElement('a:r');
+
+            $caption = $yAxisLabel->getCaption();
+            if (is_array($caption)) {
+                $caption = $caption[0];
+            }
+
+            $objWriter->startElement('a:t');
+            //                                        $objWriter->writeAttribute('xml:space', 'preserve');
+            $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML($caption));
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+
+            if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+                $layout = $yAxisLabel->getLayout();
+                $this->writeLayout($layout, $objWriter);
+            }
+
+            $objWriter->startElement('c:overlay');
+            $objWriter->writeAttribute('val', 0);
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:numFmt');
+        $objWriter->writeAttribute('formatCode', $xAxis->getAxisNumberFormat());
+        $objWriter->writeAttribute('sourceLinked', $xAxis->getAxisNumberSourceLinked());
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:majorTickMark');
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_tick_mark'));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:minorTickMark');
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_tick_mark'));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:tickLblPos');
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('axis_labels'));
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:spPr');
+
+        if (!is_null($xAxis->getFillProperty('value'))) {
+            $objWriter->startElement('a:solidFill');
+            $objWriter->startElement("a:" . $xAxis->getFillProperty('type'));
+            $objWriter->writeAttribute('val', $xAxis->getFillProperty('value'));
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $xAxis->getFillProperty('alpha'));
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('a:ln');
+
+        $objWriter->writeAttribute('w', $xAxis->getLineStyleProperty('width'));
+        $objWriter->writeAttribute('cap', $xAxis->getLineStyleProperty('cap'));
+        $objWriter->writeAttribute('cmpd', $xAxis->getLineStyleProperty('compound'));
+
+        if (!is_null($xAxis->getLineProperty('value'))) {
+            $objWriter->startElement('a:solidFill');
+            $objWriter->startElement("a:" . $xAxis->getLineProperty('type'));
+            $objWriter->writeAttribute('val', $xAxis->getLineProperty('value'));
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $xAxis->getLineProperty('alpha'));
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('a:prstDash');
+        $objWriter->writeAttribute('val', $xAxis->getLineStyleProperty('dash'));
+        $objWriter->endElement();
+
+        if ($xAxis->getLineStyleProperty('join') == 'miter') {
+            $objWriter->startElement('a:miter');
+            $objWriter->writeAttribute('lim', '800000');
+            $objWriter->endElement();
+        } else {
+            $objWriter->startElement('a:bevel');
+            $objWriter->endElement();
+        }
+
+        if (!is_null($xAxis->getLineStyleProperty(array('arrow', 'head', 'type')))) {
+            $objWriter->startElement('a:headEnd');
+            $objWriter->writeAttribute('type', $xAxis->getLineStyleProperty(array('arrow', 'head', 'type')));
+            $objWriter->writeAttribute('w', $xAxis->getLineStyleArrowWidth('head'));
+            $objWriter->writeAttribute('len', $xAxis->getLineStyleArrowLength('head'));
+            $objWriter->endElement();
+        }
+
+        if (!is_null($xAxis->getLineStyleProperty(array('arrow', 'end', 'type')))) {
+            $objWriter->startElement('a:tailEnd');
+            $objWriter->writeAttribute('type', $xAxis->getLineStyleProperty(array('arrow', 'end', 'type')));
+            $objWriter->writeAttribute('w', $xAxis->getLineStyleArrowWidth('end'));
+            $objWriter->writeAttribute('len', $xAxis->getLineStyleArrowLength('end'));
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:effectLst');
+
+        if (!is_null($xAxis->getGlowProperty('size'))) {
+            $objWriter->startElement('a:glow');
+            $objWriter->writeAttribute('rad', $xAxis->getGlowProperty('size'));
+            $objWriter->startElement("a:{$xAxis->getGlowProperty(array('color','type'))}");
+            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color','value')));
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color','alpha')));
+            $objWriter->endElement();
+            $objWriter->endElement();
+            $objWriter->endElement();
+        }
+
+        if (!is_null($xAxis->getShadowProperty('presets'))) {
+            $objWriter->startElement("a:{$xAxis->getShadowProperty('effect')}");
+
+            if (!is_null($xAxis->getShadowProperty('blur'))) {
+                $objWriter->writeAttribute('blurRad', $xAxis->getShadowProperty('blur'));
+            }
+            if (!is_null($xAxis->getShadowProperty('distance'))) {
+                $objWriter->writeAttribute('dist', $xAxis->getShadowProperty('distance'));
+            }
+            if (!is_null($xAxis->getShadowProperty('direction'))) {
+                $objWriter->writeAttribute('dir', $xAxis->getShadowProperty('direction'));
+            }
+            if (!is_null($xAxis->getShadowProperty('algn'))) {
+                $objWriter->writeAttribute('algn', $xAxis->getShadowProperty('algn'));
+            }
+            if (!is_null($xAxis->getShadowProperty(array('size','sx')))) {
+                $objWriter->writeAttribute('sx', $xAxis->getShadowProperty(array('size','sx')));
+            }
+            if (!is_null($xAxis->getShadowProperty(array('size','sy')))) {
+                $objWriter->writeAttribute('sy', $xAxis->getShadowProperty(array('size','sy')));
+            }
+            if (!is_null($xAxis->getShadowProperty(array('size','kx')))) {
+                $objWriter->writeAttribute('kx', $xAxis->getShadowProperty(array('size','kx')));
+            }
+            if (!is_null($xAxis->getShadowProperty('rotWithShape'))) {
+                $objWriter->writeAttribute('rotWithShape', $xAxis->getShadowProperty('rotWithShape'));
+            }
+
+            $objWriter->startElement("a:{$xAxis->getShadowProperty(array('color','type'))}");
+            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color','value')));
+            $objWriter->startElement('a:alpha');
+            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color','alpha')));
+            $objWriter->endElement();
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+
+        if (!is_null($xAxis->getSoftEdgesSize())) {
+            $objWriter->startElement('a:softEdge');
+            $objWriter->writeAttribute('rad', $xAxis->getSoftEdgesSize());
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement(); //effectList
+        $objWriter->endElement(); //end spPr
+
+        if ($id1 > 0) {
+            $objWriter->startElement('c:crossAx');
+            $objWriter->writeAttribute('val', $id2);
+            $objWriter->endElement();
+
+            if (!is_null($xAxis->getAxisOptionsProperty('horizontal_crosses_value'))) {
+                $objWriter->startElement('c:crossesAt');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses_value'));
+                $objWriter->endElement();
+            } else {
+                $objWriter->startElement('c:crosses');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses'));
+                $objWriter->endElement();
+            }
+
+            $objWriter->startElement('c:crossBetween');
+            $objWriter->writeAttribute('val', "midCat");
+            $objWriter->endElement();
+
+            if (!is_null($xAxis->getAxisOptionsProperty('major_unit'))) {
+                $objWriter->startElement('c:majorUnit');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_unit'));
+                $objWriter->endElement();
+            }
+
+            if (!is_null($xAxis->getAxisOptionsProperty('minor_unit'))) {
+                $objWriter->startElement('c:minorUnit');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_unit'));
+                $objWriter->endElement();
+            }
+        }
+
+        if ($isMultiLevelSeries) {
+            if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+                $objWriter->startElement('c:noMultiLvlLbl');
+                $objWriter->writeAttribute('val', 0);
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Get the data series type(s) for a chart plot series
+     *
+     * @param  PHPExcel_Chart_PlotArea $plotArea
+     *
+     * @return  string|array
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private static function getChartType($plotArea)
+    {
+        $groupCount = $plotArea->getPlotGroupCount();
+
+        if ($groupCount == 1) {
+            $chartType = array($plotArea->getPlotGroupByIndex(0)->getPlotType());
+        } else {
+            $chartTypes = array();
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $chartTypes[] = $plotArea->getPlotGroupByIndex($i)->getPlotType();
+            }
+            $chartType = array_unique($chartTypes);
+            if (count($chartTypes) == 0) {
+                throw new PHPExcel_Writer_Exception('Chart is not yet implemented');
+            }
+        }
+
+        return $chartType;
+    }
+
+    /**
+     * Write Plot Group (series of related plots)
+     *
+     * @param  PHPExcel_Chart_DataSeries $plotGroup
+     * @param  string $groupType Type of plot for dataseries
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     * @param  boolean &$catIsMultiLevelSeries Is category a multi-series category
+     * @param  boolean &$valIsMultiLevelSeries Is value set a multi-series set
+     * @param  string &$plotGroupingType Type of grouping for multi-series values
+     * @param  PHPExcel_Worksheet $pSheet
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMultiLevelSeries, &$valIsMultiLevelSeries, &$plotGroupingType, PHPExcel_Worksheet $pSheet)
+    {
+        if (is_null($plotGroup)) {
+            return;
+        }
+
+        if (($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
+            $objWriter->startElement('c:barDir');
+            $objWriter->writeAttribute('val', $plotGroup->getPlotDirection());
+            $objWriter->endElement();
+        }
+
+        if (!is_null($plotGroup->getPlotGrouping())) {
+            $plotGroupingType = $plotGroup->getPlotGrouping();
+            $objWriter->startElement('c:grouping');
+            $objWriter->writeAttribute('val', $plotGroupingType);
+            $objWriter->endElement();
+        }
+
+        //    Get these details before the loop, because we can use the count to check for varyColors
+        $plotSeriesOrder = $plotGroup->getPlotOrder();
+        $plotSeriesCount = count($plotSeriesOrder);
+
+        if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) && ($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) {
+            if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+                if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) || ($plotSeriesCount > 1)) {
+                    $objWriter->startElement('c:varyColors');
+                    $objWriter->writeAttribute('val', 1);
+                    $objWriter->endElement();
+                } else {
+                    $objWriter->startElement('c:varyColors');
+                    $objWriter->writeAttribute('val', 0);
+                    $objWriter->endElement();
+                }
+            }
+        }
+
+        foreach ($plotSeriesOrder as $plotSeriesIdx => $plotSeriesRef) {
+            $objWriter->startElement('c:ser');
+
+            $objWriter->startElement('c:idx');
+            $objWriter->writeAttribute('val', $this->_seriesIndex + $plotSeriesIdx);
+            $objWriter->endElement();
+
+            $objWriter->startElement('c:order');
+            $objWriter->writeAttribute('val', $this->_seriesIndex + $plotSeriesRef);
+            $objWriter->endElement();
+
+            if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+                $objWriter->startElement('c:dPt');
+                $objWriter->startElement('c:idx');
+                $objWriter->writeAttribute('val', 3);
+                $objWriter->endElement();
+
+                $objWriter->startElement('c:bubble3D');
+                $objWriter->writeAttribute('val', 0);
+                $objWriter->endElement();
+
+                $objWriter->startElement('c:spPr');
+                $objWriter->startElement('a:solidFill');
+                $objWriter->startElement('a:srgbClr');
+                $objWriter->writeAttribute('val', 'FF9900');
+                $objWriter->endElement();
+                $objWriter->endElement();
+                $objWriter->endElement();
+                $objWriter->endElement();
+            }
+
+            //    Labels
+            $plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesRef);
+            if ($plotSeriesLabel && ($plotSeriesLabel->getPointCount() > 0)) {
+                $objWriter->startElement('c:tx');
+                $objWriter->startElement('c:strRef');
+                $this->writePlotSeriesLabel($plotSeriesLabel, $objWriter);
+                $objWriter->endElement();
+                $objWriter->endElement();
+            }
+
+            //    Formatting for the points
+            if (($groupType == PHPExcel_Chart_DataSeries::TYPE_LINECHART) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) {
+                $objWriter->startElement('c:spPr');
+                $objWriter->startElement('a:ln');
+                $objWriter->writeAttribute('w', 12700);
+                if ($groupType == PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
+                    $objWriter->startElement('a:noFill');
+                    $objWriter->endElement();
+                }
+                $objWriter->endElement();
+                $objWriter->endElement();
+            }
+
+            $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesRef);
+            if ($plotSeriesValues) {
+                $plotSeriesMarker = $plotSeriesValues->getPointMarker();
+                if ($plotSeriesMarker) {
+                    $objWriter->startElement('c:marker');
+                    $objWriter->startElement('c:symbol');
+                    $objWriter->writeAttribute('val', $plotSeriesMarker);
+                    $objWriter->endElement();
+
+                    if ($plotSeriesMarker !== 'none') {
+                        $objWriter->startElement('c:size');
+                        $objWriter->writeAttribute('val', 3);
+                        $objWriter->endElement();
+                    }
+
+                    $objWriter->endElement();
+                }
+            }
+
+            if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) || ($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) || ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)) {
+                $objWriter->startElement('c:invertIfNegative');
+                $objWriter->writeAttribute('val', 0);
+                $objWriter->endElement();
+            }
+
+            //    Category Labels
+            $plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesRef);
+            if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
+                $catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
+
+                if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) || ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+                    if (!is_null($plotGroup->getPlotStyle())) {
+                        $plotStyle = $plotGroup->getPlotStyle();
+                        if ($plotStyle) {
+                            $objWriter->startElement('c:explosion');
+                            $objWriter->writeAttribute('val', 25);
+                            $objWriter->endElement();
+                        }
+                    }
+                }
+
+                if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) || ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
+                    $objWriter->startElement('c:xVal');
+                } else {
+                    $objWriter->startElement('c:cat');
+                }
+
+                $this->writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str', $pSheet);
+                $objWriter->endElement();
+            }
+
+            //    Values
+            if ($plotSeriesValues) {
+                $valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
+
+                if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) || ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
+                    $objWriter->startElement('c:yVal');
+                } else {
+                    $objWriter->startElement('c:val');
+                }
+
+                $this->writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, 'num', $pSheet);
+                $objWriter->endElement();
+            }
+
+            if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+                $this->writeBubbles($plotSeriesValues, $objWriter, $pSheet);
+            }
+
+            $objWriter->endElement();
+        }
+
+        $this->_seriesIndex += $plotSeriesIdx + 1;
+    }
+
+    /**
+     * Write Plot Series Label
+     *
+     * @param  PHPExcel_Chart_DataSeriesValues $plotSeriesLabel
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writePlotSeriesLabel($plotSeriesLabel, $objWriter)
+    {
+        if (is_null($plotSeriesLabel)) {
+            return;
+        }
+
+        $objWriter->startElement('c:f');
+        $objWriter->writeRawData($plotSeriesLabel->getDataSource());
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:strCache');
+        $objWriter->startElement('c:ptCount');
+        $objWriter->writeAttribute('val', $plotSeriesLabel->getPointCount());
+        $objWriter->endElement();
+
+        foreach ($plotSeriesLabel->getDataValues() as $plotLabelKey => $plotLabelValue) {
+            $objWriter->startElement('c:pt');
+            $objWriter->writeAttribute('idx', $plotLabelKey);
+
+            $objWriter->startElement('c:v');
+            $objWriter->writeRawData($plotLabelValue);
+            $objWriter->endElement();
+            $objWriter->endElement();
+        }
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Plot Series Values
+     *
+     * @param  PHPExcel_Chart_DataSeriesValues $plotSeriesValues
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     * @param  string $groupType Type of plot for dataseries
+     * @param  string $dataType Datatype of series values
+     * @param  PHPExcel_Worksheet $pSheet
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, $dataType = 'str', PHPExcel_Worksheet $pSheet)
+    {
+        if (is_null($plotSeriesValues)) {
+            return;
+        }
+
+        if ($plotSeriesValues->isMultiLevelSeries()) {
+            $levelCount = $plotSeriesValues->multiLevelCount();
+
+            $objWriter->startElement('c:multiLvlStrRef');
+
+            $objWriter->startElement('c:f');
+            $objWriter->writeRawData($plotSeriesValues->getDataSource());
+            $objWriter->endElement();
+
+            $objWriter->startElement('c:multiLvlStrCache');
+
+            $objWriter->startElement('c:ptCount');
+            $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
+            $objWriter->endElement();
+
+            for ($level = 0; $level < $levelCount; ++$level) {
+                $objWriter->startElement('c:lvl');
+
+                foreach ($plotSeriesValues->getDataValues() as $plotSeriesKey => $plotSeriesValue) {
+                    if (isset($plotSeriesValue[$level])) {
+                        $objWriter->startElement('c:pt');
+                        $objWriter->writeAttribute('idx', $plotSeriesKey);
+
+                        $objWriter->startElement('c:v');
+                        $objWriter->writeRawData($plotSeriesValue[$level]);
+                        $objWriter->endElement();
+                        $objWriter->endElement();
+                    }
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        } else {
+            $objWriter->startElement('c:' . $dataType . 'Ref');
+
+            $objWriter->startElement('c:f');
+            $objWriter->writeRawData($plotSeriesValues->getDataSource());
+            $objWriter->endElement();
+
+            $objWriter->startElement('c:' . $dataType . 'Cache');
+
+            if (($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART) && ($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) && ($groupType != PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+                if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) {
+                    $objWriter->startElement('c:formatCode');
+                    $objWriter->writeRawData($plotSeriesValues->getFormatCode());
+                    $objWriter->endElement();
+                }
+            }
+
+            $objWriter->startElement('c:ptCount');
+            $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
+            $objWriter->endElement();
+
+            $dataValues = $plotSeriesValues->getDataValues();
+            if (!empty($dataValues)) {
+                if (is_array($dataValues)) {
+                    foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
+                        $objWriter->startElement('c:pt');
+                        $objWriter->writeAttribute('idx', $plotSeriesKey);
+
+                        $objWriter->startElement('c:v');
+                        $objWriter->writeRawData($plotSeriesValue);
+                        $objWriter->endElement();
+                        $objWriter->endElement();
+                    }
+                }
+            }
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Bubble Chart Details
+     *
+     * @param  PHPExcel_Chart_DataSeriesValues $plotSeriesValues
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeBubbles($plotSeriesValues, $objWriter, PHPExcel_Worksheet $pSheet)
+    {
+        if (is_null($plotSeriesValues)) {
+            return;
+        }
+
+        $objWriter->startElement('c:bubbleSize');
+        $objWriter->startElement('c:numLit');
+
+        $objWriter->startElement('c:formatCode');
+        $objWriter->writeRawData('General');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:ptCount');
+        $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
+        $objWriter->endElement();
+
+        $dataValues = $plotSeriesValues->getDataValues();
+        if (!empty($dataValues)) {
+            if (is_array($dataValues)) {
+                foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
+                    $objWriter->startElement('c:pt');
+                    $objWriter->writeAttribute('idx', $plotSeriesKey);
+                    $objWriter->startElement('c:v');
+                    $objWriter->writeRawData(1);
+                    $objWriter->endElement();
+                    $objWriter->endElement();
+                }
+            }
+        }
+
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:bubble3D');
+        $objWriter->writeAttribute('val', 0);
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Layout
+     *
+     * @param  PHPExcel_Chart_Layout $layout
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeLayout(PHPExcel_Chart_Layout $layout = null, $objWriter)
+    {
+        $objWriter->startElement('c:layout');
+
+        if (!is_null($layout)) {
+            $objWriter->startElement('c:manualLayout');
+
+            $layoutTarget = $layout->getLayoutTarget();
+            if (!is_null($layoutTarget)) {
+                $objWriter->startElement('c:layoutTarget');
+                $objWriter->writeAttribute('val', $layoutTarget);
+                $objWriter->endElement();
+            }
+
+            $xMode = $layout->getXMode();
+            if (!is_null($xMode)) {
+                $objWriter->startElement('c:xMode');
+                $objWriter->writeAttribute('val', $xMode);
+                $objWriter->endElement();
+            }
+
+            $yMode = $layout->getYMode();
+            if (!is_null($yMode)) {
+                $objWriter->startElement('c:yMode');
+                $objWriter->writeAttribute('val', $yMode);
+                $objWriter->endElement();
+            }
+
+            $x = $layout->getXPosition();
+            if (!is_null($x)) {
+                $objWriter->startElement('c:x');
+                $objWriter->writeAttribute('val', $x);
+                $objWriter->endElement();
+            }
+
+            $y = $layout->getYPosition();
+            if (!is_null($y)) {
+                $objWriter->startElement('c:y');
+                $objWriter->writeAttribute('val', $y);
+                $objWriter->endElement();
+            }
+
+            $w = $layout->getWidth();
+            if (!is_null($w)) {
+                $objWriter->startElement('c:w');
+                $objWriter->writeAttribute('val', $w);
+                $objWriter->endElement();
+            }
+
+            $h = $layout->getHeight();
+            if (!is_null($h)) {
+                $objWriter->startElement('c:h');
+                $objWriter->writeAttribute('val', $h);
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Alternate Content block
+     *
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writeAlternateContent($objWriter)
+    {
+        $objWriter->startElement('mc:AlternateContent');
+        $objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
+
+        $objWriter->startElement('mc:Choice');
+        $objWriter->writeAttribute('xmlns:c14', 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart');
+        $objWriter->writeAttribute('Requires', 'c14');
+
+        $objWriter->startElement('c14:style');
+        $objWriter->writeAttribute('val', '102');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('mc:Fallback');
+        $objWriter->startElement('c:style');
+        $objWriter->writeAttribute('val', '2');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Printer Settings
+     *
+     * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     *
+     * @throws  PHPExcel_Writer_Exception
+     */
+    private function writePrintSettings($objWriter)
+    {
+        $objWriter->startElement('c:printSettings');
+
+        $objWriter->startElement('c:headerFooter');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:pageMargins');
+        $objWriter->writeAttribute('footer', 0.3);
+        $objWriter->writeAttribute('header', 0.3);
+        $objWriter->writeAttribute('r', 0.7);
+        $objWriter->writeAttribute('l', 0.7);
+        $objWriter->writeAttribute('t', 0.75);
+        $objWriter->writeAttribute('b', 0.75);
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:pageSetup');
+        $objWriter->writeAttribute('orientation', "portrait");
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Comments.php b/lib/PHPExcel/Writer/Excel2007/Comments.php
new file mode 100644
index 000000000..7139f6c49
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Comments.php
@@ -0,0 +1,260 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_Comments
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write comments to XML format
+     *
+     * @param     PHPExcel_Worksheet                $pWorksheet
+     * @return     string                                 XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeComments(PHPExcel_Worksheet $pWorksheet = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+          // Comments cache
+          $comments    = $pWorksheet->getComments();
+
+          // Authors cache
+          $authors    = array();
+          $authorId    = 0;
+        foreach ($comments as $comment) {
+            if (!isset($authors[$comment->getAuthor()])) {
+                $authors[$comment->getAuthor()] = $authorId++;
+            }
+        }
+
+        // comments
+        $objWriter->startElement('comments');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+
+        // Loop through authors
+        $objWriter->startElement('authors');
+        foreach ($authors as $author => $index) {
+            $objWriter->writeElement('author', $author);
+        }
+        $objWriter->endElement();
+
+        // Loop through comments
+        $objWriter->startElement('commentList');
+        foreach ($comments as $key => $value) {
+            $this->writeComment($objWriter, $key, $value, $authors);
+        }
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write comment to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter        $objWriter             XML Writer
+     * @param    string                            $pCellReference        Cell reference
+     * @param     PHPExcel_Comment                $pComment            Comment
+     * @param    array                            $pAuthors            Array of authors
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null, $pAuthors = null)
+    {
+        // comment
+        $objWriter->startElement('comment');
+        $objWriter->writeAttribute('ref', $pCellReference);
+        $objWriter->writeAttribute('authorId', $pAuthors[$pComment->getAuthor()]);
+
+        // text
+        $objWriter->startElement('text');
+        $this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $pComment->getText());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write VML comments to XML format
+     *
+     * @param     PHPExcel_Worksheet                $pWorksheet
+     * @return     string                                 XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeVMLComments(PHPExcel_Worksheet $pWorksheet = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+          // Comments cache
+          $comments    = $pWorksheet->getComments();
+
+        // xml
+        $objWriter->startElement('xml');
+        $objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
+        $objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
+        $objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
+
+        // o:shapelayout
+        $objWriter->startElement('o:shapelayout');
+        $objWriter->writeAttribute('v:ext', 'edit');
+
+            // o:idmap
+            $objWriter->startElement('o:idmap');
+            $objWriter->writeAttribute('v:ext', 'edit');
+            $objWriter->writeAttribute('data', '1');
+            $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // v:shapetype
+        $objWriter->startElement('v:shapetype');
+        $objWriter->writeAttribute('id', '_x0000_t202');
+        $objWriter->writeAttribute('coordsize', '21600,21600');
+        $objWriter->writeAttribute('o:spt', '202');
+        $objWriter->writeAttribute('path', 'm,l,21600r21600,l21600,xe');
+
+            // v:stroke
+            $objWriter->startElement('v:stroke');
+            $objWriter->writeAttribute('joinstyle', 'miter');
+            $objWriter->endElement();
+
+            // v:path
+            $objWriter->startElement('v:path');
+            $objWriter->writeAttribute('gradientshapeok', 't');
+            $objWriter->writeAttribute('o:connecttype', 'rect');
+            $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Loop through comments
+        foreach ($comments as $key => $value) {
+            $this->writeVMLComment($objWriter, $key, $value);
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write VML comment to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter        $objWriter             XML Writer
+     * @param    string                            $pCellReference        Cell reference
+     * @param     PHPExcel_Comment                $pComment            Comment
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeVMLComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null)
+    {
+         // Metadata
+         list($column, $row) = PHPExcel_Cell::coordinateFromString($pCellReference);
+         $column = PHPExcel_Cell::columnIndexFromString($column);
+         $id = 1024 + $column + $row;
+         $id = substr($id, 0, 4);
+
+        // v:shape
+        $objWriter->startElement('v:shape');
+        $objWriter->writeAttribute('id', '_x0000_s' . $id);
+        $objWriter->writeAttribute('type', '#_x0000_t202');
+        $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden'));
+        $objWriter->writeAttribute('fillcolor', '#' . $pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('o:insetmode', 'auto');
+
+            // v:fill
+            $objWriter->startElement('v:fill');
+            $objWriter->writeAttribute('color2', '#' . $pComment->getFillColor()->getRGB());
+            $objWriter->endElement();
+
+            // v:shadow
+            $objWriter->startElement('v:shadow');
+            $objWriter->writeAttribute('on', 't');
+            $objWriter->writeAttribute('color', 'black');
+            $objWriter->writeAttribute('obscured', 't');
+            $objWriter->endElement();
+
+            // v:path
+            $objWriter->startElement('v:path');
+            $objWriter->writeAttribute('o:connecttype', 'none');
+            $objWriter->endElement();
+
+            // v:textbox
+            $objWriter->startElement('v:textbox');
+            $objWriter->writeAttribute('style', 'mso-direction-alt:auto');
+
+                // div
+                $objWriter->startElement('div');
+                $objWriter->writeAttribute('style', 'text-align:left');
+                $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // x:ClientData
+            $objWriter->startElement('x:ClientData');
+            $objWriter->writeAttribute('ObjectType', 'Note');
+
+                // x:MoveWithCells
+                $objWriter->writeElement('x:MoveWithCells', '');
+
+                // x:SizeWithCells
+                $objWriter->writeElement('x:SizeWithCells', '');
+
+                // x:Anchor
+                //$objWriter->writeElement('x:Anchor', $column . ', 15, ' . ($row - 2) . ', 10, ' . ($column + 4) . ', 15, ' . ($row + 5) . ', 18');
+
+                // x:AutoFill
+                $objWriter->writeElement('x:AutoFill', 'False');
+
+                // x:Row
+                $objWriter->writeElement('x:Row', ($row - 1));
+
+                // x:Column
+                $objWriter->writeElement('x:Column', ($column - 1));
+
+            $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/ContentTypes.php b/lib/PHPExcel/Writer/Excel2007/ContentTypes.php
new file mode 100644
index 000000000..0d9118990
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/ContentTypes.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_ContentTypes
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write content types to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @param    boolean        $includeCharts    Flag indicating if we should include drawing details for charts
+     * @return     string                         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = false)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Types
+        $objWriter->startElement('Types');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/content-types');
+
+        // Theme
+        $this->writeOverrideContentType($objWriter, '/xl/theme/theme1.xml', 'application/vnd.openxmlformats-officedocument.theme+xml');
+
+        // Styles
+        $this->writeOverrideContentType($objWriter, '/xl/styles.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml');
+
+        // Rels
+        $this->writeDefaultContentType($objWriter, 'rels', 'application/vnd.openxmlformats-package.relationships+xml');
+
+        // XML
+        $this->writeDefaultContentType($objWriter, 'xml', 'application/xml');
+
+        // VML
+        $this->writeDefaultContentType($objWriter, 'vml', 'application/vnd.openxmlformats-officedocument.vmlDrawing');
+
+        // Workbook
+        if ($pPHPExcel->hasMacros()) { //Macros in workbook ?
+            // Yes : not standard content but "macroEnabled"
+            $this->writeOverrideContentType($objWriter, '/xl/workbook.xml', 'application/vnd.ms-excel.sheet.macroEnabled.main+xml');
+            //... and define a new type for the VBA project
+            $this->writeDefaultContentType($objWriter, 'bin', 'application/vnd.ms-office.vbaProject');
+            if ($pPHPExcel->hasMacrosCertificate()) {// signed macros ?
+                // Yes : add needed information
+                $this->writeOverrideContentType($objWriter, '/xl/vbaProjectSignature.bin', 'application/vnd.ms-office.vbaProjectSignature');
+            }
+        } else {// no macros in workbook, so standard type
+            $this->writeOverrideContentType($objWriter, '/xl/workbook.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml');
+        }
+
+        // DocProps
+        $this->writeOverrideContentType($objWriter, '/docProps/app.xml', 'application/vnd.openxmlformats-officedocument.extended-properties+xml');
+
+        $this->writeOverrideContentType($objWriter, '/docProps/core.xml', 'application/vnd.openxmlformats-package.core-properties+xml');
+
+        $customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
+        if (!empty($customPropertyList)) {
+            $this->writeOverrideContentType($objWriter, '/docProps/custom.xml', 'application/vnd.openxmlformats-officedocument.custom-properties+xml');
+        }
+
+        // Worksheets
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml');
+        }
+
+        // Shared strings
+        $this->writeOverrideContentType($objWriter, '/xl/sharedStrings.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml');
+
+        // Add worksheet relationship content types
+        $chart = 1;
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $drawings = $pPHPExcel->getSheet($i)->getDrawingCollection();
+            $drawingCount = count($drawings);
+            $chartCount = ($includeCharts) ? $pPHPExcel->getSheet($i)->getChartCount() : 0;
+
+            //    We need a drawing relationship for the worksheet if we have either drawings or charts
+            if (($drawingCount > 0) || ($chartCount > 0)) {
+                $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml');
+            }
+
+            //    If we have charts, then we need a chart relationship for every individual chart
+            if ($chartCount > 0) {
+                for ($c = 0; $c < $chartCount; ++$c) {
+                    $this->writeOverrideContentType($objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml');
+                }
+            }
+        }
+
+        // Comments
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            if (count($pPHPExcel->getSheet($i)->getComments()) > 0) {
+                $this->writeOverrideContentType($objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml');
+            }
+        }
+
+        // Add media content-types
+        $aMediaContentTypes = array();
+        $mediaCount = $this->getParentWriter()->getDrawingHashTable()->count();
+        for ($i = 0; $i < $mediaCount; ++$i) {
+            $extension     = '';
+            $mimeType     = '';
+
+            if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
+                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
+                $mimeType = $this->getImageMimeType($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath());
+            } elseif ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
+                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
+                $extension = explode('/', $extension);
+                $extension = $extension[1];
+
+                $mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
+            }
+
+            if (!isset( $aMediaContentTypes[$extension])) {
+                $aMediaContentTypes[$extension] = $mimeType;
+
+                $this->writeDefaultContentType($objWriter, $extension, $mimeType);
+            }
+        }
+        if ($pPHPExcel->hasRibbonBinObjects()) {
+            // Some additional objects in the ribbon ?
+            // we need to write "Extension" but not already write for media content
+            $tabRibbonTypes=array_diff($pPHPExcel->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
+            foreach ($tabRibbonTypes as $aRibbonType) {
+                $mimeType='image/.'.$aRibbonType;//we wrote $mimeType like customUI Editor
+                $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
+            }
+        }
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            if (count($pPHPExcel->getSheet()->getHeaderFooter()->getImages()) > 0) {
+                foreach ($pPHPExcel->getSheet()->getHeaderFooter()->getImages() as $image) {
+                    if (!isset( $aMediaContentTypes[strtolower($image->getExtension())])) {
+                        $aMediaContentTypes[strtolower($image->getExtension())] = $this->getImageMimeType($image->getPath());
+
+                        $this->writeDefaultContentType($objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]);
+                    }
+                }
+            }
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Get image mime type
+     *
+     * @param     string    $pFile    Filename
+     * @return     string    Mime Type
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function getImageMimeType($pFile = '')
+    {
+        if (PHPExcel_Shared_File::file_exists($pFile)) {
+            $image = getimagesize($pFile);
+            return image_type_to_mime_type($image[2]);
+        } else {
+            throw new PHPExcel_Writer_Exception("File $pFile does not exist");
+        }
+    }
+
+    /**
+     * Write Default content type
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     string                         $pPartname         Part name
+     * @param     string                         $pContentType     Content type
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeDefaultContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
+    {
+        if ($pPartname != '' && $pContentType != '') {
+            // Write content type
+            $objWriter->startElement('Default');
+            $objWriter->writeAttribute('Extension', $pPartname);
+            $objWriter->writeAttribute('ContentType', $pContentType);
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Write Override content type
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     string                         $pPartname         Part name
+     * @param     string                         $pContentType     Content type
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeOverrideContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
+    {
+        if ($pPartname != '' && $pContentType != '') {
+            // Write content type
+            $objWriter->startElement('Override');
+            $objWriter->writeAttribute('PartName', $pPartname);
+            $objWriter->writeAttribute('ContentType', $pContentType);
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/DocProps.php b/lib/PHPExcel/Writer/Excel2007/DocProps.php
new file mode 100644
index 000000000..fef3d9371
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/DocProps.php
@@ -0,0 +1,262 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_DocProps
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write docProps/app.xml to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeDocPropsApp(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Properties
+        $objWriter->startElement('Properties');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties');
+        $objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+
+        // Application
+        $objWriter->writeElement('Application', 'Microsoft Excel');
+
+        // DocSecurity
+        $objWriter->writeElement('DocSecurity', '0');
+
+        // ScaleCrop
+        $objWriter->writeElement('ScaleCrop', 'false');
+
+        // HeadingPairs
+        $objWriter->startElement('HeadingPairs');
+
+        // Vector
+        $objWriter->startElement('vt:vector');
+        $objWriter->writeAttribute('size', '2');
+        $objWriter->writeAttribute('baseType', 'variant');
+
+        // Variant
+        $objWriter->startElement('vt:variant');
+        $objWriter->writeElement('vt:lpstr', 'Worksheets');
+        $objWriter->endElement();
+
+        // Variant
+        $objWriter->startElement('vt:variant');
+        $objWriter->writeElement('vt:i4', $pPHPExcel->getSheetCount());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // TitlesOfParts
+        $objWriter->startElement('TitlesOfParts');
+
+        // Vector
+        $objWriter->startElement('vt:vector');
+        $objWriter->writeAttribute('size', $pPHPExcel->getSheetCount());
+        $objWriter->writeAttribute('baseType', 'lpstr');
+
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $objWriter->writeElement('vt:lpstr', $pPHPExcel->getSheet($i)->getTitle());
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Company
+        $objWriter->writeElement('Company', $pPHPExcel->getProperties()->getCompany());
+
+        // Company
+        $objWriter->writeElement('Manager', $pPHPExcel->getProperties()->getManager());
+
+        // LinksUpToDate
+        $objWriter->writeElement('LinksUpToDate', 'false');
+
+        // SharedDoc
+        $objWriter->writeElement('SharedDoc', 'false');
+
+        // HyperlinksChanged
+        $objWriter->writeElement('HyperlinksChanged', 'false');
+
+        // AppVersion
+        $objWriter->writeElement('AppVersion', '12.0000');
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write docProps/core.xml to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeDocPropsCore(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // cp:coreProperties
+        $objWriter->startElement('cp:coreProperties');
+        $objWriter->writeAttribute('xmlns:cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
+        $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+        $objWriter->writeAttribute('xmlns:dcterms', 'http://purl.org/dc/terms/');
+        $objWriter->writeAttribute('xmlns:dcmitype', 'http://purl.org/dc/dcmitype/');
+        $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+
+        // dc:creator
+        $objWriter->writeElement('dc:creator', $pPHPExcel->getProperties()->getCreator());
+
+        // cp:lastModifiedBy
+        $objWriter->writeElement('cp:lastModifiedBy', $pPHPExcel->getProperties()->getLastModifiedBy());
+
+        // dcterms:created
+        $objWriter->startElement('dcterms:created');
+        $objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
+        $objWriter->writeRawData(date(DATE_W3C, $pPHPExcel->getProperties()->getCreated()));
+        $objWriter->endElement();
+
+        // dcterms:modified
+        $objWriter->startElement('dcterms:modified');
+        $objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
+        $objWriter->writeRawData(date(DATE_W3C, $pPHPExcel->getProperties()->getModified()));
+        $objWriter->endElement();
+
+        // dc:title
+        $objWriter->writeElement('dc:title', $pPHPExcel->getProperties()->getTitle());
+
+        // dc:description
+        $objWriter->writeElement('dc:description', $pPHPExcel->getProperties()->getDescription());
+
+        // dc:subject
+        $objWriter->writeElement('dc:subject', $pPHPExcel->getProperties()->getSubject());
+
+        // cp:keywords
+        $objWriter->writeElement('cp:keywords', $pPHPExcel->getProperties()->getKeywords());
+
+        // cp:category
+        $objWriter->writeElement('cp:category', $pPHPExcel->getProperties()->getCategory());
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write docProps/custom.xml to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeDocPropsCustom(PHPExcel $pPHPExcel = null)
+    {
+        $customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
+        if (empty($customPropertyList)) {
+            return;
+        }
+
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // cp:coreProperties
+        $objWriter->startElement('Properties');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties');
+        $objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+
+
+        foreach ($customPropertyList as $key => $customProperty) {
+            $propertyValue = $pPHPExcel->getProperties()->getCustomPropertyValue($customProperty);
+            $propertyType = $pPHPExcel->getProperties()->getCustomPropertyType($customProperty);
+
+            $objWriter->startElement('property');
+            $objWriter->writeAttribute('fmtid', '{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
+            $objWriter->writeAttribute('pid', $key+2);
+            $objWriter->writeAttribute('name', $customProperty);
+
+            switch ($propertyType) {
+                case 'i':
+                    $objWriter->writeElement('vt:i4', $propertyValue);
+                    break;
+                case 'f':
+                    $objWriter->writeElement('vt:r8', $propertyValue);
+                    break;
+                case 'b':
+                    $objWriter->writeElement('vt:bool', ($propertyValue) ? 'true' : 'false');
+                    break;
+                case 'd':
+                    $objWriter->startElement('vt:filetime');
+                    $objWriter->writeRawData(date(DATE_W3C, $propertyValue));
+                    $objWriter->endElement();
+                    break;
+                default:
+                    $objWriter->writeElement('vt:lpwstr', $propertyValue);
+                    break;
+            }
+
+            $objWriter->endElement();
+        }
+
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Drawing.php b/lib/PHPExcel/Writer/Excel2007/Drawing.php
new file mode 100644
index 000000000..281438889
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Drawing.php
@@ -0,0 +1,589 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_Drawing
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write drawings to XML format
+     *
+     * @param     PHPExcel_Worksheet    $pWorksheet
+     * @param    int                    &$chartRef        Chart ID
+     * @param    boolean                $includeCharts    Flag indicating if we should include drawing details for charts
+     * @return     string                 XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeDrawings(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = false)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // xdr:wsDr
+        $objWriter->startElement('xdr:wsDr');
+        $objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
+        $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+
+        // Loop through images and write drawings
+        $i = 1;
+        $iterator = $pWorksheet->getDrawingCollection()->getIterator();
+        while ($iterator->valid()) {
+            $this->writeDrawing($objWriter, $iterator->current(), $i);
+
+            $iterator->next();
+            ++$i;
+        }
+
+        if ($includeCharts) {
+            $chartCount = $pWorksheet->getChartCount();
+            // Loop through charts and write the chart position
+            if ($chartCount > 0) {
+                for ($c = 0; $c < $chartCount; ++$c) {
+                    $this->writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c+$i);
+                }
+            }
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write drawings to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel_Chart                $pChart
+     * @param     int                            $pRelationId
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeChart(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Chart $pChart = null, $pRelationId = -1)
+    {
+        $tl = $pChart->getTopLeftPosition();
+        $tl['colRow'] = PHPExcel_Cell::coordinateFromString($tl['cell']);
+        $br = $pChart->getBottomRightPosition();
+        $br['colRow'] = PHPExcel_Cell::coordinateFromString($br['cell']);
+
+        $objWriter->startElement('xdr:twoCellAnchor');
+
+            $objWriter->startElement('xdr:from');
+                $objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($tl['colRow'][0]) - 1);
+                $objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['xOffset']));
+                $objWriter->writeElement('xdr:row', $tl['colRow'][1] - 1);
+                $objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['yOffset']));
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:to');
+                $objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($br['colRow'][0]) - 1);
+                $objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['xOffset']));
+                $objWriter->writeElement('xdr:row', $br['colRow'][1] - 1);
+                $objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['yOffset']));
+            $objWriter->endElement();
+
+            $objWriter->startElement('xdr:graphicFrame');
+                $objWriter->writeAttribute('macro', '');
+                $objWriter->startElement('xdr:nvGraphicFramePr');
+                    $objWriter->startElement('xdr:cNvPr');
+                        $objWriter->writeAttribute('name', 'Chart '.$pRelationId);
+                        $objWriter->writeAttribute('id', 1025 * $pRelationId);
+                    $objWriter->endElement();
+                    $objWriter->startElement('xdr:cNvGraphicFramePr');
+                        $objWriter->startElement('a:graphicFrameLocks');
+                        $objWriter->endElement();
+                    $objWriter->endElement();
+                $objWriter->endElement();
+
+                $objWriter->startElement('xdr:xfrm');
+                    $objWriter->startElement('a:off');
+                        $objWriter->writeAttribute('x', '0');
+                        $objWriter->writeAttribute('y', '0');
+                    $objWriter->endElement();
+                    $objWriter->startElement('a:ext');
+                        $objWriter->writeAttribute('cx', '0');
+                        $objWriter->writeAttribute('cy', '0');
+                    $objWriter->endElement();
+                $objWriter->endElement();
+
+                $objWriter->startElement('a:graphic');
+                    $objWriter->startElement('a:graphicData');
+                        $objWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+                        $objWriter->startElement('c:chart');
+                            $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+                            $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+                            $objWriter->writeAttribute('r:id', 'rId'.$pRelationId);
+                        $objWriter->endElement();
+                    $objWriter->endElement();
+                $objWriter->endElement();
+            $objWriter->endElement();
+
+            $objWriter->startElement('xdr:clientData');
+            $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write drawings to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter            $objWriter         XML Writer
+     * @param     PHPExcel_Worksheet_BaseDrawing        $pDrawing
+     * @param     int                                    $pRelationId
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet_BaseDrawing $pDrawing = null, $pRelationId = -1)
+    {
+        if ($pRelationId >= 0) {
+            // xdr:oneCellAnchor
+            $objWriter->startElement('xdr:oneCellAnchor');
+            // Image location
+            $aCoordinates         = PHPExcel_Cell::coordinateFromString($pDrawing->getCoordinates());
+            $aCoordinates[0]     = PHPExcel_Cell::columnIndexFromString($aCoordinates[0]);
+
+            // xdr:from
+            $objWriter->startElement('xdr:from');
+            $objWriter->writeElement('xdr:col', $aCoordinates[0] - 1);
+            $objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetX()));
+            $objWriter->writeElement('xdr:row', $aCoordinates[1] - 1);
+            $objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetY()));
+            $objWriter->endElement();
+
+            // xdr:ext
+            $objWriter->startElement('xdr:ext');
+            $objWriter->writeAttribute('cx', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getWidth()));
+            $objWriter->writeAttribute('cy', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getHeight()));
+            $objWriter->endElement();
+
+            // xdr:pic
+            $objWriter->startElement('xdr:pic');
+
+            // xdr:nvPicPr
+            $objWriter->startElement('xdr:nvPicPr');
+
+            // xdr:cNvPr
+            $objWriter->startElement('xdr:cNvPr');
+            $objWriter->writeAttribute('id', $pRelationId);
+            $objWriter->writeAttribute('name', $pDrawing->getName());
+            $objWriter->writeAttribute('descr', $pDrawing->getDescription());
+            $objWriter->endElement();
+
+            // xdr:cNvPicPr
+            $objWriter->startElement('xdr:cNvPicPr');
+
+            // a:picLocks
+            $objWriter->startElement('a:picLocks');
+            $objWriter->writeAttribute('noChangeAspect', '1');
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // xdr:blipFill
+            $objWriter->startElement('xdr:blipFill');
+
+            // a:blip
+            $objWriter->startElement('a:blip');
+            $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+            $objWriter->writeAttribute('r:embed', 'rId' . $pRelationId);
+            $objWriter->endElement();
+
+            // a:stretch
+            $objWriter->startElement('a:stretch');
+                $objWriter->writeElement('a:fillRect', null);
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // xdr:spPr
+            $objWriter->startElement('xdr:spPr');
+
+            // a:xfrm
+            $objWriter->startElement('a:xfrm');
+            $objWriter->writeAttribute('rot', PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getRotation()));
+            $objWriter->endElement();
+
+            // a:prstGeom
+            $objWriter->startElement('a:prstGeom');
+            $objWriter->writeAttribute('prst', 'rect');
+
+            // a:avLst
+            $objWriter->writeElement('a:avLst', null);
+
+            $objWriter->endElement();
+
+//                        // a:solidFill
+//                        $objWriter->startElement('a:solidFill');
+
+//                            // a:srgbClr
+//                            $objWriter->startElement('a:srgbClr');
+//                            $objWriter->writeAttribute('val', 'FFFFFF');
+
+///* SHADE
+//                                // a:shade
+//                                $objWriter->startElement('a:shade');
+//                                $objWriter->writeAttribute('val', '85000');
+//                                $objWriter->endElement();
+//*/
+
+//                            $objWriter->endElement();
+
+//                        $objWriter->endElement();
+/*
+            // a:ln
+            $objWriter->startElement('a:ln');
+            $objWriter->writeAttribute('w', '88900');
+            $objWriter->writeAttribute('cap', 'sq');
+
+                // a:solidFill
+                $objWriter->startElement('a:solidFill');
+
+                    // a:srgbClr
+                    $objWriter->startElement('a:srgbClr');
+                    $objWriter->writeAttribute('val', 'FFFFFF');
+                    $objWriter->endElement();
+
+                $objWriter->endElement();
+
+                // a:miter
+                $objWriter->startElement('a:miter');
+                $objWriter->writeAttribute('lim', '800000');
+                $objWriter->endElement();
+
+            $objWriter->endElement();
+*/
+
+            if ($pDrawing->getShadow()->getVisible()) {
+                // a:effectLst
+                $objWriter->startElement('a:effectLst');
+
+                // a:outerShdw
+                $objWriter->startElement('a:outerShdw');
+                $objWriter->writeAttribute('blurRad', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getBlurRadius()));
+                $objWriter->writeAttribute('dist', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getDistance()));
+                $objWriter->writeAttribute('dir', PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getShadow()->getDirection()));
+                $objWriter->writeAttribute('algn', $pDrawing->getShadow()->getAlignment());
+                $objWriter->writeAttribute('rotWithShape', '0');
+
+                // a:srgbClr
+                $objWriter->startElement('a:srgbClr');
+                $objWriter->writeAttribute('val', $pDrawing->getShadow()->getColor()->getRGB());
+
+                // a:alpha
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', $pDrawing->getShadow()->getAlpha() * 1000);
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+            }
+/*
+
+                // a:scene3d
+                $objWriter->startElement('a:scene3d');
+
+                    // a:camera
+                    $objWriter->startElement('a:camera');
+                    $objWriter->writeAttribute('prst', 'orthographicFront');
+                    $objWriter->endElement();
+
+                    // a:lightRig
+                    $objWriter->startElement('a:lightRig');
+                    $objWriter->writeAttribute('rig', 'twoPt');
+                    $objWriter->writeAttribute('dir', 't');
+
+                        // a:rot
+                        $objWriter->startElement('a:rot');
+                        $objWriter->writeAttribute('lat', '0');
+                        $objWriter->writeAttribute('lon', '0');
+                        $objWriter->writeAttribute('rev', '0');
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                $objWriter->endElement();
+*/
+/*
+                // a:sp3d
+                $objWriter->startElement('a:sp3d');
+
+                    // a:bevelT
+                    $objWriter->startElement('a:bevelT');
+                    $objWriter->writeAttribute('w', '25400');
+                    $objWriter->writeAttribute('h', '19050');
+                    $objWriter->endElement();
+
+                    // a:contourClr
+                    $objWriter->startElement('a:contourClr');
+
+                        // a:srgbClr
+                        $objWriter->startElement('a:srgbClr');
+                        $objWriter->writeAttribute('val', 'FFFFFF');
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                $objWriter->endElement();
+*/
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // xdr:clientData
+            $objWriter->writeElement('xdr:clientData', null);
+
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Write VML header/footer images to XML format
+     *
+     * @param     PHPExcel_Worksheet                $pWorksheet
+     * @return     string                                 XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeVMLHeaderFooterImages(PHPExcel_Worksheet $pWorksheet = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Header/footer images
+        $images = $pWorksheet->getHeaderFooter()->getImages();
+
+        // xml
+        $objWriter->startElement('xml');
+        $objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
+        $objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
+        $objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
+
+        // o:shapelayout
+        $objWriter->startElement('o:shapelayout');
+        $objWriter->writeAttribute('v:ext', 'edit');
+
+        // o:idmap
+        $objWriter->startElement('o:idmap');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('data', '1');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // v:shapetype
+        $objWriter->startElement('v:shapetype');
+        $objWriter->writeAttribute('id', '_x0000_t75');
+        $objWriter->writeAttribute('coordsize', '21600,21600');
+        $objWriter->writeAttribute('o:spt', '75');
+        $objWriter->writeAttribute('o:preferrelative', 't');
+        $objWriter->writeAttribute('path', 'm@4@5l@4@11@9@11@9@5xe');
+        $objWriter->writeAttribute('filled', 'f');
+        $objWriter->writeAttribute('stroked', 'f');
+
+        // v:stroke
+        $objWriter->startElement('v:stroke');
+        $objWriter->writeAttribute('joinstyle', 'miter');
+        $objWriter->endElement();
+
+        // v:formulas
+        $objWriter->startElement('v:formulas');
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'if lineDrawn pixelLineWidth 0');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @0 1 0');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum 0 0 @1');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @2 1 2');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @3 21600 pixelWidth');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @3 21600 pixelHeight');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @0 0 1');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @6 1 2');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @7 21600 pixelWidth');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @8 21600 0');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @7 21600 pixelHeight');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @10 21600 0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // v:path
+        $objWriter->startElement('v:path');
+        $objWriter->writeAttribute('o:extrusionok', 'f');
+        $objWriter->writeAttribute('gradientshapeok', 't');
+        $objWriter->writeAttribute('o:connecttype', 'rect');
+        $objWriter->endElement();
+
+        // o:lock
+        $objWriter->startElement('o:lock');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('aspectratio', 't');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Loop through images
+        foreach ($images as $key => $value) {
+            $this->writeVMLHeaderFooterImage($objWriter, $key, $value);
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write VML comment to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter        $objWriter             XML Writer
+     * @param    string                            $pReference            Reference
+     * @param     PHPExcel_Worksheet_HeaderFooterDrawing    $pImage        Image
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeVMLHeaderFooterImage(PHPExcel_Shared_XMLWriter $objWriter = null, $pReference = '', PHPExcel_Worksheet_HeaderFooterDrawing $pImage = null)
+    {
+        // Calculate object id
+        preg_match('{(\d+)}', md5($pReference), $m);
+        $id = 1500 + (substr($m[1], 0, 2) * 1);
+
+        // Calculate offset
+        $width = $pImage->getWidth();
+        $height = $pImage->getHeight();
+        $marginLeft = $pImage->getOffsetX();
+        $marginTop = $pImage->getOffsetY();
+
+        // v:shape
+        $objWriter->startElement('v:shape');
+        $objWriter->writeAttribute('id', $pReference);
+        $objWriter->writeAttribute('o:spid', '_x0000_s' . $id);
+        $objWriter->writeAttribute('type', '#_x0000_t75');
+        $objWriter->writeAttribute('style', "position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1");
+
+        // v:imagedata
+        $objWriter->startElement('v:imagedata');
+        $objWriter->writeAttribute('o:relid', 'rId' . $pReference);
+        $objWriter->writeAttribute('o:title', $pImage->getName());
+        $objWriter->endElement();
+
+        // o:lock
+        $objWriter->startElement('o:lock');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('rotation', 't');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+
+    /**
+     * Get an array of all drawings
+     *
+     * @param     PHPExcel                            $pPHPExcel
+     * @return     PHPExcel_Worksheet_Drawing[]        All drawings in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allDrawings(PHPExcel $pPHPExcel = null)
+    {
+        // Get an array of all drawings
+        $aDrawings    = array();
+
+        // Loop through PHPExcel
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // Loop through images and add to array
+            $iterator = $pPHPExcel->getSheet($i)->getDrawingCollection()->getIterator();
+            while ($iterator->valid()) {
+                $aDrawings[] = $iterator->current();
+
+                  $iterator->next();
+            }
+        }
+
+        return $aDrawings;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Rels.php b/lib/PHPExcel/Writer/Excel2007/Rels.php
new file mode 100644
index 000000000..14ff33710
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Rels.php
@@ -0,0 +1,424 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_Rels
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write relationships to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeRelationships(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+
+        $customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
+        if (!empty($customPropertyList)) {
+            // Relationship docProps/app.xml
+            $this->writeRelationship(
+                $objWriter,
+                4,
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
+                'docProps/custom.xml'
+            );
+
+        }
+
+        // Relationship docProps/app.xml
+        $this->writeRelationship(
+            $objWriter,
+            3,
+            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
+            'docProps/app.xml'
+        );
+
+        // Relationship docProps/core.xml
+        $this->writeRelationship(
+            $objWriter,
+            2,
+            'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
+            'docProps/core.xml'
+        );
+
+        // Relationship xl/workbook.xml
+        $this->writeRelationship(
+            $objWriter,
+            1,
+            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
+            'xl/workbook.xml'
+        );
+        // a custom UI in workbook ?
+        if ($pPHPExcel->hasRibbon()) {
+            $this->writeRelationShip(
+                $objWriter,
+                5,
+                'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility',
+                $pPHPExcel->getRibbonXMLData('target')
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write workbook relationships to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeWorkbookRelationships(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+
+        // Relationship styles.xml
+        $this->writeRelationship(
+            $objWriter,
+            1,
+            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
+            'styles.xml'
+        );
+
+        // Relationship theme/theme1.xml
+        $this->writeRelationship(
+            $objWriter,
+            2,
+            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
+            'theme/theme1.xml'
+        );
+
+        // Relationship sharedStrings.xml
+        $this->writeRelationship(
+            $objWriter,
+            3,
+            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
+            'sharedStrings.xml'
+        );
+
+        // Relationships with sheets
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $this->writeRelationship(
+                $objWriter,
+                ($i + 1 + 3),
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
+                'worksheets/sheet' . ($i + 1) . '.xml'
+            );
+        }
+        // Relationships for vbaProject if needed
+        // id : just after the last sheet
+        if ($pPHPExcel->hasMacros()) {
+            $this->writeRelationShip(
+                $objWriter,
+                ($i + 1 + 3),
+                'http://schemas.microsoft.com/office/2006/relationships/vbaProject',
+                'vbaProject.bin'
+            );
+            ++$i;//increment i if needed for an another relation
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write worksheet relationships to XML format
+     *
+     * Numbering is as follows:
+     *     rId1                 - Drawings
+     *  rId_hyperlink_x     - Hyperlinks
+     *
+     * @param     PHPExcel_Worksheet    $pWorksheet
+     * @param     int                    $pWorksheetId
+     * @param    boolean                $includeCharts    Flag indicating if we should write charts
+     * @return     string                 XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeWorksheetRelationships(PHPExcel_Worksheet $pWorksheet = null, $pWorksheetId = 1, $includeCharts = false)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+
+        // Write drawing relationships?
+        $d = 0;
+        if ($includeCharts) {
+            $charts = $pWorksheet->getChartCollection();
+        } else {
+            $charts = array();
+        }
+        if (($pWorksheet->getDrawingCollection()->count() > 0) ||
+            (count($charts) > 0)) {
+            $this->writeRelationship(
+                $objWriter,
+                ++$d,
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
+                '../drawings/drawing' . $pWorksheetId . '.xml'
+            );
+        }
+
+        // Write chart relationships?
+//            $chartCount = 0;
+//            $charts = $pWorksheet->getChartCollection();
+//            echo 'Chart Rels: ' , count($charts) , '<br />';
+//            if (count($charts) > 0) {
+//                foreach ($charts as $chart) {
+//                    $this->writeRelationship(
+//                        $objWriter,
+//                        ++$d,
+//                        'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
+//                        '../charts/chart' . ++$chartCount . '.xml'
+//                    );
+//                }
+//            }
+//
+        // Write hyperlink relationships?
+        $i = 1;
+        foreach ($pWorksheet->getHyperlinkCollection() as $hyperlink) {
+            if (!$hyperlink->isInternal()) {
+                $this->writeRelationship(
+                    $objWriter,
+                    '_hyperlink_' . $i,
+                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+                    $hyperlink->getUrl(),
+                    'External'
+                );
+
+                ++$i;
+            }
+        }
+
+        // Write comments relationship?
+        $i = 1;
+        if (count($pWorksheet->getComments()) > 0) {
+            $this->writeRelationship(
+                $objWriter,
+                '_comments_vml' . $i,
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
+                '../drawings/vmlDrawing' . $pWorksheetId . '.vml'
+            );
+
+            $this->writeRelationship(
+                $objWriter,
+                '_comments' . $i,
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments',
+                '../comments' . $pWorksheetId . '.xml'
+            );
+        }
+
+        // Write header/footer relationship?
+        $i = 1;
+        if (count($pWorksheet->getHeaderFooter()->getImages()) > 0) {
+            $this->writeRelationship(
+                $objWriter,
+                '_headerfooter_vml' . $i,
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
+                '../drawings/vmlDrawingHF' . $pWorksheetId . '.vml'
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write drawing relationships to XML format
+     *
+     * @param     PHPExcel_Worksheet    $pWorksheet
+     * @param    int                    &$chartRef        Chart ID
+     * @param    boolean                $includeCharts    Flag indicating if we should write charts
+     * @return     string                 XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = false)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+
+        // Loop through images and write relationships
+        $i = 1;
+        $iterator = $pWorksheet->getDrawingCollection()->getIterator();
+        while ($iterator->valid()) {
+            if ($iterator->current() instanceof PHPExcel_Worksheet_Drawing
+                || $iterator->current() instanceof PHPExcel_Worksheet_MemoryDrawing) {
+                // Write relationship for image drawing
+                $this->writeRelationship(
+                    $objWriter,
+                    $i,
+                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
+                    '../media/' . str_replace(' ', '', $iterator->current()->getIndexedFilename())
+                );
+            }
+
+            $iterator->next();
+            ++$i;
+        }
+
+        if ($includeCharts) {
+            // Loop through charts and write relationships
+            $chartCount = $pWorksheet->getChartCount();
+            if ($chartCount > 0) {
+                for ($c = 0; $c < $chartCount; ++$c) {
+                    $this->writeRelationship(
+                        $objWriter,
+                        $i++,
+                        'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
+                        '../charts/chart' . ++$chartRef . '.xml'
+                    );
+                }
+            }
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write header/footer drawing relationships to XML format
+     *
+     * @param     PHPExcel_Worksheet            $pWorksheet
+     * @return     string                         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeHeaderFooterDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+
+        // Loop through images and write relationships
+        foreach ($pWorksheet->getHeaderFooter()->getImages() as $key => $value) {
+            // Write relationship for image drawing
+            $this->writeRelationship(
+                $objWriter,
+                $key,
+                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
+                '../media/' . $value->getIndexedFilename()
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write Override content type
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     int                            $pId            Relationship ID. rId will be prepended!
+     * @param     string                        $pType            Relationship type
+     * @param     string                         $pTarget        Relationship target
+     * @param     string                         $pTargetMode    Relationship target mode
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeRelationship(PHPExcel_Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
+    {
+        if ($pType != '' && $pTarget != '') {
+            // Write relationship
+            $objWriter->startElement('Relationship');
+            $objWriter->writeAttribute('Id', 'rId' . $pId);
+            $objWriter->writeAttribute('Type', $pType);
+            $objWriter->writeAttribute('Target', $pTarget);
+
+            if ($pTargetMode != '') {
+                $objWriter->writeAttribute('TargetMode', $pTargetMode);
+            }
+
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/RelsRibbon.php b/lib/PHPExcel/Writer/Excel2007/RelsRibbon.php
new file mode 100644
index 000000000..5a4a9fc09
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/RelsRibbon.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_RelsRibbon
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version     ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_RelsRibbon extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write relationships for additional objects of custom UI (ribbon)
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeRibbonRelationships(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $localRels = $pPHPExcel->getRibbonBinObjects('names');
+        if (is_array($localRels)) {
+            foreach ($localRels as $aId => $aTarget) {
+                $objWriter->startElement('Relationship');
+                $objWriter->writeAttribute('Id', $aId);
+                $objWriter->writeAttribute('Type', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image');
+                $objWriter->writeAttribute('Target', $aTarget);
+                $objWriter->endElement();
+            }
+        }
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/RelsVBA.php b/lib/PHPExcel/Writer/Excel2007/RelsVBA.php
new file mode 100644
index 000000000..bee0e6436
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/RelsVBA.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_RelsVBA
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version     ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_RelsVBA extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write relationships for a signed VBA Project
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeVBARelationships(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->startElement('Relationship');
+        $objWriter->writeAttribute('Id', 'rId1');
+        $objWriter->writeAttribute('Type', 'http://schemas.microsoft.com/office/2006/relationships/vbaProjectSignature');
+        $objWriter->writeAttribute('Target', 'vbaProjectSignature.bin');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/StringTable.php b/lib/PHPExcel/Writer/Excel2007/StringTable.php
new file mode 100644
index 000000000..fccec669f
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/StringTable.php
@@ -0,0 +1,313 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_StringTable
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Create worksheet stringtable
+     *
+     * @param     PHPExcel_Worksheet     $pSheet                Worksheet
+     * @param     string[]                 $pExistingTable     Existing table to eventually merge with
+     * @return     string[]                 String table for worksheet
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function createStringTable($pSheet = null, $pExistingTable = null)
+    {
+        if ($pSheet !== null) {
+            // Create string lookup table
+            $aStringTable = array();
+            $cellCollection = null;
+            $aFlippedStringTable = null;    // For faster lookup
+
+            // Is an existing table given?
+            if (($pExistingTable !== null) && is_array($pExistingTable)) {
+                $aStringTable = $pExistingTable;
+            }
+
+            // Fill index array
+            $aFlippedStringTable = $this->flipStringTable($aStringTable);
+
+            // Loop through cells
+            foreach ($pSheet->getCellCollection() as $cellID) {
+                $cell = $pSheet->getCell($cellID);
+                $cellValue = $cell->getValue();
+                if (!is_object($cellValue) &&
+                    ($cellValue !== null) &&
+                    $cellValue !== '' &&
+                    !isset($aFlippedStringTable[$cellValue]) &&
+                    ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING2 || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_NULL)) {
+                        $aStringTable[] = $cellValue;
+                        $aFlippedStringTable[$cellValue] = true;
+                } elseif ($cellValue instanceof PHPExcel_RichText &&
+                          ($cellValue !== null) &&
+                          !isset($aFlippedStringTable[$cellValue->getHashCode()])) {
+                                $aStringTable[] = $cellValue;
+                                $aFlippedStringTable[$cellValue->getHashCode()] = true;
+                }
+            }
+
+            return $aStringTable;
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid PHPExcel_Worksheet object passed.");
+        }
+    }
+
+    /**
+     * Write string table to XML format
+     *
+     * @param     string[]     $pStringTable
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeStringTable($pStringTable = null)
+    {
+        if ($pStringTable !== null) {
+            // Create XML writer
+            $objWriter = null;
+            if ($this->getParentWriter()->getUseDiskCaching()) {
+                $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+            } else {
+                $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+            }
+
+            // XML header
+            $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+            // String table
+            $objWriter->startElement('sst');
+            $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+            $objWriter->writeAttribute('uniqueCount', count($pStringTable));
+
+            // Loop through string table
+            foreach ($pStringTable as $textElement) {
+                $objWriter->startElement('si');
+
+                if (! $textElement instanceof PHPExcel_RichText) {
+                    $textToWrite = PHPExcel_Shared_String::ControlCharacterPHP2OOXML($textElement);
+                    $objWriter->startElement('t');
+                    if ($textToWrite !== trim($textToWrite)) {
+                        $objWriter->writeAttribute('xml:space', 'preserve');
+                    }
+                    $objWriter->writeRawData($textToWrite);
+                    $objWriter->endElement();
+                } elseif ($textElement instanceof PHPExcel_RichText) {
+                    $this->writeRichText($objWriter, $textElement);
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+
+            return $objWriter->getData();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid string table array passed.");
+        }
+    }
+
+    /**
+     * Write Rich Text
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel_RichText            $pRichText        Rich text
+     * @param     string                        $prefix            Optional Namespace prefix
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeRichText(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_RichText $pRichText = null, $prefix = null)
+    {
+        if ($prefix !== null) {
+            $prefix .= ':';
+        }
+            
+        // Loop through rich text elements
+        $elements = $pRichText->getRichTextElements();
+        foreach ($elements as $element) {
+            // r
+            $objWriter->startElement($prefix.'r');
+
+            // rPr
+            if ($element instanceof PHPExcel_RichText_Run) {
+                // rPr
+                $objWriter->startElement($prefix.'rPr');
+
+                // rFont
+                $objWriter->startElement($prefix.'rFont');
+                $objWriter->writeAttribute('val', $element->getFont()->getName());
+                $objWriter->endElement();
+
+                // Bold
+                $objWriter->startElement($prefix.'b');
+                $objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
+                $objWriter->endElement();
+
+                // Italic
+                $objWriter->startElement($prefix.'i');
+                $objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
+                $objWriter->endElement();
+
+                // Superscript / subscript
+                if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
+                    $objWriter->startElement($prefix.'vertAlign');
+                    if ($element->getFont()->getSuperScript()) {
+                        $objWriter->writeAttribute('val', 'superscript');
+                    } elseif ($element->getFont()->getSubScript()) {
+                        $objWriter->writeAttribute('val', 'subscript');
+                    }
+                    $objWriter->endElement();
+                }
+
+                // Strikethrough
+                $objWriter->startElement($prefix.'strike');
+                $objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
+                $objWriter->endElement();
+
+                // Color
+                $objWriter->startElement($prefix.'color');
+                $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
+                $objWriter->endElement();
+
+                // Size
+                $objWriter->startElement($prefix.'sz');
+                $objWriter->writeAttribute('val', $element->getFont()->getSize());
+                $objWriter->endElement();
+
+                // Underline
+                $objWriter->startElement($prefix.'u');
+                $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+            }
+
+            // t
+            $objWriter->startElement($prefix.'t');
+            $objWriter->writeAttribute('xml:space', 'preserve');
+            $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML($element->getText()));
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Rich Text
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     string|PHPExcel_RichText    $pRichText        text string or Rich text
+     * @param     string                        $prefix            Optional Namespace prefix
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeRichTextForCharts(PHPExcel_Shared_XMLWriter $objWriter = null, $pRichText = null, $prefix = null)
+    {
+        if (!$pRichText instanceof PHPExcel_RichText) {
+            $textRun = $pRichText;
+            $pRichText = new PHPExcel_RichText();
+            $pRichText->createTextRun($textRun);
+        }
+
+        if ($prefix !== null) {
+            $prefix .= ':';
+        }
+            
+        // Loop through rich text elements
+        $elements = $pRichText->getRichTextElements();
+        foreach ($elements as $element) {
+            // r
+            $objWriter->startElement($prefix.'r');
+
+            // rPr
+            $objWriter->startElement($prefix.'rPr');
+
+            // Bold
+            $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
+            // Italic
+            $objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? 1 : 0));
+            // Underline
+            $underlineType = $element->getFont()->getUnderline();
+            switch ($underlineType) {
+                case 'single':
+                    $underlineType = 'sng';
+                    break;
+                case 'double':
+                    $underlineType = 'dbl';
+                    break;
+            }
+            $objWriter->writeAttribute('u', $underlineType);
+            // Strikethrough
+            $objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
+
+            // rFont
+            $objWriter->startElement($prefix.'latin');
+                $objWriter->writeAttribute('typeface', $element->getFont()->getName());
+            $objWriter->endElement();
+
+                // Superscript / subscript
+//                    if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
+//                        $objWriter->startElement($prefix.'vertAlign');
+//                        if ($element->getFont()->getSuperScript()) {
+//                            $objWriter->writeAttribute('val', 'superscript');
+//                        } elseif ($element->getFont()->getSubScript()) {
+//                            $objWriter->writeAttribute('val', 'subscript');
+//                        }
+//                        $objWriter->endElement();
+//                    }
+//
+            $objWriter->endElement();
+
+            // t
+            $objWriter->startElement($prefix.'t');
+//                    $objWriter->writeAttribute('xml:space', 'preserve');    //    Excel2010 accepts, Excel2007 complains
+            $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML($element->getText()));
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Flip string table (for index searching)
+     *
+     * @param     array    $stringTable    Stringtable
+     * @return     array
+     */
+    public function flipStringTable($stringTable = array())
+    {
+        // Return value
+        $returnValue = array();
+
+        // Loop through stringtable and add flipped items to $returnValue
+        foreach ($stringTable as $key => $value) {
+            if (! $value instanceof PHPExcel_RichText) {
+                $returnValue[$value] = $key;
+            } elseif ($value instanceof PHPExcel_RichText) {
+                $returnValue[$value->getHashCode()] = $key;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Style.php b/lib/PHPExcel/Writer/Excel2007/Style.php
new file mode 100644
index 000000000..d3f0af7b2
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Style.php
@@ -0,0 +1,696 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_Style
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write styles to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeStyles(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // styleSheet
+        $objWriter->startElement('styleSheet');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+
+        // numFmts
+        $objWriter->startElement('numFmts');
+        $objWriter->writeAttribute('count', $this->getParentWriter()->getNumFmtHashTable()->count());
+
+        // numFmt
+        for ($i = 0; $i < $this->getParentWriter()->getNumFmtHashTable()->count(); ++$i) {
+            $this->writeNumFmt($objWriter, $this->getParentWriter()->getNumFmtHashTable()->getByIndex($i), $i);
+        }
+
+        $objWriter->endElement();
+
+        // fonts
+        $objWriter->startElement('fonts');
+        $objWriter->writeAttribute('count', $this->getParentWriter()->getFontHashTable()->count());
+
+        // font
+        for ($i = 0; $i < $this->getParentWriter()->getFontHashTable()->count(); ++$i) {
+            $this->writeFont($objWriter, $this->getParentWriter()->getFontHashTable()->getByIndex($i));
+        }
+
+        $objWriter->endElement();
+
+        // fills
+        $objWriter->startElement('fills');
+        $objWriter->writeAttribute('count', $this->getParentWriter()->getFillHashTable()->count());
+
+        // fill
+        for ($i = 0; $i < $this->getParentWriter()->getFillHashTable()->count(); ++$i) {
+            $this->writeFill($objWriter, $this->getParentWriter()->getFillHashTable()->getByIndex($i));
+        }
+
+        $objWriter->endElement();
+
+        // borders
+        $objWriter->startElement('borders');
+        $objWriter->writeAttribute('count', $this->getParentWriter()->getBordersHashTable()->count());
+
+        // border
+        for ($i = 0; $i < $this->getParentWriter()->getBordersHashTable()->count(); ++$i) {
+            $this->writeBorder($objWriter, $this->getParentWriter()->getBordersHashTable()->getByIndex($i));
+        }
+
+        $objWriter->endElement();
+
+        // cellStyleXfs
+        $objWriter->startElement('cellStyleXfs');
+        $objWriter->writeAttribute('count', 1);
+
+        // xf
+        $objWriter->startElement('xf');
+        $objWriter->writeAttribute('numFmtId', 0);
+        $objWriter->writeAttribute('fontId', 0);
+        $objWriter->writeAttribute('fillId', 0);
+        $objWriter->writeAttribute('borderId', 0);
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // cellXfs
+        $objWriter->startElement('cellXfs');
+        $objWriter->writeAttribute('count', count($pPHPExcel->getCellXfCollection()));
+
+        // xf
+        foreach ($pPHPExcel->getCellXfCollection() as $cellXf) {
+            $this->writeCellStyleXf($objWriter, $cellXf, $pPHPExcel);
+        }
+
+        $objWriter->endElement();
+
+        // cellStyles
+        $objWriter->startElement('cellStyles');
+        $objWriter->writeAttribute('count', 1);
+
+        // cellStyle
+        $objWriter->startElement('cellStyle');
+        $objWriter->writeAttribute('name', 'Normal');
+        $objWriter->writeAttribute('xfId', 0);
+        $objWriter->writeAttribute('builtinId', 0);
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // dxfs
+        $objWriter->startElement('dxfs');
+        $objWriter->writeAttribute('count', $this->getParentWriter()->getStylesConditionalHashTable()->count());
+
+        // dxf
+        for ($i = 0; $i < $this->getParentWriter()->getStylesConditionalHashTable()->count(); ++$i) {
+            $this->writeCellStyleDxf($objWriter, $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i)->getStyle());
+        }
+
+        $objWriter->endElement();
+
+        // tableStyles
+        $objWriter->startElement('tableStyles');
+        $objWriter->writeAttribute('defaultTableStyle', 'TableStyleMedium9');
+        $objWriter->writeAttribute('defaultPivotStyle', 'PivotTableStyle1');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write Fill
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     PHPExcel_Style_Fill            $pFill            Fill style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
+    {
+        // Check if this is a pattern type or gradient type
+        if ($pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR ||
+            $pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_PATH) {
+            // Gradient fill
+            $this->writeGradientFill($objWriter, $pFill);
+        } elseif ($pFill->getFillType() !== null) {
+            // Pattern fill
+            $this->writePatternFill($objWriter, $pFill);
+        }
+    }
+
+    /**
+     * Write Gradient Fill
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     PHPExcel_Style_Fill            $pFill            Fill style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeGradientFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
+    {
+        // fill
+        $objWriter->startElement('fill');
+
+        // gradientFill
+        $objWriter->startElement('gradientFill');
+        $objWriter->writeAttribute('type', $pFill->getFillType());
+        $objWriter->writeAttribute('degree', $pFill->getRotation());
+
+        // stop
+        $objWriter->startElement('stop');
+        $objWriter->writeAttribute('position', '0');
+
+        // color
+        $objWriter->startElement('color');
+        $objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // stop
+        $objWriter->startElement('stop');
+        $objWriter->writeAttribute('position', '1');
+
+        // color
+        $objWriter->startElement('color');
+        $objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Pattern Fill
+     *
+     * @param     PHPExcel_Shared_XMLWriter            $objWriter         XML Writer
+     * @param     PHPExcel_Style_Fill                    $pFill            Fill style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writePatternFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
+    {
+        // fill
+        $objWriter->startElement('fill');
+
+        // patternFill
+        $objWriter->startElement('patternFill');
+        $objWriter->writeAttribute('patternType', $pFill->getFillType());
+
+        if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
+            // fgColor
+            if ($pFill->getStartColor()->getARGB()) {
+                $objWriter->startElement('fgColor');
+                $objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
+                $objWriter->endElement();
+            }
+        }
+        if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
+            // bgColor
+            if ($pFill->getEndColor()->getARGB()) {
+                $objWriter->startElement('bgColor');
+                $objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Font
+     *
+     * @param     PHPExcel_Shared_XMLWriter        $objWriter         XML Writer
+     * @param     PHPExcel_Style_Font                $pFont            Font style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeFont(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Font $pFont = null)
+    {
+        // font
+        $objWriter->startElement('font');
+        //    Weird! The order of these elements actually makes a difference when opening Excel2007
+        //        files in Excel2003 with the compatibility pack. It's not documented behaviour,
+        //        and makes for a real WTF!
+
+        // Bold. We explicitly write this element also when false (like MS Office Excel 2007 does
+        // for conditional formatting). Otherwise it will apparently not be picked up in conditional
+        // formatting style dialog
+        if ($pFont->getBold() !== null) {
+            $objWriter->startElement('b');
+            $objWriter->writeAttribute('val', $pFont->getBold() ? '1' : '0');
+            $objWriter->endElement();
+        }
+
+        // Italic
+        if ($pFont->getItalic() !== null) {
+            $objWriter->startElement('i');
+            $objWriter->writeAttribute('val', $pFont->getItalic() ? '1' : '0');
+            $objWriter->endElement();
+        }
+
+        // Strikethrough
+        if ($pFont->getStrikethrough() !== null) {
+            $objWriter->startElement('strike');
+            $objWriter->writeAttribute('val', $pFont->getStrikethrough() ? '1' : '0');
+            $objWriter->endElement();
+        }
+
+        // Underline
+        if ($pFont->getUnderline() !== null) {
+            $objWriter->startElement('u');
+            $objWriter->writeAttribute('val', $pFont->getUnderline());
+            $objWriter->endElement();
+        }
+
+        // Superscript / subscript
+        if ($pFont->getSuperScript() === true || $pFont->getSubScript() === true) {
+            $objWriter->startElement('vertAlign');
+            if ($pFont->getSuperScript() === true) {
+                $objWriter->writeAttribute('val', 'superscript');
+            } elseif ($pFont->getSubScript() === true) {
+                $objWriter->writeAttribute('val', 'subscript');
+            }
+            $objWriter->endElement();
+        }
+
+        // Size
+        if ($pFont->getSize() !== null) {
+            $objWriter->startElement('sz');
+            $objWriter->writeAttribute('val', $pFont->getSize());
+            $objWriter->endElement();
+        }
+
+        // Foreground color
+        if ($pFont->getColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $pFont->getColor()->getARGB());
+            $objWriter->endElement();
+        }
+
+        // Name
+        if ($pFont->getName() !== null) {
+            $objWriter->startElement('name');
+            $objWriter->writeAttribute('val', $pFont->getName());
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Border
+     *
+     * @param     PHPExcel_Shared_XMLWriter            $objWriter         XML Writer
+     * @param     PHPExcel_Style_Borders                $pBorders        Borders style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeBorder(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Borders $pBorders = null)
+    {
+        // Write border
+        $objWriter->startElement('border');
+        // Diagonal?
+        switch ($pBorders->getDiagonalDirection()) {
+            case PHPExcel_Style_Borders::DIAGONAL_UP:
+                $objWriter->writeAttribute('diagonalUp', 'true');
+                $objWriter->writeAttribute('diagonalDown', 'false');
+                break;
+            case PHPExcel_Style_Borders::DIAGONAL_DOWN:
+                $objWriter->writeAttribute('diagonalUp', 'false');
+                $objWriter->writeAttribute('diagonalDown', 'true');
+                break;
+            case PHPExcel_Style_Borders::DIAGONAL_BOTH:
+                $objWriter->writeAttribute('diagonalUp', 'true');
+                $objWriter->writeAttribute('diagonalDown', 'true');
+                break;
+        }
+
+        // BorderPr
+        $this->writeBorderPr($objWriter, 'left', $pBorders->getLeft());
+        $this->writeBorderPr($objWriter, 'right', $pBorders->getRight());
+        $this->writeBorderPr($objWriter, 'top', $pBorders->getTop());
+        $this->writeBorderPr($objWriter, 'bottom', $pBorders->getBottom());
+        $this->writeBorderPr($objWriter, 'diagonal', $pBorders->getDiagonal());
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Cell Style Xf
+     *
+     * @param     PHPExcel_Shared_XMLWriter            $objWriter         XML Writer
+     * @param     PHPExcel_Style                        $pStyle            Style
+     * @param     PHPExcel                            $pPHPExcel        Workbook
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeCellStyleXf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null, PHPExcel $pPHPExcel = null)
+    {
+        // xf
+        $objWriter->startElement('xf');
+        $objWriter->writeAttribute('xfId', 0);
+        $objWriter->writeAttribute('fontId', (int)$this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode()));
+        if ($pStyle->getQuotePrefix()) {
+            $objWriter->writeAttribute('quotePrefix', 1);
+        }
+
+        if ($pStyle->getNumberFormat()->getBuiltInFormatCode() === false) {
+            $objWriter->writeAttribute('numFmtId', (int)($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164));
+        } else {
+            $objWriter->writeAttribute('numFmtId', (int)$pStyle->getNumberFormat()->getBuiltInFormatCode());
+        }
+
+        $objWriter->writeAttribute('fillId', (int)$this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode()));
+        $objWriter->writeAttribute('borderId', (int)$this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode()));
+
+        // Apply styles?
+        $objWriter->writeAttribute('applyFont', ($pPHPExcel->getDefaultStyle()->getFont()->getHashCode() != $pStyle->getFont()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyNumberFormat', ($pPHPExcel->getDefaultStyle()->getNumberFormat()->getHashCode() != $pStyle->getNumberFormat()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyFill', ($pPHPExcel->getDefaultStyle()->getFill()->getHashCode() != $pStyle->getFill()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyBorder', ($pPHPExcel->getDefaultStyle()->getBorders()->getHashCode() != $pStyle->getBorders()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyAlignment', ($pPHPExcel->getDefaultStyle()->getAlignment()->getHashCode() != $pStyle->getAlignment()->getHashCode()) ? '1' : '0');
+        if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+            $objWriter->writeAttribute('applyProtection', 'true');
+        }
+
+        // alignment
+        $objWriter->startElement('alignment');
+        $objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
+        $objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
+
+        $textRotation = 0;
+        if ($pStyle->getAlignment()->getTextRotation() >= 0) {
+            $textRotation = $pStyle->getAlignment()->getTextRotation();
+        } elseif ($pStyle->getAlignment()->getTextRotation() < 0) {
+            $textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
+        }
+        $objWriter->writeAttribute('textRotation', $textRotation);
+
+        $objWriter->writeAttribute('wrapText', ($pStyle->getAlignment()->getWrapText() ? 'true' : 'false'));
+        $objWriter->writeAttribute('shrinkToFit', ($pStyle->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
+
+        if ($pStyle->getAlignment()->getIndent() > 0) {
+            $objWriter->writeAttribute('indent', $pStyle->getAlignment()->getIndent());
+        }
+        if ($pStyle->getAlignment()->getReadorder() > 0) {
+            $objWriter->writeAttribute('readingOrder', $pStyle->getAlignment()->getReadorder());
+        }
+        $objWriter->endElement();
+
+        // protection
+        if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+            $objWriter->startElement('protection');
+            if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+                $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+            }
+            if ($pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+                $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+            }
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Cell Style Dxf
+     *
+     * @param     PHPExcel_Shared_XMLWriter         $objWriter         XML Writer
+     * @param     PHPExcel_Style                    $pStyle            Style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeCellStyleDxf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null)
+    {
+        // dxf
+        $objWriter->startElement('dxf');
+
+        // font
+        $this->writeFont($objWriter, $pStyle->getFont());
+
+        // numFmt
+        $this->writeNumFmt($objWriter, $pStyle->getNumberFormat());
+
+        // fill
+        $this->writeFill($objWriter, $pStyle->getFill());
+
+        // alignment
+        $objWriter->startElement('alignment');
+        if ($pStyle->getAlignment()->getHorizontal() !== null) {
+            $objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
+        }
+        if ($pStyle->getAlignment()->getVertical() !== null) {
+            $objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
+        }
+
+        if ($pStyle->getAlignment()->getTextRotation() !== null) {
+            $textRotation = 0;
+            if ($pStyle->getAlignment()->getTextRotation() >= 0) {
+                $textRotation = $pStyle->getAlignment()->getTextRotation();
+            } elseif ($pStyle->getAlignment()->getTextRotation() < 0) {
+                $textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
+            }
+            $objWriter->writeAttribute('textRotation', $textRotation);
+        }
+        $objWriter->endElement();
+
+        // border
+        $this->writeBorder($objWriter, $pStyle->getBorders());
+
+        // protection
+        if (($pStyle->getProtection()->getLocked() !== null) || ($pStyle->getProtection()->getHidden() !== null)) {
+            if ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT ||
+                $pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+                $objWriter->startElement('protection');
+                if (($pStyle->getProtection()->getLocked() !== null) &&
+                    ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
+                    $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+                }
+                if (($pStyle->getProtection()->getHidden() !== null) &&
+                    ($pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
+                    $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+                }
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write BorderPr
+     *
+     * @param     PHPExcel_Shared_XMLWriter        $objWriter         XML Writer
+     * @param     string                            $pName            Element name
+     * @param     PHPExcel_Style_Border            $pBorder        Border style
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeBorderPr(PHPExcel_Shared_XMLWriter $objWriter = null, $pName = 'left', PHPExcel_Style_Border $pBorder = null)
+    {
+        // Write BorderPr
+        if ($pBorder->getBorderStyle() != PHPExcel_Style_Border::BORDER_NONE) {
+            $objWriter->startElement($pName);
+            $objWriter->writeAttribute('style', $pBorder->getBorderStyle());
+
+            // color
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $pBorder->getColor()->getARGB());
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write NumberFormat
+     *
+     * @param     PHPExcel_Shared_XMLWriter            $objWriter         XML Writer
+     * @param     PHPExcel_Style_NumberFormat            $pNumberFormat    Number Format
+     * @param     int                                    $pId            Number Format identifier
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeNumFmt(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_NumberFormat $pNumberFormat = null, $pId = 0)
+    {
+        // Translate formatcode
+        $formatCode = $pNumberFormat->getFormatCode();
+
+        // numFmt
+        if ($formatCode !== null) {
+            $objWriter->startElement('numFmt');
+            $objWriter->writeAttribute('numFmtId', ($pId + 164));
+            $objWriter->writeAttribute('formatCode', $formatCode);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Get an array of all styles
+     *
+     * @param     PHPExcel                $pPHPExcel
+     * @return     PHPExcel_Style[]        All styles in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allStyles(PHPExcel $pPHPExcel = null)
+    {
+        return $pPHPExcel->getCellXfCollection();
+    }
+
+    /**
+     * Get an array of all conditional styles
+     *
+     * @param     PHPExcel                            $pPHPExcel
+     * @return     PHPExcel_Style_Conditional[]        All conditional styles in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allConditionalStyles(PHPExcel $pPHPExcel = null)
+    {
+        // Get an array of all styles
+        $aStyles = array();
+
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            foreach ($pPHPExcel->getSheet($i)->getConditionalStylesCollection() as $conditionalStyles) {
+                foreach ($conditionalStyles as $conditionalStyle) {
+                    $aStyles[] = $conditionalStyle;
+                }
+            }
+        }
+
+        return $aStyles;
+    }
+
+    /**
+     * Get an array of all fills
+     *
+     * @param     PHPExcel                        $pPHPExcel
+     * @return     PHPExcel_Style_Fill[]        All fills in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allFills(PHPExcel $pPHPExcel = null)
+    {
+        // Get an array of unique fills
+        $aFills = array();
+
+        // Two first fills are predefined
+        $fill0 = new PHPExcel_Style_Fill();
+        $fill0->setFillType(PHPExcel_Style_Fill::FILL_NONE);
+        $aFills[] = $fill0;
+
+        $fill1 = new PHPExcel_Style_Fill();
+        $fill1->setFillType(PHPExcel_Style_Fill::FILL_PATTERN_GRAY125);
+        $aFills[] = $fill1;
+        // The remaining fills
+        $aStyles = $this->allStyles($pPHPExcel);
+        foreach ($aStyles as $style) {
+            if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) {
+                $aFills[ $style->getFill()->getHashCode() ] = $style->getFill();
+            }
+        }
+
+        return $aFills;
+    }
+
+    /**
+     * Get an array of all fonts
+     *
+     * @param     PHPExcel                        $pPHPExcel
+     * @return     PHPExcel_Style_Font[]        All fonts in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allFonts(PHPExcel $pPHPExcel = null)
+    {
+        // Get an array of unique fonts
+        $aFonts = array();
+        $aStyles = $this->allStyles($pPHPExcel);
+
+        foreach ($aStyles as $style) {
+            if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) {
+                $aFonts[ $style->getFont()->getHashCode() ] = $style->getFont();
+            }
+        }
+
+        return $aFonts;
+    }
+
+    /**
+     * Get an array of all borders
+     *
+     * @param     PHPExcel                        $pPHPExcel
+     * @return     PHPExcel_Style_Borders[]        All borders in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allBorders(PHPExcel $pPHPExcel = null)
+    {
+        // Get an array of unique borders
+        $aBorders = array();
+        $aStyles = $this->allStyles($pPHPExcel);
+
+        foreach ($aStyles as $style) {
+            if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) {
+                $aBorders[ $style->getBorders()->getHashCode() ] = $style->getBorders();
+            }
+        }
+
+        return $aBorders;
+    }
+
+    /**
+     * Get an array of all number formats
+     *
+     * @param     PHPExcel                                $pPHPExcel
+     * @return     PHPExcel_Style_NumberFormat[]        All number formats in PHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function allNumberFormats(PHPExcel $pPHPExcel = null)
+    {
+        // Get an array of unique number formats
+        $aNumFmts = array();
+        $aStyles = $this->allStyles($pPHPExcel);
+
+        foreach ($aStyles as $style) {
+            if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) {
+                $aNumFmts[ $style->getNumberFormat()->getHashCode() ] = $style->getNumberFormat();
+            }
+        }
+
+        return $aNumFmts;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Theme.php b/lib/PHPExcel/Writer/Excel2007/Theme.php
new file mode 100644
index 000000000..223e40241
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Theme.php
@@ -0,0 +1,869 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Writer_Excel2007_Theme
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Map of Major fonts to write
+     * @static    array of string
+     *
+     */
+    private static $majorFonts = array(
+        'Jpan' => 'ＭＳ Ｐゴシック',
+        'Hang' => '맑은 고딕',
+        'Hans' => '宋体',
+        'Hant' => '新細明體',
+        'Arab' => 'Times New Roman',
+        'Hebr' => 'Times New Roman',
+        'Thai' => 'Tahoma',
+        'Ethi' => 'Nyala',
+        'Beng' => 'Vrinda',
+        'Gujr' => 'Shruti',
+        'Khmr' => 'MoolBoran',
+        'Knda' => 'Tunga',
+        'Guru' => 'Raavi',
+        'Cans' => 'Euphemia',
+        'Cher' => 'Plantagenet Cherokee',
+        'Yiii' => 'Microsoft Yi Baiti',
+        'Tibt' => 'Microsoft Himalaya',
+        'Thaa' => 'MV Boli',
+        'Deva' => 'Mangal',
+        'Telu' => 'Gautami',
+        'Taml' => 'Latha',
+        'Syrc' => 'Estrangelo Edessa',
+        'Orya' => 'Kalinga',
+        'Mlym' => 'Kartika',
+        'Laoo' => 'DokChampa',
+        'Sinh' => 'Iskoola Pota',
+        'Mong' => 'Mongolian Baiti',
+        'Viet' => 'Times New Roman',
+        'Uigh' => 'Microsoft Uighur',
+        'Geor' => 'Sylfaen',
+    );
+
+    /**
+     * Map of Minor fonts to write
+     * @static    array of string
+     *
+     */
+    private static $minorFonts = array(
+        'Jpan' => 'ＭＳ Ｐゴシック',
+        'Hang' => '맑은 고딕',
+        'Hans' => '宋体',
+        'Hant' => '新細明體',
+        'Arab' => 'Arial',
+        'Hebr' => 'Arial',
+        'Thai' => 'Tahoma',
+        'Ethi' => 'Nyala',
+        'Beng' => 'Vrinda',
+        'Gujr' => 'Shruti',
+        'Khmr' => 'DaunPenh',
+        'Knda' => 'Tunga',
+        'Guru' => 'Raavi',
+        'Cans' => 'Euphemia',
+        'Cher' => 'Plantagenet Cherokee',
+        'Yiii' => 'Microsoft Yi Baiti',
+        'Tibt' => 'Microsoft Himalaya',
+        'Thaa' => 'MV Boli',
+        'Deva' => 'Mangal',
+        'Telu' => 'Gautami',
+        'Taml' => 'Latha',
+        'Syrc' => 'Estrangelo Edessa',
+        'Orya' => 'Kalinga',
+        'Mlym' => 'Kartika',
+        'Laoo' => 'DokChampa',
+        'Sinh' => 'Iskoola Pota',
+        'Mong' => 'Mongolian Baiti',
+        'Viet' => 'Arial',
+        'Uigh' => 'Microsoft Uighur',
+        'Geor' => 'Sylfaen',
+    );
+
+    /**
+     * Map of core colours
+     * @static    array of string
+     *
+     */
+    private static $colourScheme = array(
+        'dk2'        => '1F497D',
+        'lt2'        => 'EEECE1',
+        'accent1'    => '4F81BD',
+        'accent2'    => 'C0504D',
+        'accent3'    => '9BBB59',
+        'accent4'    => '8064A2',
+        'accent5'    => '4BACC6',
+        'accent6'    => 'F79646',
+        'hlink'        => '0000FF',
+        'folHlink'    => '800080',
+    );
+            
+    /**
+     * Write theme to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeTheme(PHPExcel $pPHPExcel = null)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // a:theme
+        $objWriter->startElement('a:theme');
+        $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+        $objWriter->writeAttribute('name', 'Office Theme');
+
+            // a:themeElements
+            $objWriter->startElement('a:themeElements');
+
+                // a:clrScheme
+                $objWriter->startElement('a:clrScheme');
+                $objWriter->writeAttribute('name', 'Office');
+
+                    // a:dk1
+                    $objWriter->startElement('a:dk1');
+
+                        // a:sysClr
+                        $objWriter->startElement('a:sysClr');
+                        $objWriter->writeAttribute('val', 'windowText');
+                        $objWriter->writeAttribute('lastClr', '000000');
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                    // a:lt1
+                    $objWriter->startElement('a:lt1');
+
+                        // a:sysClr
+                        $objWriter->startElement('a:sysClr');
+                        $objWriter->writeAttribute('val', 'window');
+                        $objWriter->writeAttribute('lastClr', 'FFFFFF');
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                    // a:dk2
+                    $this->writeColourScheme($objWriter);
+
+                $objWriter->endElement();
+
+                // a:fontScheme
+                $objWriter->startElement('a:fontScheme');
+                $objWriter->writeAttribute('name', 'Office');
+
+                    // a:majorFont
+                    $objWriter->startElement('a:majorFont');
+                        $this->writeFonts($objWriter, 'Cambria', self::$majorFonts);
+                    $objWriter->endElement();
+
+                    // a:minorFont
+                    $objWriter->startElement('a:minorFont');
+                        $this->writeFonts($objWriter, 'Calibri', self::$minorFonts);
+                    $objWriter->endElement();
+
+                $objWriter->endElement();
+
+                // a:fmtScheme
+                $objWriter->startElement('a:fmtScheme');
+                $objWriter->writeAttribute('name', 'Office');
+
+                    // a:fillStyleLst
+                    $objWriter->startElement('a:fillStyleLst');
+
+                        // a:solidFill
+                        $objWriter->startElement('a:solidFill');
+
+                            // a:schemeClr
+                            $objWriter->startElement('a:schemeClr');
+                            $objWriter->writeAttribute('val', 'phClr');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:gradFill
+                        $objWriter->startElement('a:gradFill');
+                        $objWriter->writeAttribute('rotWithShape', '1');
+
+                            // a:gsLst
+                            $objWriter->startElement('a:gsLst');
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '0');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:tint
+                                        $objWriter->startElement('a:tint');
+                                        $objWriter->writeAttribute('val', '50000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '300000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '35000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:tint
+                                        $objWriter->startElement('a:tint');
+                                        $objWriter->writeAttribute('val', '37000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '300000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '100000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:tint
+                                        $objWriter->startElement('a:tint');
+                                        $objWriter->writeAttribute('val', '15000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '350000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:lin
+                            $objWriter->startElement('a:lin');
+                            $objWriter->writeAttribute('ang', '16200000');
+                            $objWriter->writeAttribute('scaled', '1');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:gradFill
+                        $objWriter->startElement('a:gradFill');
+                        $objWriter->writeAttribute('rotWithShape', '1');
+
+                            // a:gsLst
+                            $objWriter->startElement('a:gsLst');
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '0');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '51000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '130000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '80000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '93000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '130000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '100000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '94000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '135000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:lin
+                            $objWriter->startElement('a:lin');
+                            $objWriter->writeAttribute('ang', '16200000');
+                            $objWriter->writeAttribute('scaled', '0');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                    // a:lnStyleLst
+                    $objWriter->startElement('a:lnStyleLst');
+
+                        // a:ln
+                        $objWriter->startElement('a:ln');
+                        $objWriter->writeAttribute('w', '9525');
+                        $objWriter->writeAttribute('cap', 'flat');
+                        $objWriter->writeAttribute('cmpd', 'sng');
+                        $objWriter->writeAttribute('algn', 'ctr');
+
+                            // a:solidFill
+                            $objWriter->startElement('a:solidFill');
+
+                                // a:schemeClr
+                                $objWriter->startElement('a:schemeClr');
+                                $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '95000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '105000');
+                                        $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:prstDash
+                            $objWriter->startElement('a:prstDash');
+                            $objWriter->writeAttribute('val', 'solid');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:ln
+                        $objWriter->startElement('a:ln');
+                        $objWriter->writeAttribute('w', '25400');
+                        $objWriter->writeAttribute('cap', 'flat');
+                        $objWriter->writeAttribute('cmpd', 'sng');
+                        $objWriter->writeAttribute('algn', 'ctr');
+
+                            // a:solidFill
+                            $objWriter->startElement('a:solidFill');
+
+                                // a:schemeClr
+                                $objWriter->startElement('a:schemeClr');
+                                $objWriter->writeAttribute('val', 'phClr');
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:prstDash
+                            $objWriter->startElement('a:prstDash');
+                            $objWriter->writeAttribute('val', 'solid');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:ln
+                        $objWriter->startElement('a:ln');
+                        $objWriter->writeAttribute('w', '38100');
+                        $objWriter->writeAttribute('cap', 'flat');
+                        $objWriter->writeAttribute('cmpd', 'sng');
+                        $objWriter->writeAttribute('algn', 'ctr');
+
+                            // a:solidFill
+                            $objWriter->startElement('a:solidFill');
+
+                                // a:schemeClr
+                                $objWriter->startElement('a:schemeClr');
+                                $objWriter->writeAttribute('val', 'phClr');
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:prstDash
+                            $objWriter->startElement('a:prstDash');
+                            $objWriter->writeAttribute('val', 'solid');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+
+
+                    // a:effectStyleLst
+                    $objWriter->startElement('a:effectStyleLst');
+
+                        // a:effectStyle
+                        $objWriter->startElement('a:effectStyle');
+
+                            // a:effectLst
+                            $objWriter->startElement('a:effectLst');
+
+                                // a:outerShdw
+                                $objWriter->startElement('a:outerShdw');
+                                $objWriter->writeAttribute('blurRad', '40000');
+                                $objWriter->writeAttribute('dist', '20000');
+                                $objWriter->writeAttribute('dir', '5400000');
+                                $objWriter->writeAttribute('rotWithShape', '0');
+
+                                    // a:srgbClr
+                                    $objWriter->startElement('a:srgbClr');
+                                    $objWriter->writeAttribute('val', '000000');
+
+                                        // a:alpha
+                                        $objWriter->startElement('a:alpha');
+                                        $objWriter->writeAttribute('val', '38000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:effectStyle
+                        $objWriter->startElement('a:effectStyle');
+
+                            // a:effectLst
+                            $objWriter->startElement('a:effectLst');
+
+                                // a:outerShdw
+                                $objWriter->startElement('a:outerShdw');
+                                $objWriter->writeAttribute('blurRad', '40000');
+                                $objWriter->writeAttribute('dist', '23000');
+                                $objWriter->writeAttribute('dir', '5400000');
+                                $objWriter->writeAttribute('rotWithShape', '0');
+
+                                    // a:srgbClr
+                                    $objWriter->startElement('a:srgbClr');
+                                    $objWriter->writeAttribute('val', '000000');
+
+                                        // a:alpha
+                                        $objWriter->startElement('a:alpha');
+                                        $objWriter->writeAttribute('val', '35000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:effectStyle
+                        $objWriter->startElement('a:effectStyle');
+
+                            // a:effectLst
+                            $objWriter->startElement('a:effectLst');
+
+                                // a:outerShdw
+                                $objWriter->startElement('a:outerShdw');
+                                $objWriter->writeAttribute('blurRad', '40000');
+                                $objWriter->writeAttribute('dist', '23000');
+                                $objWriter->writeAttribute('dir', '5400000');
+                                $objWriter->writeAttribute('rotWithShape', '0');
+
+                                    // a:srgbClr
+                                    $objWriter->startElement('a:srgbClr');
+                                    $objWriter->writeAttribute('val', '000000');
+
+                                        // a:alpha
+                                        $objWriter->startElement('a:alpha');
+                                        $objWriter->writeAttribute('val', '35000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:scene3d
+                            $objWriter->startElement('a:scene3d');
+
+                                // a:camera
+                                $objWriter->startElement('a:camera');
+                                $objWriter->writeAttribute('prst', 'orthographicFront');
+
+                                    // a:rot
+                                    $objWriter->startElement('a:rot');
+                                    $objWriter->writeAttribute('lat', '0');
+                                    $objWriter->writeAttribute('lon', '0');
+                                    $objWriter->writeAttribute('rev', '0');
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:lightRig
+                                $objWriter->startElement('a:lightRig');
+                                $objWriter->writeAttribute('rig', 'threePt');
+                                $objWriter->writeAttribute('dir', 't');
+
+                                    // a:rot
+                                    $objWriter->startElement('a:rot');
+                                    $objWriter->writeAttribute('lat', '0');
+                                    $objWriter->writeAttribute('lon', '0');
+                                    $objWriter->writeAttribute('rev', '1200000');
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:sp3d
+                            $objWriter->startElement('a:sp3d');
+
+                                // a:bevelT
+                                $objWriter->startElement('a:bevelT');
+                                $objWriter->writeAttribute('w', '63500');
+                                $objWriter->writeAttribute('h', '25400');
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                    // a:bgFillStyleLst
+                    $objWriter->startElement('a:bgFillStyleLst');
+
+                        // a:solidFill
+                        $objWriter->startElement('a:solidFill');
+
+                            // a:schemeClr
+                            $objWriter->startElement('a:schemeClr');
+                            $objWriter->writeAttribute('val', 'phClr');
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:gradFill
+                        $objWriter->startElement('a:gradFill');
+                        $objWriter->writeAttribute('rotWithShape', '1');
+
+                            // a:gsLst
+                            $objWriter->startElement('a:gsLst');
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '0');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:tint
+                                        $objWriter->startElement('a:tint');
+                                        $objWriter->writeAttribute('val', '40000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '350000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '40000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:tint
+                                        $objWriter->startElement('a:tint');
+                                        $objWriter->writeAttribute('val', '45000');
+                                        $objWriter->endElement();
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '99000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '350000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '100000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '20000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '255000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:path
+                            $objWriter->startElement('a:path');
+                            $objWriter->writeAttribute('path', 'circle');
+
+                                // a:fillToRect
+                                $objWriter->startElement('a:fillToRect');
+                                $objWriter->writeAttribute('l', '50000');
+                                $objWriter->writeAttribute('t', '-80000');
+                                $objWriter->writeAttribute('r', '50000');
+                                $objWriter->writeAttribute('b', '180000');
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                        // a:gradFill
+                        $objWriter->startElement('a:gradFill');
+                        $objWriter->writeAttribute('rotWithShape', '1');
+
+                            // a:gsLst
+                            $objWriter->startElement('a:gsLst');
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '0');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:tint
+                                        $objWriter->startElement('a:tint');
+                                        $objWriter->writeAttribute('val', '80000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '300000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                                // a:gs
+                                $objWriter->startElement('a:gs');
+                                $objWriter->writeAttribute('pos', '100000');
+
+                                    // a:schemeClr
+                                    $objWriter->startElement('a:schemeClr');
+                                    $objWriter->writeAttribute('val', 'phClr');
+
+                                        // a:shade
+                                        $objWriter->startElement('a:shade');
+                                        $objWriter->writeAttribute('val', '30000');
+                                        $objWriter->endElement();
+
+                                        // a:satMod
+                                        $objWriter->startElement('a:satMod');
+                                        $objWriter->writeAttribute('val', '200000');
+                                        $objWriter->endElement();
+
+                                    $objWriter->endElement();
+
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                            // a:path
+                            $objWriter->startElement('a:path');
+                            $objWriter->writeAttribute('path', 'circle');
+
+                                // a:fillToRect
+                                $objWriter->startElement('a:fillToRect');
+                                $objWriter->writeAttribute('l', '50000');
+                                $objWriter->writeAttribute('t', '50000');
+                                $objWriter->writeAttribute('r', '50000');
+                                $objWriter->writeAttribute('b', '50000');
+                                $objWriter->endElement();
+
+                            $objWriter->endElement();
+
+                        $objWriter->endElement();
+
+                    $objWriter->endElement();
+
+                $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // a:objectDefaults
+            $objWriter->writeElement('a:objectDefaults', null);
+
+            // a:extraClrSchemeLst
+            $objWriter->writeElement('a:extraClrSchemeLst', null);
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write fonts to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter
+     * @param     string                        $latinFont
+     * @param     array of string                $fontSet
+     * @return     string                         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeFonts($objWriter, $latinFont, $fontSet)
+    {
+        // a:latin
+        $objWriter->startElement('a:latin');
+        $objWriter->writeAttribute('typeface', $latinFont);
+        $objWriter->endElement();
+
+        // a:ea
+        $objWriter->startElement('a:ea');
+        $objWriter->writeAttribute('typeface', '');
+        $objWriter->endElement();
+
+        // a:cs
+        $objWriter->startElement('a:cs');
+        $objWriter->writeAttribute('typeface', '');
+        $objWriter->endElement();
+
+        foreach ($fontSet as $fontScript => $typeface) {
+            $objWriter->startElement('a:font');
+                $objWriter->writeAttribute('script', $fontScript);
+                $objWriter->writeAttribute('typeface', $typeface);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write colour scheme to XML format
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter
+     * @return     string                         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeColourScheme($objWriter)
+    {
+        foreach (self::$colourScheme as $colourName => $colourValue) {
+            $objWriter->startElement('a:'.$colourName);
+
+                $objWriter->startElement('a:srgbClr');
+                    $objWriter->writeAttribute('val', $colourValue);
+                $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Workbook.php b/lib/PHPExcel/Writer/Excel2007/Workbook.php
new file mode 100644
index 000000000..87c877ea9
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Workbook.php
@@ -0,0 +1,448 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_Workbook
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write workbook to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @param    boolean        $recalcRequired    Indicate whether formulas should be recalculated before writing
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeWorkbook(PHPExcel $pPHPExcel = null, $recalcRequired = false)
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // workbook
+        $objWriter->startElement('workbook');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+
+        // fileVersion
+        $this->writeFileVersion($objWriter);
+
+        // workbookPr
+        $this->writeWorkbookPr($objWriter);
+
+        // workbookProtection
+        $this->writeWorkbookProtection($objWriter, $pPHPExcel);
+
+        // bookViews
+        if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
+            $this->writeBookViews($objWriter, $pPHPExcel);
+        }
+
+        // sheets
+        $this->writeSheets($objWriter, $pPHPExcel);
+
+        // definedNames
+        $this->writeDefinedNames($objWriter, $pPHPExcel);
+
+        // calcPr
+        $this->writeCalcPr($objWriter, $recalcRequired);
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write file version
+     *
+     * @param     PHPExcel_Shared_XMLWriter $objWriter         XML Writer
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeFileVersion(PHPExcel_Shared_XMLWriter $objWriter = null)
+    {
+        $objWriter->startElement('fileVersion');
+        $objWriter->writeAttribute('appName', 'xl');
+        $objWriter->writeAttribute('lastEdited', '4');
+        $objWriter->writeAttribute('lowestEdited', '4');
+        $objWriter->writeAttribute('rupBuild', '4505');
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write WorkbookPr
+     *
+     * @param     PHPExcel_Shared_XMLWriter $objWriter         XML Writer
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeWorkbookPr(PHPExcel_Shared_XMLWriter $objWriter = null)
+    {
+        $objWriter->startElement('workbookPr');
+
+        if (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) {
+            $objWriter->writeAttribute('date1904', '1');
+        }
+
+        $objWriter->writeAttribute('codeName', 'ThisWorkbook');
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write BookViews
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     PHPExcel                    $pPHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeBookViews(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+    {
+        // bookViews
+        $objWriter->startElement('bookViews');
+
+        // workbookView
+        $objWriter->startElement('workbookView');
+
+        $objWriter->writeAttribute('activeTab', $pPHPExcel->getActiveSheetIndex());
+        $objWriter->writeAttribute('autoFilterDateGrouping', '1');
+        $objWriter->writeAttribute('firstSheet', '0');
+        $objWriter->writeAttribute('minimized', '0');
+        $objWriter->writeAttribute('showHorizontalScroll', '1');
+        $objWriter->writeAttribute('showSheetTabs', '1');
+        $objWriter->writeAttribute('showVerticalScroll', '1');
+        $objWriter->writeAttribute('tabRatio', '600');
+        $objWriter->writeAttribute('visibility', 'visible');
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write WorkbookProtection
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     PHPExcel                    $pPHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeWorkbookProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+    {
+        if ($pPHPExcel->getSecurity()->isSecurityEnabled()) {
+            $objWriter->startElement('workbookProtection');
+            $objWriter->writeAttribute('lockRevision', ($pPHPExcel->getSecurity()->getLockRevision() ? 'true' : 'false'));
+            $objWriter->writeAttribute('lockStructure', ($pPHPExcel->getSecurity()->getLockStructure() ? 'true' : 'false'));
+            $objWriter->writeAttribute('lockWindows', ($pPHPExcel->getSecurity()->getLockWindows() ? 'true' : 'false'));
+
+            if ($pPHPExcel->getSecurity()->getRevisionsPassword() != '') {
+                $objWriter->writeAttribute('revisionsPassword', $pPHPExcel->getSecurity()->getRevisionsPassword());
+            }
+
+            if ($pPHPExcel->getSecurity()->getWorkbookPassword() != '') {
+                $objWriter->writeAttribute('workbookPassword', $pPHPExcel->getSecurity()->getWorkbookPassword());
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write calcPr
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter        XML Writer
+     * @param    boolean                        $recalcRequired    Indicate whether formulas should be recalculated before writing
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeCalcPr(PHPExcel_Shared_XMLWriter $objWriter = null, $recalcRequired = true)
+    {
+        $objWriter->startElement('calcPr');
+
+        //    Set the calcid to a higher value than Excel itself will use, otherwise Excel will always recalc
+        //  If MS Excel does do a recalc, then users opening a file in MS Excel will be prompted to save on exit
+        //     because the file has changed
+        $objWriter->writeAttribute('calcId', '999999');
+        $objWriter->writeAttribute('calcMode', 'auto');
+        //    fullCalcOnLoad isn't needed if we've recalculating for the save
+        $objWriter->writeAttribute('calcCompleted', ($recalcRequired) ? 1 : 0);
+        $objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? 0 : 1);
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write sheets
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     PHPExcel                    $pPHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeSheets(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+    {
+        // Write sheets
+        $objWriter->startElement('sheets');
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // sheet
+            $this->writeSheet(
+                $objWriter,
+                $pPHPExcel->getSheet($i)->getTitle(),
+                ($i + 1),
+                ($i + 1 + 3),
+                $pPHPExcel->getSheet($i)->getSheetState()
+            );
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write sheet
+     *
+     * @param     PHPExcel_Shared_XMLWriter     $objWriter         XML Writer
+     * @param     string                         $pSheetname         Sheet name
+     * @param     int                            $pSheetId             Sheet id
+     * @param     int                            $pRelId                Relationship ID
+     * @param   string                      $sheetState         Sheet state (visible, hidden, veryHidden)
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeSheet(PHPExcel_Shared_XMLWriter $objWriter = null, $pSheetname = '', $pSheetId = 1, $pRelId = 1, $sheetState = 'visible')
+    {
+        if ($pSheetname != '') {
+            // Write sheet
+            $objWriter->startElement('sheet');
+            $objWriter->writeAttribute('name', $pSheetname);
+            $objWriter->writeAttribute('sheetId', $pSheetId);
+            if ($sheetState != 'visible' && $sheetState != '') {
+                $objWriter->writeAttribute('state', $sheetState);
+            }
+            $objWriter->writeAttribute('r:id', 'rId' . $pRelId);
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Write Defined Names
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel                    $pPHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeDefinedNames(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+    {
+        // Write defined names
+        $objWriter->startElement('definedNames');
+
+        // Named ranges
+        if (count($pPHPExcel->getNamedRanges()) > 0) {
+            // Named ranges
+            $this->writeNamedRanges($objWriter, $pPHPExcel);
+        }
+
+        // Other defined names
+        $sheetCount = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // definedName for autoFilter
+            $this->writeDefinedNameForAutofilter($objWriter, $pPHPExcel->getSheet($i), $i);
+
+            // definedName for Print_Titles
+            $this->writeDefinedNameForPrintTitles($objWriter, $pPHPExcel->getSheet($i), $i);
+
+            // definedName for Print_Area
+            $this->writeDefinedNameForPrintArea($objWriter, $pPHPExcel->getSheet($i), $i);
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write named ranges
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel                    $pPHPExcel
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeNamedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel)
+    {
+        // Loop named ranges
+        $namedRanges = $pPHPExcel->getNamedRanges();
+        foreach ($namedRanges as $namedRange) {
+            $this->writeDefinedNameForNamedRange($objWriter, $namedRange);
+        }
+    }
+
+    /**
+     * Write Defined Name for named range
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel_NamedRange            $pNamedRange
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeDefinedNameForNamedRange(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_NamedRange $pNamedRange)
+    {
+        // definedName for named range
+        $objWriter->startElement('definedName');
+        $objWriter->writeAttribute('name', $pNamedRange->getName());
+        if ($pNamedRange->getLocalOnly()) {
+            $objWriter->writeAttribute('localSheetId', $pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
+        }
+
+        // Create absolute coordinate and write as raw text
+        $range = PHPExcel_Cell::splitRange($pNamedRange->getRange());
+        for ($i = 0; $i < count($range); $i++) {
+            $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteReference($range[$i][0]);
+            if (isset($range[$i][1])) {
+                $range[$i][1] = PHPExcel_Cell::absoluteReference($range[$i][1]);
+            }
+        }
+        $range = PHPExcel_Cell::buildRange($range);
+
+        $objWriter->writeRawData($range);
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Defined Name for autoFilter
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel_Worksheet            $pSheet
+     * @param     int                            $pSheetId
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeDefinedNameForAutofilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
+    {
+        // definedName for autoFilter
+        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            $objWriter->startElement('definedName');
+            $objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
+            $objWriter->writeAttribute('localSheetId', $pSheetId);
+            $objWriter->writeAttribute('hidden', '1');
+
+            // Create absolute coordinate and write as raw text
+            $range = PHPExcel_Cell::splitRange($autoFilterRange);
+            $range = $range[0];
+            //    Strip any worksheet ref so we can make the cell ref absolute
+            if (strpos($range[0], '!') !== false) {
+                list($ws, $range[0]) = explode('!', $range[0]);
+            }
+
+            $range[0] = PHPExcel_Cell::absoluteCoordinate($range[0]);
+            $range[1] = PHPExcel_Cell::absoluteCoordinate($range[1]);
+            $range = implode(':', $range);
+
+            $objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel_Worksheet            $pSheet
+     * @param     int                            $pSheetId
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeDefinedNameForPrintTitles(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
+    {
+        // definedName for PrintTitles
+        if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+            $objWriter->startElement('definedName');
+            $objWriter->writeAttribute('name', '_xlnm.Print_Titles');
+            $objWriter->writeAttribute('localSheetId', $pSheetId);
+
+            // Setting string
+            $settingString = '';
+
+            // Columns to repeat
+            if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
+
+                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            // Rows to repeat
+            if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+                if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                    $settingString .= ',';
+                }
+
+                $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
+
+                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            $objWriter->writeRawData($settingString);
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles
+     *
+     * @param     PHPExcel_Shared_XMLWriter    $objWriter         XML Writer
+     * @param     PHPExcel_Worksheet            $pSheet
+     * @param     int                            $pSheetId
+     * @throws     PHPExcel_Writer_Exception
+     */
+    private function writeDefinedNameForPrintArea(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
+    {
+        // definedName for PrintArea
+        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
+            $objWriter->startElement('definedName');
+            $objWriter->writeAttribute('name', '_xlnm.Print_Area');
+            $objWriter->writeAttribute('localSheetId', $pSheetId);
+
+            // Setting string
+            $settingString = '';
+
+            // Print area
+            $printArea = PHPExcel_Cell::splitRange($pSheet->getPageSetup()->getPrintArea());
+
+            $chunks = array();
+            foreach ($printArea as $printAreaRect) {
+                $printAreaRect[0] = PHPExcel_Cell::absoluteReference($printAreaRect[0]);
+                $printAreaRect[1] = PHPExcel_Cell::absoluteReference($printAreaRect[1]);
+                $chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+            }
+
+            $objWriter->writeRawData(implode(',', $chunks));
+
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/Worksheet.php b/lib/PHPExcel/Writer/Excel2007/Worksheet.php
new file mode 100644
index 000000000..c211403e3
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/Worksheet.php
@@ -0,0 +1,1219 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Writer_Excel2007_Worksheet
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Write worksheet to XML format
+     *
+     * @param    PHPExcel_Worksheet        $pSheet
+     * @param    string[]                $pStringTable
+     * @param    boolean                    $includeCharts    Flag indicating if we should write charts
+     * @return    string                    XML Output
+     * @throws    PHPExcel_Writer_Exception
+     */
+    public function writeWorksheet($pSheet = null, $pStringTable = null, $includeCharts = false)
+    {
+        if (!is_null($pSheet)) {
+            // Create XML writer
+            $objWriter = null;
+            if ($this->getParentWriter()->getUseDiskCaching()) {
+                $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+            } else {
+                $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+            }
+
+            // XML header
+            $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+            // Worksheet
+            $objWriter->startElement('worksheet');
+            $objWriter->writeAttribute('xml:space', 'preserve');
+            $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+            $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+
+                // sheetPr
+                $this->writeSheetPr($objWriter, $pSheet);
+
+                // Dimension
+                $this->writeDimension($objWriter, $pSheet);
+
+                // sheetViews
+                $this->writeSheetViews($objWriter, $pSheet);
+
+                // sheetFormatPr
+                $this->writeSheetFormatPr($objWriter, $pSheet);
+
+                // cols
+                $this->writeCols($objWriter, $pSheet);
+
+                // sheetData
+                $this->writeSheetData($objWriter, $pSheet, $pStringTable);
+
+                // sheetProtection
+                $this->writeSheetProtection($objWriter, $pSheet);
+
+                // protectedRanges
+                $this->writeProtectedRanges($objWriter, $pSheet);
+
+                // autoFilter
+                $this->writeAutoFilter($objWriter, $pSheet);
+
+                // mergeCells
+                $this->writeMergeCells($objWriter, $pSheet);
+
+                // conditionalFormatting
+                $this->writeConditionalFormatting($objWriter, $pSheet);
+
+                // dataValidations
+                $this->writeDataValidations($objWriter, $pSheet);
+
+                // hyperlinks
+                $this->writeHyperlinks($objWriter, $pSheet);
+
+                // Print options
+                $this->writePrintOptions($objWriter, $pSheet);
+
+                // Page margins
+                $this->writePageMargins($objWriter, $pSheet);
+
+                // Page setup
+                $this->writePageSetup($objWriter, $pSheet);
+
+                // Header / footer
+                $this->writeHeaderFooter($objWriter, $pSheet);
+
+                // Breaks
+                $this->writeBreaks($objWriter, $pSheet);
+
+                // Drawings and/or Charts
+                $this->writeDrawings($objWriter, $pSheet, $includeCharts);
+
+                // LegacyDrawing
+                $this->writeLegacyDrawing($objWriter, $pSheet);
+
+                // LegacyDrawingHF
+                $this->writeLegacyDrawingHF($objWriter, $pSheet);
+
+            $objWriter->endElement();
+
+            // Return
+            return $objWriter->getData();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid PHPExcel_Worksheet object passed.");
+        }
+    }
+
+    /**
+     * Write SheetPr
+     *
+     * @param    PHPExcel_Shared_XMLWriter        $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeSheetPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // sheetPr
+        $objWriter->startElement('sheetPr');
+        //$objWriter->writeAttribute('codeName',        $pSheet->getTitle());
+        if ($pSheet->getParent()->hasMacros()) {//if the workbook have macros, we need to have codeName for the sheet
+            if ($pSheet->hasCodeName()==false) {
+                $pSheet->setCodeName($pSheet->getTitle());
+            }
+            $objWriter->writeAttribute('codeName', $pSheet->getCodeName());
+        }
+        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            $objWriter->writeAttribute('filterMode', 1);
+            $pSheet->getAutoFilter()->showHideRows();
+        }
+
+        // tabColor
+        if ($pSheet->isTabColorSet()) {
+            $objWriter->startElement('tabColor');
+            $objWriter->writeAttribute('rgb', $pSheet->getTabColor()->getARGB());
+            $objWriter->endElement();
+        }
+
+        // outlinePr
+        $objWriter->startElement('outlinePr');
+        $objWriter->writeAttribute('summaryBelow', ($pSheet->getShowSummaryBelow() ? '1' : '0'));
+        $objWriter->writeAttribute('summaryRight', ($pSheet->getShowSummaryRight() ? '1' : '0'));
+        $objWriter->endElement();
+
+        // pageSetUpPr
+        if ($pSheet->getPageSetup()->getFitToPage()) {
+            $objWriter->startElement('pageSetUpPr');
+            $objWriter->writeAttribute('fitToPage', '1');
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Dimension
+     *
+     * @param    PHPExcel_Shared_XMLWriter    $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet            $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeDimension(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // dimension
+        $objWriter->startElement('dimension');
+        $objWriter->writeAttribute('ref', $pSheet->calculateWorksheetDimension());
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write SheetViews
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeSheetViews(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // sheetViews
+        $objWriter->startElement('sheetViews');
+
+        // Sheet selected?
+        $sheetSelected = false;
+        if ($this->getParentWriter()->getPHPExcel()->getIndex($pSheet) == $this->getParentWriter()->getPHPExcel()->getActiveSheetIndex()) {
+            $sheetSelected = true;
+        }
+
+        // sheetView
+        $objWriter->startElement('sheetView');
+        $objWriter->writeAttribute('tabSelected', $sheetSelected ? '1' : '0');
+        $objWriter->writeAttribute('workbookViewId', '0');
+
+        // Zoom scales
+        if ($pSheet->getSheetView()->getZoomScale() != 100) {
+            $objWriter->writeAttribute('zoomScale', $pSheet->getSheetView()->getZoomScale());
+        }
+        if ($pSheet->getSheetView()->getZoomScaleNormal() != 100) {
+            $objWriter->writeAttribute('zoomScaleNormal', $pSheet->getSheetView()->getZoomScaleNormal());
+        }
+
+        // View Layout Type
+        if ($pSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL) {
+            $objWriter->writeAttribute('view', $pSheet->getSheetView()->getView());
+        }
+
+        // Gridlines
+        if ($pSheet->getShowGridlines()) {
+            $objWriter->writeAttribute('showGridLines', 'true');
+        } else {
+            $objWriter->writeAttribute('showGridLines', 'false');
+        }
+
+        // Row and column headers
+        if ($pSheet->getShowRowColHeaders()) {
+            $objWriter->writeAttribute('showRowColHeaders', '1');
+        } else {
+            $objWriter->writeAttribute('showRowColHeaders', '0');
+        }
+
+        // Right-to-left
+        if ($pSheet->getRightToLeft()) {
+            $objWriter->writeAttribute('rightToLeft', 'true');
+        }
+
+        $activeCell = $pSheet->getActiveCell();
+
+        // Pane
+        $pane = '';
+        $topLeftCell = $pSheet->getFreezePane();
+        if (($topLeftCell != '') && ($topLeftCell != 'A1')) {
+            $activeCell = empty($activeCell) ? $topLeftCell : $activeCell;
+            // Calculate freeze coordinates
+            $xSplit = $ySplit = 0;
+
+            list($xSplit, $ySplit) = PHPExcel_Cell::coordinateFromString($topLeftCell);
+            $xSplit = PHPExcel_Cell::columnIndexFromString($xSplit);
+
+            // pane
+            $pane = 'topRight';
+            $objWriter->startElement('pane');
+            if ($xSplit > 1) {
+                $objWriter->writeAttribute('xSplit', $xSplit - 1);
+            }
+            if ($ySplit > 1) {
+                $objWriter->writeAttribute('ySplit', $ySplit - 1);
+                $pane = ($xSplit > 1) ? 'bottomRight' : 'bottomLeft';
+            }
+            $objWriter->writeAttribute('topLeftCell', $topLeftCell);
+            $objWriter->writeAttribute('activePane', $pane);
+            $objWriter->writeAttribute('state', 'frozen');
+            $objWriter->endElement();
+
+            if (($xSplit > 1) && ($ySplit > 1)) {
+                //    Write additional selections if more than two panes (ie both an X and a Y split)
+                $objWriter->startElement('selection');
+                $objWriter->writeAttribute('pane', 'topRight');
+                $objWriter->endElement();
+                $objWriter->startElement('selection');
+                $objWriter->writeAttribute('pane', 'bottomLeft');
+                $objWriter->endElement();
+            }
+        }
+
+        // Selection
+//      if ($pane != '') {
+        // Only need to write selection element if we have a split pane
+        // We cheat a little by over-riding the active cell selection, setting it to the split cell
+        $objWriter->startElement('selection');
+        if ($pane != '') {
+            $objWriter->writeAttribute('pane', $pane);
+        }
+        $objWriter->writeAttribute('activeCell', $activeCell);
+        $objWriter->writeAttribute('sqref', $activeCell);
+        $objWriter->endElement();
+//      }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write SheetFormatPr
+     *
+     * @param    PHPExcel_Shared_XMLWriter $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet          $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeSheetFormatPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // sheetFormatPr
+        $objWriter->startElement('sheetFormatPr');
+
+        // Default row height
+        if ($pSheet->getDefaultRowDimension()->getRowHeight() >= 0) {
+            $objWriter->writeAttribute('customHeight', 'true');
+            $objWriter->writeAttribute('defaultRowHeight', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
+        } else {
+            $objWriter->writeAttribute('defaultRowHeight', '14.4');
+        }
+
+        // Set Zero Height row
+        if ((string)$pSheet->getDefaultRowDimension()->getZeroHeight()  == '1' ||
+            strtolower((string)$pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true') {
+            $objWriter->writeAttribute('zeroHeight', '1');
+        }
+
+        // Default column width
+        if ($pSheet->getDefaultColumnDimension()->getWidth() >= 0) {
+            $objWriter->writeAttribute('defaultColWidth', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultColumnDimension()->getWidth()));
+        }
+
+        // Outline level - row
+        $outlineLevelRow = 0;
+        foreach ($pSheet->getRowDimensions() as $dimension) {
+            if ($dimension->getOutlineLevel() > $outlineLevelRow) {
+                $outlineLevelRow = $dimension->getOutlineLevel();
+            }
+        }
+        $objWriter->writeAttribute('outlineLevelRow', (int)$outlineLevelRow);
+
+        // Outline level - column
+        $outlineLevelCol = 0;
+        foreach ($pSheet->getColumnDimensions() as $dimension) {
+            if ($dimension->getOutlineLevel() > $outlineLevelCol) {
+                $outlineLevelCol = $dimension->getOutlineLevel();
+            }
+        }
+        $objWriter->writeAttribute('outlineLevelCol', (int)$outlineLevelCol);
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Cols
+     *
+     * @param    PHPExcel_Shared_XMLWriter $objWriter XML Writer
+     * @param    PHPExcel_Worksheet $pSheet Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeCols(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // cols
+        if (count($pSheet->getColumnDimensions()) > 0) {
+            $objWriter->startElement('cols');
+
+            $pSheet->calculateColumnWidths();
+
+            // Loop through column dimensions
+            foreach ($pSheet->getColumnDimensions() as $colDimension) {
+                // col
+                $objWriter->startElement('col');
+                $objWriter->writeAttribute('min', PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
+                $objWriter->writeAttribute('max', PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
+
+                if ($colDimension->getWidth() < 0) {
+                    // No width set, apply default of 10
+                    $objWriter->writeAttribute('width', '9.10');
+                } else {
+                    // Width set
+                    $objWriter->writeAttribute('width', PHPExcel_Shared_String::FormatNumber($colDimension->getWidth()));
+                }
+
+                // Column visibility
+                if ($colDimension->getVisible() == false) {
+                    $objWriter->writeAttribute('hidden', 'true');
+                }
+
+                // Auto size?
+                if ($colDimension->getAutoSize()) {
+                    $objWriter->writeAttribute('bestFit', 'true');
+                }
+
+                // Custom width?
+                if ($colDimension->getWidth() != $pSheet->getDefaultColumnDimension()->getWidth()) {
+                    $objWriter->writeAttribute('customWidth', 'true');
+                }
+
+                // Collapsed
+                if ($colDimension->getCollapsed() == true) {
+                    $objWriter->writeAttribute('collapsed', 'true');
+                }
+
+                // Outline level
+                if ($colDimension->getOutlineLevel() > 0) {
+                    $objWriter->writeAttribute('outlineLevel', $colDimension->getOutlineLevel());
+                }
+
+                // Style
+                $objWriter->writeAttribute('style', $colDimension->getXfIndex());
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write SheetProtection
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeSheetProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // sheetProtection
+        $objWriter->startElement('sheetProtection');
+
+        if ($pSheet->getProtection()->getPassword() != '') {
+            $objWriter->writeAttribute('password', $pSheet->getProtection()->getPassword());
+        }
+
+        $objWriter->writeAttribute('sheet', ($pSheet->getProtection()->getSheet() ? 'true' : 'false'));
+        $objWriter->writeAttribute('objects', ($pSheet->getProtection()->getObjects() ? 'true' : 'false'));
+        $objWriter->writeAttribute('scenarios', ($pSheet->getProtection()->getScenarios() ? 'true' : 'false'));
+        $objWriter->writeAttribute('formatCells', ($pSheet->getProtection()->getFormatCells() ? 'true' : 'false'));
+        $objWriter->writeAttribute('formatColumns', ($pSheet->getProtection()->getFormatColumns() ? 'true' : 'false'));
+        $objWriter->writeAttribute('formatRows', ($pSheet->getProtection()->getFormatRows() ? 'true' : 'false'));
+        $objWriter->writeAttribute('insertColumns', ($pSheet->getProtection()->getInsertColumns() ? 'true' : 'false'));
+        $objWriter->writeAttribute('insertRows', ($pSheet->getProtection()->getInsertRows() ? 'true' : 'false'));
+        $objWriter->writeAttribute('insertHyperlinks', ($pSheet->getProtection()->getInsertHyperlinks() ? 'true' : 'false'));
+        $objWriter->writeAttribute('deleteColumns', ($pSheet->getProtection()->getDeleteColumns() ? 'true' : 'false'));
+        $objWriter->writeAttribute('deleteRows', ($pSheet->getProtection()->getDeleteRows() ? 'true' : 'false'));
+        $objWriter->writeAttribute('selectLockedCells', ($pSheet->getProtection()->getSelectLockedCells() ? 'true' : 'false'));
+        $objWriter->writeAttribute('sort', ($pSheet->getProtection()->getSort() ? 'true' : 'false'));
+        $objWriter->writeAttribute('autoFilter', ($pSheet->getProtection()->getAutoFilter() ? 'true' : 'false'));
+        $objWriter->writeAttribute('pivotTables', ($pSheet->getProtection()->getPivotTables() ? 'true' : 'false'));
+        $objWriter->writeAttribute('selectUnlockedCells', ($pSheet->getProtection()->getSelectUnlockedCells() ? 'true' : 'false'));
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write ConditionalFormatting
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeConditionalFormatting(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // Conditional id
+        $id = 1;
+
+        // Loop through styles in the current worksheet
+        foreach ($pSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            foreach ($conditionalStyles as $conditional) {
+                // WHY was this again?
+                // if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()) == '') {
+                //    continue;
+                // }
+                if ($conditional->getConditionType() != PHPExcel_Style_Conditional::CONDITION_NONE) {
+                    // conditionalFormatting
+                    $objWriter->startElement('conditionalFormatting');
+                    $objWriter->writeAttribute('sqref', $cellCoordinate);
+
+                    // cfRule
+                    $objWriter->startElement('cfRule');
+                    $objWriter->writeAttribute('type', $conditional->getConditionType());
+                    $objWriter->writeAttribute('dxfId', $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()));
+                    $objWriter->writeAttribute('priority', $id++);
+
+                    if (($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT)
+                        && $conditional->getOperatorType() != PHPExcel_Style_Conditional::OPERATOR_NONE) {
+                        $objWriter->writeAttribute('operator', $conditional->getOperatorType());
+                    }
+
+                    if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+                        && !is_null($conditional->getText())) {
+                        $objWriter->writeAttribute('text', $conditional->getText());
+                    }
+
+                    if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+                        && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_CONTAINSTEXT
+                        && !is_null($conditional->getText())) {
+                        $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
+                    } elseif ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+                        && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BEGINSWITH
+                        && !is_null($conditional->getText())) {
+                        $objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
+                    } elseif ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+                        && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_ENDSWITH
+                        && !is_null($conditional->getText())) {
+                        $objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
+                    } elseif ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+                        && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_NOTCONTAINS
+                        && !is_null($conditional->getText())) {
+                        $objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
+                    } elseif ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
+                        || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+                        || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) {
+                        foreach ($conditional->getConditions() as $formula) {
+                            // Formula
+                            $objWriter->writeElement('formula', $formula);
+                        }
+                    }
+
+                    $objWriter->endElement();
+
+                    $objWriter->endElement();
+                }
+            }
+        }
+    }
+
+    /**
+     * Write DataValidations
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeDataValidations(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // Datavalidation collection
+        $dataValidationCollection = $pSheet->getDataValidationCollection();
+
+        // Write data validations?
+        if (!empty($dataValidationCollection)) {
+            $objWriter->startElement('dataValidations');
+            $objWriter->writeAttribute('count', count($dataValidationCollection));
+
+            foreach ($dataValidationCollection as $coordinate => $dv) {
+                $objWriter->startElement('dataValidation');
+
+                if ($dv->getType() != '') {
+                    $objWriter->writeAttribute('type', $dv->getType());
+                }
+
+                if ($dv->getErrorStyle() != '') {
+                    $objWriter->writeAttribute('errorStyle', $dv->getErrorStyle());
+                }
+
+                if ($dv->getOperator() != '') {
+                    $objWriter->writeAttribute('operator', $dv->getOperator());
+                }
+
+                $objWriter->writeAttribute('allowBlank', ($dv->getAllowBlank() ? '1'  : '0'));
+                $objWriter->writeAttribute('showDropDown', (!$dv->getShowDropDown() ? '1'  : '0'));
+                $objWriter->writeAttribute('showInputMessage', ($dv->getShowInputMessage() ? '1'  : '0'));
+                $objWriter->writeAttribute('showErrorMessage', ($dv->getShowErrorMessage() ? '1'  : '0'));
+
+                if ($dv->getErrorTitle() !== '') {
+                    $objWriter->writeAttribute('errorTitle', $dv->getErrorTitle());
+                }
+                if ($dv->getError() !== '') {
+                    $objWriter->writeAttribute('error', $dv->getError());
+                }
+                if ($dv->getPromptTitle() !== '') {
+                    $objWriter->writeAttribute('promptTitle', $dv->getPromptTitle());
+                }
+                if ($dv->getPrompt() !== '') {
+                    $objWriter->writeAttribute('prompt', $dv->getPrompt());
+                }
+
+                $objWriter->writeAttribute('sqref', $coordinate);
+
+                if ($dv->getFormula1() !== '') {
+                    $objWriter->writeElement('formula1', $dv->getFormula1());
+                }
+                if ($dv->getFormula2() !== '') {
+                    $objWriter->writeElement('formula2', $dv->getFormula2());
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Hyperlinks
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeHyperlinks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // Hyperlink collection
+        $hyperlinkCollection = $pSheet->getHyperlinkCollection();
+
+        // Relation ID
+        $relationId = 1;
+
+        // Write hyperlinks?
+        if (!empty($hyperlinkCollection)) {
+            $objWriter->startElement('hyperlinks');
+
+            foreach ($hyperlinkCollection as $coordinate => $hyperlink) {
+                $objWriter->startElement('hyperlink');
+
+                $objWriter->writeAttribute('ref', $coordinate);
+                if (!$hyperlink->isInternal()) {
+                    $objWriter->writeAttribute('r:id', 'rId_hyperlink_' . $relationId);
+                    ++$relationId;
+                } else {
+                    $objWriter->writeAttribute('location', str_replace('sheet://', '', $hyperlink->getUrl()));
+                }
+
+                if ($hyperlink->getTooltip() != '') {
+                    $objWriter->writeAttribute('tooltip', $hyperlink->getTooltip());
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write ProtectedRanges
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeProtectedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        if (count($pSheet->getProtectedCells()) > 0) {
+            // protectedRanges
+            $objWriter->startElement('protectedRanges');
+
+            // Loop protectedRanges
+            foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
+                // protectedRange
+                $objWriter->startElement('protectedRange');
+                $objWriter->writeAttribute('name', 'p' . md5($protectedCell));
+                $objWriter->writeAttribute('sqref', $protectedCell);
+                if (!empty($passwordHash)) {
+                    $objWriter->writeAttribute('password', $passwordHash);
+                }
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write MergeCells
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeMergeCells(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        if (count($pSheet->getMergeCells()) > 0) {
+            // mergeCells
+            $objWriter->startElement('mergeCells');
+
+            // Loop mergeCells
+            foreach ($pSheet->getMergeCells() as $mergeCell) {
+                // mergeCell
+                $objWriter->startElement('mergeCell');
+                $objWriter->writeAttribute('ref', $mergeCell);
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write PrintOptions
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writePrintOptions(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // printOptions
+        $objWriter->startElement('printOptions');
+
+        $objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true': 'false'));
+        $objWriter->writeAttribute('gridLinesSet', 'true');
+
+        if ($pSheet->getPageSetup()->getHorizontalCentered()) {
+            $objWriter->writeAttribute('horizontalCentered', 'true');
+        }
+
+        if ($pSheet->getPageSetup()->getVerticalCentered()) {
+            $objWriter->writeAttribute('verticalCentered', 'true');
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write PageMargins
+     *
+     * @param    PHPExcel_Shared_XMLWriter                $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                        $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writePageMargins(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // pageMargins
+        $objWriter->startElement('pageMargins');
+        $objWriter->writeAttribute('left', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
+        $objWriter->writeAttribute('right', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
+        $objWriter->writeAttribute('top', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
+        $objWriter->writeAttribute('bottom', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
+        $objWriter->writeAttribute('header', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
+        $objWriter->writeAttribute('footer', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write AutoFilter
+     *
+     * @param    PHPExcel_Shared_XMLWriter                $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                        $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeAutoFilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            // autoFilter
+            $objWriter->startElement('autoFilter');
+
+            // Strip any worksheet reference from the filter coordinates
+            $range = PHPExcel_Cell::splitRange($autoFilterRange);
+            $range = $range[0];
+            //    Strip any worksheet ref
+            if (strpos($range[0], '!') !== false) {
+                list($ws, $range[0]) = explode('!', $range[0]);
+            }
+            $range = implode(':', $range);
+
+            $objWriter->writeAttribute('ref', str_replace('$', '', $range));
+
+            $columns = $pSheet->getAutoFilter()->getColumns();
+            if (count($columns > 0)) {
+                foreach ($columns as $columnID => $column) {
+                    $rules = $column->getRules();
+                    if (count($rules) > 0) {
+                        $objWriter->startElement('filterColumn');
+                        $objWriter->writeAttribute('colId', $pSheet->getAutoFilter()->getColumnOffset($columnID));
+
+                        $objWriter->startElement($column->getFilterType());
+                        if ($column->getJoin() == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND) {
+                            $objWriter->writeAttribute('and', 1);
+                        }
+
+                        foreach ($rules as $rule) {
+                            if (($column->getFilterType() === PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER) &&
+                                ($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
+                                ($rule->getValue() === '')) {
+                                //    Filter rule for Blanks
+                                $objWriter->writeAttribute('blank', 1);
+                            } elseif ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
+                                //    Dynamic Filter Rule
+                                $objWriter->writeAttribute('type', $rule->getGrouping());
+                                $val = $column->getAttribute('val');
+                                if ($val !== null) {
+                                    $objWriter->writeAttribute('val', $val);
+                                }
+                                $maxVal = $column->getAttribute('maxVal');
+                                if ($maxVal !== null) {
+                                    $objWriter->writeAttribute('maxVal', $maxVal);
+                                }
+                            } elseif ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
+                                //    Top 10 Filter Rule
+                                $objWriter->writeAttribute('val', $rule->getValue());
+                                $objWriter->writeAttribute('percent', (($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
+                                $objWriter->writeAttribute('top', (($rule->getGrouping() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0'));
+                            } else {
+                                //    Filter, DateGroupItem or CustomFilter
+                                $objWriter->startElement($rule->getRuleType());
+
+                                if ($rule->getOperator() !== PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
+                                    $objWriter->writeAttribute('operator', $rule->getOperator());
+                                }
+                                if ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
+                                    // Date Group filters
+                                    foreach ($rule->getValue() as $key => $value) {
+                                        if ($value > '') {
+                                            $objWriter->writeAttribute($key, $value);
+                                        }
+                                    }
+                                    $objWriter->writeAttribute('dateTimeGrouping', $rule->getGrouping());
+                                } else {
+                                    $objWriter->writeAttribute('val', $rule->getValue());
+                                }
+
+                                $objWriter->endElement();
+                            }
+                        }
+
+                        $objWriter->endElement();
+
+                        $objWriter->endElement();
+                    }
+                }
+            }
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write PageSetup
+     *
+     * @param    PHPExcel_Shared_XMLWriter            $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                    $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writePageSetup(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // pageSetup
+        $objWriter->startElement('pageSetup');
+        $objWriter->writeAttribute('paperSize', $pSheet->getPageSetup()->getPaperSize());
+        $objWriter->writeAttribute('orientation', $pSheet->getPageSetup()->getOrientation());
+
+        if (!is_null($pSheet->getPageSetup()->getScale())) {
+            $objWriter->writeAttribute('scale', $pSheet->getPageSetup()->getScale());
+        }
+        if (!is_null($pSheet->getPageSetup()->getFitToHeight())) {
+            $objWriter->writeAttribute('fitToHeight', $pSheet->getPageSetup()->getFitToHeight());
+        } else {
+            $objWriter->writeAttribute('fitToHeight', '0');
+        }
+        if (!is_null($pSheet->getPageSetup()->getFitToWidth())) {
+            $objWriter->writeAttribute('fitToWidth', $pSheet->getPageSetup()->getFitToWidth());
+        } else {
+            $objWriter->writeAttribute('fitToWidth', '0');
+        }
+        if (!is_null($pSheet->getPageSetup()->getFirstPageNumber())) {
+            $objWriter->writeAttribute('firstPageNumber', $pSheet->getPageSetup()->getFirstPageNumber());
+            $objWriter->writeAttribute('useFirstPageNumber', '1');
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Header / Footer
+     *
+     * @param    PHPExcel_Shared_XMLWriter        $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeHeaderFooter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // headerFooter
+        $objWriter->startElement('headerFooter');
+        $objWriter->writeAttribute('differentOddEven', ($pSheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
+        $objWriter->writeAttribute('differentFirst', ($pSheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
+        $objWriter->writeAttribute('scaleWithDoc', ($pSheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
+        $objWriter->writeAttribute('alignWithMargins', ($pSheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
+
+        $objWriter->writeElement('oddHeader', $pSheet->getHeaderFooter()->getOddHeader());
+        $objWriter->writeElement('oddFooter', $pSheet->getHeaderFooter()->getOddFooter());
+        $objWriter->writeElement('evenHeader', $pSheet->getHeaderFooter()->getEvenHeader());
+        $objWriter->writeElement('evenFooter', $pSheet->getHeaderFooter()->getEvenFooter());
+        $objWriter->writeElement('firstHeader', $pSheet->getHeaderFooter()->getFirstHeader());
+        $objWriter->writeElement('firstFooter', $pSheet->getHeaderFooter()->getFirstFooter());
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Breaks
+     *
+     * @param    PHPExcel_Shared_XMLWriter        $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeBreaks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // Get row and column breaks
+        $aRowBreaks = array();
+        $aColumnBreaks = array();
+        foreach ($pSheet->getBreaks() as $cell => $breakType) {
+            if ($breakType == PHPExcel_Worksheet::BREAK_ROW) {
+                $aRowBreaks[] = $cell;
+            } elseif ($breakType == PHPExcel_Worksheet::BREAK_COLUMN) {
+                $aColumnBreaks[] = $cell;
+            }
+        }
+
+        // rowBreaks
+        if (!empty($aRowBreaks)) {
+            $objWriter->startElement('rowBreaks');
+            $objWriter->writeAttribute('count', count($aRowBreaks));
+            $objWriter->writeAttribute('manualBreakCount', count($aRowBreaks));
+
+            foreach ($aRowBreaks as $cell) {
+                $coords = PHPExcel_Cell::coordinateFromString($cell);
+
+                $objWriter->startElement('brk');
+                $objWriter->writeAttribute('id', $coords[1]);
+                $objWriter->writeAttribute('man', '1');
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+
+        // Second, write column breaks
+        if (!empty($aColumnBreaks)) {
+            $objWriter->startElement('colBreaks');
+            $objWriter->writeAttribute('count', count($aColumnBreaks));
+            $objWriter->writeAttribute('manualBreakCount', count($aColumnBreaks));
+
+            foreach ($aColumnBreaks as $cell) {
+                $coords = PHPExcel_Cell::coordinateFromString($cell);
+
+                $objWriter->startElement('brk');
+                $objWriter->writeAttribute('id', PHPExcel_Cell::columnIndexFromString($coords[0]) - 1);
+                $objWriter->writeAttribute('man', '1');
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write SheetData
+     *
+     * @param    PHPExcel_Shared_XMLWriter        $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                $pSheet            Worksheet
+     * @param    string[]                        $pStringTable    String table
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeSheetData(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pStringTable = null)
+    {
+        if (is_array($pStringTable)) {
+            // Flipped stringtable, for faster index searching
+            $aFlippedStringTable = $this->getParentWriter()->getWriterPart('stringtable')->flipStringTable($pStringTable);
+
+            // sheetData
+            $objWriter->startElement('sheetData');
+
+            // Get column count
+            $colCount = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn());
+
+            // Highest row number
+            $highestRow = $pSheet->getHighestRow();
+
+            // Loop through cells
+            $cellsByRow = array();
+            foreach ($pSheet->getCellCollection() as $cellID) {
+                $cellAddress = PHPExcel_Cell::coordinateFromString($cellID);
+                $cellsByRow[$cellAddress[1]][] = $cellID;
+            }
+
+            $currentRow = 0;
+            while ($currentRow++ < $highestRow) {
+                // Get row dimension
+                $rowDimension = $pSheet->getRowDimension($currentRow);
+
+                // Write current row?
+                $writeCurrentRow = isset($cellsByRow[$currentRow]) || $rowDimension->getRowHeight() >= 0 || $rowDimension->getVisible() == false || $rowDimension->getCollapsed() == true || $rowDimension->getOutlineLevel() > 0 || $rowDimension->getXfIndex() !== null;
+
+                if ($writeCurrentRow) {
+                    // Start a new row
+                    $objWriter->startElement('row');
+                    $objWriter->writeAttribute('r', $currentRow);
+                    $objWriter->writeAttribute('spans', '1:' . $colCount);
+
+                    // Row dimensions
+                    if ($rowDimension->getRowHeight() >= 0) {
+                        $objWriter->writeAttribute('customHeight', '1');
+                        $objWriter->writeAttribute('ht', PHPExcel_Shared_String::FormatNumber($rowDimension->getRowHeight()));
+                    }
+
+                    // Row visibility
+                    if ($rowDimension->getVisible() == false) {
+                        $objWriter->writeAttribute('hidden', 'true');
+                    }
+
+                    // Collapsed
+                    if ($rowDimension->getCollapsed() == true) {
+                        $objWriter->writeAttribute('collapsed', 'true');
+                    }
+
+                    // Outline level
+                    if ($rowDimension->getOutlineLevel() > 0) {
+                        $objWriter->writeAttribute('outlineLevel', $rowDimension->getOutlineLevel());
+                    }
+
+                    // Style
+                    if ($rowDimension->getXfIndex() !== null) {
+                        $objWriter->writeAttribute('s', $rowDimension->getXfIndex());
+                        $objWriter->writeAttribute('customFormat', '1');
+                    }
+
+                    // Write cells
+                    if (isset($cellsByRow[$currentRow])) {
+                        foreach ($cellsByRow[$currentRow] as $cellAddress) {
+                            // Write cell
+                            $this->writeCell($objWriter, $pSheet, $cellAddress, $pStringTable, $aFlippedStringTable);
+                        }
+                    }
+
+                    // End row
+                    $objWriter->endElement();
+                }
+            }
+
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Write Cell
+     *
+     * @param    PHPExcel_Shared_XMLWriter    $objWriter                XML Writer
+     * @param    PHPExcel_Worksheet            $pSheet                    Worksheet
+     * @param    PHPExcel_Cell                $pCellAddress            Cell Address
+     * @param    string[]                    $pStringTable            String table
+     * @param    string[]                    $pFlippedStringTable    String table (flipped), for faster index searching
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeCell(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pCellAddress = null, $pStringTable = null, $pFlippedStringTable = null)
+    {
+        if (is_array($pStringTable) && is_array($pFlippedStringTable)) {
+            // Cell
+            $pCell = $pSheet->getCell($pCellAddress);
+            $objWriter->startElement('c');
+            $objWriter->writeAttribute('r', $pCellAddress);
+
+            // Sheet styles
+            if ($pCell->getXfIndex() != '') {
+                $objWriter->writeAttribute('s', $pCell->getXfIndex());
+            }
+
+            // If cell value is supplied, write cell value
+            $cellValue = $pCell->getValue();
+            if (is_object($cellValue) || $cellValue !== '') {
+                // Map type
+                $mappedType = $pCell->getDataType();
+
+                // Write data type depending on its type
+                switch (strtolower($mappedType)) {
+                    case 'inlinestr':    // Inline string
+                    case 's':            // String
+                    case 'b':            // Boolean
+                        $objWriter->writeAttribute('t', $mappedType);
+                        break;
+                    case 'f':            // Formula
+                        $calculatedValue = ($this->getParentWriter()->getPreCalculateFormulas()) ?
+                            $pCell->getCalculatedValue() :
+                            $cellValue;
+                        if (is_string($calculatedValue)) {
+                            $objWriter->writeAttribute('t', 'str');
+                        }
+                        break;
+                    case 'e':            // Error
+                        $objWriter->writeAttribute('t', $mappedType);
+                }
+
+                // Write data depending on its type
+                switch (strtolower($mappedType)) {
+                    case 'inlinestr':    // Inline string
+                        if (! $cellValue instanceof PHPExcel_RichText) {
+                            $objWriter->writeElement('t', PHPExcel_Shared_String::ControlCharacterPHP2OOXML(htmlspecialchars($cellValue)));
+                        } elseif ($cellValue instanceof PHPExcel_RichText) {
+                            $objWriter->startElement('is');
+                            $this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $cellValue);
+                            $objWriter->endElement();
+                        }
+
+                        break;
+                    case 's':            // String
+                        if (! $cellValue instanceof PHPExcel_RichText) {
+                            if (isset($pFlippedStringTable[$cellValue])) {
+                                $objWriter->writeElement('v', $pFlippedStringTable[$cellValue]);
+                            }
+                        } elseif ($cellValue instanceof PHPExcel_RichText) {
+                            $objWriter->writeElement('v', $pFlippedStringTable[$cellValue->getHashCode()]);
+                        }
+
+                        break;
+                    case 'f':            // Formula
+                        $attributes = $pCell->getFormulaAttributes();
+                        if ($attributes['t'] == 'array') {
+                            $objWriter->startElement('f');
+                            $objWriter->writeAttribute('t', 'array');
+                            $objWriter->writeAttribute('ref', $pCellAddress);
+                            $objWriter->writeAttribute('aca', '1');
+                            $objWriter->writeAttribute('ca', '1');
+                            $objWriter->text(substr($cellValue, 1));
+                            $objWriter->endElement();
+                        } else {
+                            $objWriter->writeElement('f', substr($cellValue, 1));
+                        }
+                        if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
+                            if ($this->getParentWriter()->getPreCalculateFormulas()) {
+//                                $calculatedValue = $pCell->getCalculatedValue();
+                                if (!is_array($calculatedValue) && substr($calculatedValue, 0, 1) != '#') {
+                                    $objWriter->writeElement('v', PHPExcel_Shared_String::FormatNumber($calculatedValue));
+                                } else {
+                                    $objWriter->writeElement('v', '0');
+                                }
+                            } else {
+                                $objWriter->writeElement('v', '0');
+                            }
+                        }
+                        break;
+                    case 'n':            // Numeric
+                        // force point as decimal separator in case current locale uses comma
+                        $objWriter->writeElement('v', str_replace(',', '.', $cellValue));
+                        break;
+                    case 'b':            // Boolean
+                        $objWriter->writeElement('v', ($cellValue ? '1' : '0'));
+                        break;
+                    case 'e':            // Error
+                        if (substr($cellValue, 0, 1) == '=') {
+                            $objWriter->writeElement('f', substr($cellValue, 1));
+                            $objWriter->writeElement('v', substr($cellValue, 1));
+                        } else {
+                            $objWriter->writeElement('v', $cellValue);
+                        }
+
+                        break;
+                }
+            }
+
+            $objWriter->endElement();
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Write Drawings
+     *
+     * @param    PHPExcel_Shared_XMLWriter    $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet            $pSheet            Worksheet
+     * @param    boolean                        $includeCharts    Flag indicating if we should include drawing details for charts
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeDrawings(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $includeCharts = false)
+    {
+        $chartCount = ($includeCharts) ? $pSheet->getChartCollection()->count() : 0;
+        // If sheet contains drawings, add the relationships
+        if (($pSheet->getDrawingCollection()->count() > 0) ||
+            ($chartCount > 0)) {
+            $objWriter->startElement('drawing');
+            $objWriter->writeAttribute('r:id', 'rId1');
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write LegacyDrawing
+     *
+     * @param    PHPExcel_Shared_XMLWriter        $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeLegacyDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // If sheet contains comments, add the relationships
+        if (count($pSheet->getComments()) > 0) {
+            $objWriter->startElement('legacyDrawing');
+            $objWriter->writeAttribute('r:id', 'rId_comments_vml1');
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write LegacyDrawingHF
+     *
+     * @param    PHPExcel_Shared_XMLWriter        $objWriter        XML Writer
+     * @param    PHPExcel_Worksheet                $pSheet            Worksheet
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeLegacyDrawingHF(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+    {
+        // If sheet contains images, add the relationships
+        if (count($pSheet->getHeaderFooter()->getImages()) > 0) {
+            $objWriter->startElement('legacyDrawingHF');
+            $objWriter->writeAttribute('r:id', 'rId_headerfooter_vml1');
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel2007/WriterPart.php b/lib/PHPExcel/Writer/Excel2007/WriterPart.php
new file mode 100644
index 000000000..806ebe510
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel2007/WriterPart.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel2007_WriterPart
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Writer_Excel2007_WriterPart
+{
+    /**
+     * Parent IWriter object
+     *
+     * @var PHPExcel_Writer_IWriter
+     */
+    private $parentWriter;
+
+    /**
+     * Set parent IWriter object
+     *
+     * @param PHPExcel_Writer_IWriter    $pWriter
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function setParentWriter(PHPExcel_Writer_IWriter $pWriter = null)
+    {
+        $this->parentWriter = $pWriter;
+    }
+
+    /**
+     * Get parent IWriter object
+     *
+     * @return PHPExcel_Writer_IWriter
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function getParentWriter()
+    {
+        if (!is_null($this->parentWriter)) {
+            return $this->parentWriter;
+        } else {
+            throw new PHPExcel_Writer_Exception("No parent PHPExcel_Writer_IWriter assigned.");
+        }
+    }
+
+    /**
+     * Set parent IWriter object
+     *
+     * @param PHPExcel_Writer_IWriter    $pWriter
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function __construct(PHPExcel_Writer_IWriter $pWriter = null)
+    {
+        if (!is_null($pWriter)) {
+            $this->parentWriter = $pWriter;
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5.php b/lib/PHPExcel/Writer/Excel5.php
new file mode 100644
index 000000000..2dede819a
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5.php
@@ -0,0 +1,904 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+{
+    /**
+     * PHPExcel object
+     *
+     * @var PHPExcel
+     */
+    private $phpExcel;
+
+    /**
+     * Total number of shared strings in workbook
+     *
+     * @var int
+     */
+    private $strTotal = 0;
+
+    /**
+     * Number of unique shared strings in workbook
+     *
+     * @var int
+     */
+    private $strUnique = 0;
+
+    /**
+     * Array of unique shared strings in workbook
+     *
+     * @var array
+     */
+    private $strTable = array();
+
+    /**
+     * Color cache. Mapping between RGB value and color index.
+     *
+     * @var array
+     */
+    private $colors;
+
+    /**
+     * Formula parser
+     *
+     * @var PHPExcel_Writer_Excel5_Parser
+     */
+    private $parser;
+
+    /**
+     * Identifier clusters for drawings. Used in MSODRAWINGGROUP record.
+     *
+     * @var array
+     */
+    private $IDCLs;
+
+    /**
+     * Basic OLE object summary information
+     *
+     * @var array
+     */
+    private $summaryInformation;
+
+    /**
+     * Extended OLE object document summary information
+     *
+     * @var array
+     */
+    private $documentSummaryInformation;
+
+    /**
+     * Create a new PHPExcel_Writer_Excel5
+     *
+     * @param    PHPExcel    $phpExcel    PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        $this->phpExcel    = $phpExcel;
+
+        $this->parser        = new PHPExcel_Writer_Excel5_Parser();
+    }
+
+    /**
+     * Save PHPExcel to file
+     *
+     * @param    string        $pFilename
+     * @throws    PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+
+        // garbage collect
+        $this->phpExcel->garbageCollect();
+
+        $saveDebugLog = PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->getWriteDebugLog();
+        PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog(false);
+        $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
+        PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+
+        // initialize colors array
+        $this->colors = array();
+
+        // Initialise workbook writer
+        $this->writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->phpExcel, $this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser);
+
+        // Initialise worksheet writers
+        $countSheets = $this->phpExcel->getSheetCount();
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $this->writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser, $this->preCalculateFormulas, $this->phpExcel->getSheet($i));
+        }
+
+        // build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
+        $this->buildWorksheetEschers();
+        $this->buildWorkbookEscher();
+
+        // add 15 identical cell style Xfs
+        // for now, we use the first cellXf instead of cellStyleXf
+        $cellXfCollection = $this->phpExcel->getCellXfCollection();
+        for ($i = 0; $i < 15; ++$i) {
+            $this->writerWorkbook->addXfWriter($cellXfCollection[0], true);
+        }
+
+        // add all the cell Xfs
+        foreach ($this->phpExcel->getCellXfCollection() as $style) {
+            $this->writerWorkbook->addXfWriter($style, false);
+        }
+
+        // add fonts from rich text eleemnts
+        for ($i = 0; $i < $countSheets; ++$i) {
+            foreach ($this->writerWorksheets[$i]->phpSheet->getCellCollection() as $cellID) {
+                $cell = $this->writerWorksheets[$i]->phpSheet->getCell($cellID);
+                $cVal = $cell->getValue();
+                if ($cVal instanceof PHPExcel_RichText) {
+                    $elements = $cVal->getRichTextElements();
+                    foreach ($elements as $element) {
+                        if ($element instanceof PHPExcel_RichText_Run) {
+                            $font = $element->getFont();
+                            $this->writerWorksheets[$i]->fontHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
+                        }
+                    }
+                }
+            }
+        }
+
+        // initialize OLE file
+        $workbookStreamName = 'Workbook';
+        $OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName));
+
+        // Write the worksheet streams before the global workbook stream,
+        // because the byte sizes of these are needed in the global workbook stream
+        $worksheetSizes = array();
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $this->writerWorksheets[$i]->close();
+            $worksheetSizes[] = $this->writerWorksheets[$i]->_datasize;
+        }
+
+        // add binary data for global workbook stream
+        $OLE->append($this->writerWorkbook->writeWorkbook($worksheetSizes));
+
+        // add binary data for sheet streams
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $OLE->append($this->writerWorksheets[$i]->getData());
+        }
+
+        $this->documentSummaryInformation = $this->writeDocumentSummaryInformation();
+        // initialize OLE Document Summary Information
+        if (isset($this->documentSummaryInformation) && !empty($this->documentSummaryInformation)) {
+            $OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
+            $OLE_DocumentSummaryInformation->append($this->documentSummaryInformation);
+        }
+
+        $this->summaryInformation = $this->writeSummaryInformation();
+        // initialize OLE Summary Information
+        if (isset($this->summaryInformation) && !empty($this->summaryInformation)) {
+            $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
+            $OLE_SummaryInformation->append($this->summaryInformation);
+        }
+
+        // define OLE Parts
+        $arrRootData = array($OLE);
+        // initialize OLE Properties file
+        if (isset($OLE_SummaryInformation)) {
+            $arrRootData[] = $OLE_SummaryInformation;
+        }
+        // initialize OLE Extended Properties file
+        if (isset($OLE_DocumentSummaryInformation)) {
+            $arrRootData[] = $OLE_DocumentSummaryInformation;
+        }
+
+        $root = new PHPExcel_Shared_OLE_PPS_Root(time(), time(), $arrRootData);
+        // save the OLE file
+        $res = $root->save($pFilename);
+
+        PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
+        PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+    }
+
+    /**
+     * Set temporary storage directory
+     *
+     * @deprecated
+     * @param    string    $pValue        Temporary storage directory
+     * @throws    PHPExcel_Writer_Exception    when directory does not exist
+     * @return PHPExcel_Writer_Excel5
+     */
+    public function setTempDir($pValue = '')
+    {
+        return $this;
+    }
+
+    /**
+     * Build the Worksheet Escher objects
+     *
+     */
+    private function buildWorksheetEschers()
+    {
+        // 1-based index to BstoreContainer
+        $blipIndex = 0;
+        $lastReducedSpId = 0;
+        $lastSpId = 0;
+
+        foreach ($this->phpExcel->getAllsheets() as $sheet) {
+            // sheet index
+            $sheetIndex = $sheet->getParent()->getIndex($sheet);
+
+            $escher = null;
+
+            // check if there are any shapes for this sheet
+            $filterRange = $sheet->getAutoFilter()->getRange();
+            if (count($sheet->getDrawingCollection()) == 0 && empty($filterRange)) {
+                continue;
+            }
+
+            // create intermediate Escher object
+            $escher = new PHPExcel_Shared_Escher();
+
+            // dgContainer
+            $dgContainer = new PHPExcel_Shared_Escher_DgContainer();
+
+            // set the drawing index (we use sheet index + 1)
+            $dgId = $sheet->getParent()->getIndex($sheet) + 1;
+            $dgContainer->setDgId($dgId);
+            $escher->setDgContainer($dgContainer);
+
+            // spgrContainer
+            $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
+            $dgContainer->setSpgrContainer($spgrContainer);
+
+            // add one shape which is the group shape
+            $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+            $spContainer->setSpgr(true);
+            $spContainer->setSpType(0);
+            $spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10);
+            $spgrContainer->addChild($spContainer);
+
+            // add the shapes
+
+            $countShapes[$sheetIndex] = 0; // count number of shapes (minus group shape), in sheet
+
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                ++$blipIndex;
+
+                ++$countShapes[$sheetIndex];
+
+                // add the shape
+                $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+
+                // set the shape type
+                $spContainer->setSpType(0x004B);
+                // set the shape flag
+                $spContainer->setSpFlag(0x02);
+
+                // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
+                $reducedSpId = $countShapes[$sheetIndex];
+                $spId = $reducedSpId
+                    | ($sheet->getParent()->getIndex($sheet) + 1) << 10;
+                $spContainer->setSpId($spId);
+
+                // keep track of last reducedSpId
+                $lastReducedSpId = $reducedSpId;
+
+                // keep track of last spId
+                $lastSpId = $spId;
+
+                // set the BLIP index
+                $spContainer->setOPT(0x4104, $blipIndex);
+
+                // set coordinates and offsets, client anchor
+                $coordinates = $drawing->getCoordinates();
+                $offsetX = $drawing->getOffsetX();
+                $offsetY = $drawing->getOffsetY();
+                $width = $drawing->getWidth();
+                $height = $drawing->getHeight();
+
+                $twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
+
+                $spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
+                $spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
+                $spContainer->setStartOffsetY($twoAnchor['startOffsetY']);
+                $spContainer->setEndCoordinates($twoAnchor['endCoordinates']);
+                $spContainer->setEndOffsetX($twoAnchor['endOffsetX']);
+                $spContainer->setEndOffsetY($twoAnchor['endOffsetY']);
+
+                $spgrContainer->addChild($spContainer);
+            }
+
+            // AutoFilters
+            if (!empty($filterRange)) {
+                $rangeBounds = PHPExcel_Cell::rangeBoundaries($filterRange);
+                $iNumColStart = $rangeBounds[0][0];
+                $iNumColEnd = $rangeBounds[1][0];
+
+                $iInc = $iNumColStart;
+                while ($iInc <= $iNumColEnd) {
+                    ++$countShapes[$sheetIndex];
+
+                    // create an Drawing Object for the dropdown
+                    $oDrawing  = new PHPExcel_Worksheet_BaseDrawing();
+                    // get the coordinates of drawing
+                    $cDrawing   = PHPExcel_Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
+                    $oDrawing->setCoordinates($cDrawing);
+                    $oDrawing->setWorksheet($sheet);
+
+                    // add the shape
+                    $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+                    // set the shape type
+                    $spContainer->setSpType(0x00C9);
+                    // set the shape flag
+                    $spContainer->setSpFlag(0x01);
+
+                    // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
+                    $reducedSpId = $countShapes[$sheetIndex];
+                    $spId = $reducedSpId
+                        | ($sheet->getParent()->getIndex($sheet) + 1) << 10;
+                    $spContainer->setSpId($spId);
+
+                    // keep track of last reducedSpId
+                    $lastReducedSpId = $reducedSpId;
+
+                    // keep track of last spId
+                    $lastSpId = $spId;
+
+                    $spContainer->setOPT(0x007F, 0x01040104); // Protection -> fLockAgainstGrouping
+                    $spContainer->setOPT(0x00BF, 0x00080008); // Text -> fFitTextToShape
+                    $spContainer->setOPT(0x01BF, 0x00010000); // Fill Style -> fNoFillHitTest
+                    $spContainer->setOPT(0x01FF, 0x00080000); // Line Style -> fNoLineDrawDash
+                    $spContainer->setOPT(0x03BF, 0x000A0000); // Group Shape -> fPrint
+
+                    // set coordinates and offsets, client anchor
+                    $endCoordinates = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::stringFromColumnIndex($iInc - 1));
+                    $endCoordinates .= $rangeBounds[0][1] + 1;
+
+                    $spContainer->setStartCoordinates($cDrawing);
+                    $spContainer->setStartOffsetX(0);
+                    $spContainer->setStartOffsetY(0);
+                    $spContainer->setEndCoordinates($endCoordinates);
+                    $spContainer->setEndOffsetX(0);
+                    $spContainer->setEndOffsetY(0);
+
+                    $spgrContainer->addChild($spContainer);
+                    $iInc++;
+                }
+            }
+
+            // identifier clusters, used for workbook Escher object
+            $this->IDCLs[$dgId] = $lastReducedSpId;
+
+            // set last shape index
+            $dgContainer->setLastSpId($lastSpId);
+
+            // set the Escher object
+            $this->writerWorksheets[$sheetIndex]->setEscher($escher);
+        }
+    }
+
+    /**
+     * Build the Escher object corresponding to the MSODRAWINGGROUP record
+     */
+    private function buildWorkbookEscher()
+    {
+        $escher = null;
+
+        // any drawings in this workbook?
+        $found = false;
+        foreach ($this->phpExcel->getAllSheets() as $sheet) {
+            if (count($sheet->getDrawingCollection()) > 0) {
+                $found = true;
+                break;
+            }
+        }
+
+        // nothing to do if there are no drawings
+        if (!$found) {
+            return;
+        }
+
+        // if we reach here, then there are drawings in the workbook
+        $escher = new PHPExcel_Shared_Escher();
+
+        // dggContainer
+        $dggContainer = new PHPExcel_Shared_Escher_DggContainer();
+        $escher->setDggContainer($dggContainer);
+
+        // set IDCLs (identifier clusters)
+        $dggContainer->setIDCLs($this->IDCLs);
+
+        // this loop is for determining maximum shape identifier of all drawing
+        $spIdMax = 0;
+        $totalCountShapes = 0;
+        $countDrawings = 0;
+
+        foreach ($this->phpExcel->getAllsheets() as $sheet) {
+            $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet
+
+            if (count($sheet->getDrawingCollection()) > 0) {
+                ++$countDrawings;
+
+                foreach ($sheet->getDrawingCollection() as $drawing) {
+                    ++$sheetCountShapes;
+                    ++$totalCountShapes;
+
+                    $spId = $sheetCountShapes | ($this->phpExcel->getIndex($sheet) + 1) << 10;
+                    $spIdMax = max($spId, $spIdMax);
+                }
+            }
+        }
+
+        $dggContainer->setSpIdMax($spIdMax + 1);
+        $dggContainer->setCDgSaved($countDrawings);
+        $dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing
+
+        // bstoreContainer
+        $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
+        $dggContainer->setBstoreContainer($bstoreContainer);
+
+        // the BSE's (all the images)
+        foreach ($this->phpExcel->getAllsheets() as $sheet) {
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
+                    $filename = $drawing->getPath();
+
+                    list($imagesx, $imagesy, $imageFormat) = getimagesize($filename);
+
+                    switch ($imageFormat) {
+                        case 1: // GIF, not supported by BIFF8, we convert to PNG
+                            $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+                            ob_start();
+                            imagepng(imagecreatefromgif($filename));
+                            $blipData = ob_get_contents();
+                            ob_end_clean();
+                            break;
+                        case 2: // JPEG
+                            $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+                            $blipData = file_get_contents($filename);
+                            break;
+                        case 3: // PNG
+                            $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+                            $blipData = file_get_contents($filename);
+                            break;
+                        case 6: // Windows DIB (BMP), we convert to PNG
+                            $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+                            ob_start();
+                            imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
+                            $blipData = ob_get_contents();
+                            ob_end_clean();
+                            break;
+                        default:
+                            continue 2;
+                    }
+
+                    $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
+                    $blip->setData($blipData);
+
+                    $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
+                    $BSE->setBlipType($blipType);
+                    $BSE->setBlip($blip);
+
+                    $bstoreContainer->addBSE($BSE);
+                } elseif ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) {
+                    switch ($drawing->getRenderingFunction()) {
+                        case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
+                            $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+                            $renderingFunction = 'imagejpeg';
+                            break;
+                        case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
+                        case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
+                        case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
+                            $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+                            $renderingFunction = 'imagepng';
+                            break;
+                    }
+
+                    ob_start();
+                    call_user_func($renderingFunction, $drawing->getImageResource());
+                    $blipData = ob_get_contents();
+                    ob_end_clean();
+
+                    $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
+                    $blip->setData($blipData);
+
+                    $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
+                    $BSE->setBlipType($blipType);
+                    $BSE->setBlip($blip);
+
+                    $bstoreContainer->addBSE($BSE);
+                }
+            }
+        }
+
+        // Set the Escher object
+        $this->writerWorkbook->setEscher($escher);
+    }
+
+    /**
+     * Build the OLE Part for DocumentSummary Information
+     * @return string
+     */
+    private function writeDocumentSummaryInformation()
+    {
+        // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        $data = pack('v', 0xFFFE);
+        // offset: 2; size: 2;
+        $data .= pack('v', 0x0000);
+        // offset: 4; size: 2; OS version
+        $data .= pack('v', 0x0106);
+        // offset: 6; size: 2; OS indicator
+        $data .= pack('v', 0x0002);
+        // offset: 8; size: 16
+        $data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
+        // offset: 24; size: 4; section count
+        $data .= pack('V', 0x0001);
+
+        // offset: 28; size: 16; first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
+        $data .= pack('vvvvvvvv', 0xD502, 0xD5CD, 0x2E9C, 0x101B, 0x9793, 0x0008, 0x2C2B, 0xAEF9);
+        // offset: 44; size: 4; offset of the start
+        $data .= pack('V', 0x30);
+
+        // SECTION
+        $dataSection = array();
+        $dataSection_NumProps = 0;
+        $dataSection_Summary = '';
+        $dataSection_Content = '';
+
+        // GKPIDDSI_CODEPAGE: CodePage
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+                               'data'    => array('data' => 1252));
+        $dataSection_NumProps++;
+
+        // GKPIDDSI_CATEGORY : Category
+        if ($this->phpExcel->getProperties()->getCategory()) {
+            $dataProp = $this->phpExcel->getProperties()->getCategory();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E),
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        // GKPIDDSI_VERSION :Version of the application that wrote the property storage
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x03),
+                               'data'    => array('pack' => 'V', 'data' => 0x000C0000));
+        $dataSection_NumProps++;
+        // GKPIDDSI_SCALE : FALSE
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x0B),
+                               'data'    => array('data' => false));
+        $dataSection_NumProps++;
+        // GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x0B),
+                               'data'    => array('data' => false));
+        $dataSection_NumProps++;
+        // GKPIDDSI_SHAREDOC : FALSE
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x0B),
+                               'data'    => array('data' => false));
+        $dataSection_NumProps++;
+        // GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x0B),
+                               'data'    => array('data' => false));
+        $dataSection_NumProps++;
+
+        // GKPIDDSI_DOCSPARTS
+        // MS-OSHARED p75 (2.3.3.2.2.1)
+        // Structure is VtVecUnalignedLpstrValue (2.3.3.1.9)
+        // cElements
+        $dataProp = pack('v', 0x0001);
+        $dataProp .= pack('v', 0x0000);
+        // array of UnalignedLpstr
+          // cch
+          $dataProp .= pack('v', 0x000A);
+          $dataProp .= pack('v', 0x0000);
+          // value
+          $dataProp .= 'Worksheet'.chr(0);
+
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x101E),
+                               'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+        $dataSection_NumProps++;
+
+        // GKPIDDSI_HEADINGPAIR
+        // VtVecHeadingPairValue
+          // cElements
+          $dataProp = pack('v', 0x0002);
+          $dataProp .= pack('v', 0x0000);
+          // Array of vtHeadingPair
+            // vtUnalignedString - headingString
+              // stringType
+              $dataProp .= pack('v', 0x001E);
+              // padding
+              $dataProp .= pack('v', 0x0000);
+              // UnalignedLpstr
+                // cch
+                $dataProp .= pack('v', 0x0013);
+                $dataProp .= pack('v', 0x0000);
+                // value
+                $dataProp .= 'Feuilles de calcul';
+            // vtUnalignedString - headingParts
+              // wType : 0x0003 = 32 bit signed integer
+              $dataProp .= pack('v', 0x0300);
+              // padding
+              $dataProp .= pack('v', 0x0000);
+              // value
+              $dataProp .= pack('v', 0x0100);
+              $dataProp .= pack('v', 0x0000);
+              $dataProp .= pack('v', 0x0000);
+              $dataProp .= pack('v', 0x0000);
+
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x100C),
+                               'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+        $dataSection_NumProps++;
+
+        //         4     Section Length
+        //        4     Property count
+        //        8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
+        $dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
+        foreach ($dataSection as $dataProp) {
+            // Summary
+            $dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
+            // Offset
+            $dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
+            // DataType
+            $dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
+            // Data
+            if ($dataProp['type']['data'] == 0x02) { // 2 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x03) { // 4 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x0B) { // Boolean
+                if ($dataProp['data']['data'] == false) {
+                    $dataSection_Content .= pack('V', 0x0000);
+                } else {
+                    $dataSection_Content .= pack('V', 0x0001);
+                }
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
+                // Null-terminated string
+                $dataProp['data']['data'] .= chr(0);
+                $dataProp['data']['length'] += 1;
+                // Complete the string with null string for being a %4
+                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+                $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
+
+                $dataSection_Content .= pack('V', $dataProp['data']['length']);
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
+            } elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 8;
+            } else {
+                // Data Type Not Used at the moment
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + $dataProp['data']['length'];
+            }
+        }
+        // Now $dataSection_Content_Offset contains the size of the content
+
+        // section header
+        // offset: $secOffset; size: 4; section length
+        //         + x  Size of the content (summary + content)
+        $data .= pack('V', $dataSection_Content_Offset);
+        // offset: $secOffset+4; size: 4; property count
+        $data .= pack('V', $dataSection_NumProps);
+        // Section Summary
+        $data .= $dataSection_Summary;
+        // Section Content
+        $data .= $dataSection_Content;
+
+        return $data;
+    }
+
+    /**
+     * Build the OLE Part for Summary Information
+     * @return string
+     */
+    private function writeSummaryInformation()
+    {
+        // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        $data = pack('v', 0xFFFE);
+        // offset: 2; size: 2;
+        $data .= pack('v', 0x0000);
+        // offset: 4; size: 2; OS version
+        $data .= pack('v', 0x0106);
+        // offset: 6; size: 2; OS indicator
+        $data .= pack('v', 0x0002);
+        // offset: 8; size: 16
+        $data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
+        // offset: 24; size: 4; section count
+        $data .= pack('V', 0x0001);
+
+        // offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
+        $data .= pack('vvvvvvvv', 0x85E0, 0xF29F, 0x4FF9, 0x1068, 0x91AB, 0x0008, 0x272B, 0xD9B3);
+        // offset: 44; size: 4; offset of the start
+        $data .= pack('V', 0x30);
+
+        // SECTION
+        $dataSection = array();
+        $dataSection_NumProps = 0;
+        $dataSection_Summary = '';
+        $dataSection_Content = '';
+
+        // CodePage : CP-1252
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+                               'data'    => array('data' => 1252));
+        $dataSection_NumProps++;
+
+        //    Title
+        if ($this->phpExcel->getProperties()->getTitle()) {
+            $dataProp = $this->phpExcel->getProperties()->getTitle();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Subject
+        if ($this->phpExcel->getProperties()->getSubject()) {
+            $dataProp = $this->phpExcel->getProperties()->getSubject();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Author (Creator)
+        if ($this->phpExcel->getProperties()->getCreator()) {
+            $dataProp = $this->phpExcel->getProperties()->getCreator();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Keywords
+        if ($this->phpExcel->getProperties()->getKeywords()) {
+            $dataProp = $this->phpExcel->getProperties()->getKeywords();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Comments (Description)
+        if ($this->phpExcel->getProperties()->getDescription()) {
+            $dataProp = $this->phpExcel->getProperties()->getDescription();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Last Saved By (LastModifiedBy)
+        if ($this->phpExcel->getProperties()->getLastModifiedBy()) {
+            $dataProp = $this->phpExcel->getProperties()->getLastModifiedBy();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Created Date/Time
+        if ($this->phpExcel->getProperties()->getCreated()) {
+            $dataProp = $this->phpExcel->getProperties()->getCreated();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                                   'data'    => array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Modified Date/Time
+        if ($this->phpExcel->getProperties()->getModified()) {
+            $dataProp = $this->phpExcel->getProperties()->getModified();
+            $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
+                                   'offset' => array('pack' => 'V'),
+                                   'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                                   'data'    => array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
+            $dataSection_NumProps++;
+        }
+        //    Security
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
+                               'offset' => array('pack' => 'V'),
+                               'type'     => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
+                               'data'    => array('data' => 0x00));
+        $dataSection_NumProps++;
+
+
+        //         4     Section Length
+        //        4     Property count
+        //        8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
+        $dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
+        foreach ($dataSection as $dataProp) {
+            // Summary
+            $dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
+            // Offset
+            $dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
+            // DataType
+            $dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
+            // Data
+            if ($dataProp['type']['data'] == 0x02) { // 2 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x03) { // 4 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
+                // Null-terminated string
+                $dataProp['data']['data'] .= chr(0);
+                $dataProp['data']['length'] += 1;
+                // Complete the string with null string for being a %4
+                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+                $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
+
+                $dataSection_Content .= pack('V', $dataProp['data']['length']);
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
+            } elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 8;
+            } else {
+                // Data Type Not Used at the moment
+            }
+        }
+        // Now $dataSection_Content_Offset contains the size of the content
+
+        // section header
+        // offset: $secOffset; size: 4; section length
+        //         + x  Size of the content (summary + content)
+        $data .= pack('V', $dataSection_Content_Offset);
+        // offset: $secOffset+4; size: 4; property count
+        $data .= pack('V', $dataSection_NumProps);
+        // Section Summary
+        $data .= $dataSection_Summary;
+        // Section Content
+        $data .= $dataSection_Content;
+
+        return $data;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/BIFFwriter.php b/lib/PHPExcel/Writer/Excel5/BIFFwriter.php
new file mode 100644
index 000000000..a79575239
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/BIFFwriter.php
@@ -0,0 +1,246 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5_BIFFwriter
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class PHPExcel_Writer_Excel5_BIFFwriter
+{
+    /**
+     * The byte order of this architecture. 0 => little endian, 1 => big endian
+     * @var integer
+     */
+    private static $byteOrder;
+
+    /**
+     * The string containing the data of the BIFF stream
+     * @var string
+     */
+    public $_data;
+
+    /**
+     * The size of the data in bytes. Should be the same as strlen($this->_data)
+     * @var integer
+     */
+    public $_datasize;
+
+    /**
+     * The maximum length for a BIFF record (excluding record header and length field). See addContinue()
+     * @var integer
+     * @see addContinue()
+     */
+    private $limit    = 8224;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->_data       = '';
+        $this->_datasize   = 0;
+//        $this->limit      = 8224;
+    }
+
+    /**
+     * Determine the byte order and store it as class data to avoid
+     * recalculating it for each call to new().
+     *
+     * @return int
+     */
+    public static function getByteOrder()
+    {
+        if (!isset(self::$byteOrder)) {
+            // Check if "pack" gives the required IEEE 64bit float
+            $teststr = pack("d", 1.2345);
+            $number  = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
+            if ($number == $teststr) {
+                $byte_order = 0;    // Little Endian
+            } elseif ($number == strrev($teststr)) {
+                $byte_order = 1;    // Big Endian
+            } else {
+                // Give up. I'll fix this in a later version.
+                throw new PHPExcel_Writer_Exception("Required floating point format not supported on this platform.");
+            }
+            self::$byteOrder = $byte_order;
+        }
+
+        return self::$byteOrder;
+    }
+
+    /**
+     * General storage function
+     *
+     * @param string $data binary data to append
+     * @access private
+     */
+    protected function append($data)
+    {
+        if (strlen($data) - 4 > $this->limit) {
+            $data = $this->addContinue($data);
+        }
+        $this->_data     .= $data;
+        $this->_datasize += strlen($data);
+    }
+
+    /**
+     * General storage function like append, but returns string instead of modifying $this->_data
+     *
+     * @param string $data binary data to write
+     * @return string
+     */
+    public function writeData($data)
+    {
+        if (strlen($data) - 4 > $this->limit) {
+            $data = $this->addContinue($data);
+        }
+        $this->_datasize += strlen($data);
+
+        return $data;
+    }
+
+    /**
+     * Writes Excel BOF record to indicate the beginning of a stream or
+     * sub-stream in the BIFF file.
+     *
+     * @param  integer $type Type of BIFF file to write: 0x0005 Workbook,
+     *                       0x0010 Worksheet.
+     * @access private
+     */
+    protected function storeBof($type)
+    {
+        $record  = 0x0809;            // Record identifier    (BIFF5-BIFF8)
+        $length  = 0x0010;
+
+        // by inspection of real files, MS Office Excel 2007 writes the following
+        $unknown = pack("VV", 0x000100D1, 0x00000406);
+
+        $build   = 0x0DBB;            //    Excel 97
+        $year    = 0x07CC;            //    Excel 97
+
+        $version = 0x0600;            //    BIFF8
+
+        $header  = pack("vv", $record, $length);
+        $data    = pack("vvvv", $version, $type, $build, $year);
+        $this->append($header . $data . $unknown);
+    }
+
+    /**
+     * Writes Excel EOF record to indicate the end of a BIFF stream.
+     *
+     * @access private
+     */
+    protected function storeEof()
+    {
+        $record    = 0x000A;   // Record identifier
+        $length    = 0x0000;   // Number of bytes to follow
+
+        $header    = pack("vv", $record, $length);
+        $this->append($header);
+    }
+
+    /**
+     * Writes Excel EOF record to indicate the end of a BIFF stream.
+     *
+     * @access private
+     */
+    public function writeEof()
+    {
+        $record    = 0x000A;   // Record identifier
+        $length    = 0x0000;   // Number of bytes to follow
+        $header    = pack("vv", $record, $length);
+        return $this->writeData($header);
+    }
+
+    /**
+     * Excel limits the size of BIFF records. In Excel 5 the limit is 2084 bytes. In
+     * Excel 97 the limit is 8228 bytes. Records that are longer than these limits
+     * must be split up into CONTINUE blocks.
+     *
+     * This function takes a long BIFF record and inserts CONTINUE records as
+     * necessary.
+     *
+     * @param  string  $data The original binary data to be written
+     * @return string        A very convenient string of continue blocks
+     * @access private
+     */
+    private function addContinue($data)
+    {
+        $limit  = $this->limit;
+        $record = 0x003C;         // Record identifier
+
+        // The first 2080/8224 bytes remain intact. However, we have to change
+        // the length field of the record.
+        $tmp = substr($data, 0, 2) . pack("v", $limit) . substr($data, 4, $limit);
+
+        $header = pack("vv", $record, $limit);  // Headers for continue records
+
+        // Retrieve chunks of 2080/8224 bytes +4 for the header.
+        $data_length = strlen($data);
+        for ($i = $limit + 4; $i < ($data_length - $limit); $i += $limit) {
+            $tmp .= $header;
+            $tmp .= substr($data, $i, $limit);
+        }
+
+        // Retrieve the last chunk of data
+        $header  = pack("vv", $record, strlen($data) - $i);
+        $tmp    .= $header;
+        $tmp    .= substr($data, $i, strlen($data) - $i);
+
+        return $tmp;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/Escher.php b/lib/PHPExcel/Writer/Excel5/Escher.php
new file mode 100644
index 000000000..c37fda9b6
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/Escher.php
@@ -0,0 +1,523 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_Excel5_Escher
+{
+    /**
+     * The object we are writing
+     */
+    private $object;
+
+    /**
+     * The written binary data
+     */
+    private $data;
+
+    /**
+     * Shape offsets. Positions in binary stream where a new shape record begins
+     *
+     * @var array
+     */
+    private $spOffsets;
+
+    /**
+     * Shape types.
+     *
+     * @var array
+     */
+    private $spTypes;
+    
+    /**
+     * Constructor
+     *
+     * @param mixed
+     */
+    public function __construct($object)
+    {
+        $this->object = $object;
+    }
+
+    /**
+     * Process the object to be written
+     */
+    public function close()
+    {
+        // initialize
+        $this->data = '';
+
+        switch (get_class($this->object)) {
+            case 'PHPExcel_Shared_Escher':
+                if ($dggContainer = $this->object->getDggContainer()) {
+                    $writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
+                    $this->data = $writer->close();
+                } elseif ($dgContainer = $this->object->getDgContainer()) {
+                    $writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
+                    $this->data = $writer->close();
+                    $this->spOffsets = $writer->getSpOffsets();
+                    $this->spTypes = $writer->getSpTypes();
+                }
+                break;
+            case 'PHPExcel_Shared_Escher_DggContainer':
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // write the dgg
+                $recVer            = 0x0;
+                $recInstance    = 0x0000;
+                $recType        = 0xF006;
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                // dgg data
+                $dggData =
+                    pack(
+                        'VVVV',
+                        $this->object->getSpIdMax(), // maximum shape identifier increased by one
+                        $this->object->getCDgSaved() + 1, // number of file identifier clusters increased by one
+                        $this->object->getCSpSaved(),
+                        $this->object->getCDgSaved() // count total number of drawings saved
+                    );
+
+                // add file identifier clusters (one per drawing)
+                $IDCLs = $this->object->getIDCLs();
+
+                foreach ($IDCLs as $dgId => $maxReducedSpId) {
+                    $dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
+                }
+
+                $header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
+                $innerData .= $header . $dggData;
+
+                // write the bstoreContainer
+                if ($bstoreContainer = $this->object->getBstoreContainer()) {
+                    $writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
+                    $innerData .= $writer->close();
+                }
+
+                // write the record
+                $recVer            = 0xF;
+                $recInstance    = 0x0000;
+                $recType        = 0xF000;
+                $length            = strlen($innerData);
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+                break;
+            case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // treat the inner data
+                if ($BSECollection = $this->object->getBSECollection()) {
+                    foreach ($BSECollection as $BSE) {
+                        $writer = new PHPExcel_Writer_Excel5_Escher($BSE);
+                        $innerData .= $writer->close();
+                    }
+                }
+
+                // write the record
+                $recVer            = 0xF;
+                $recInstance    = count($this->object->getBSECollection());
+                $recType        = 0xF001;
+                $length            = strlen($innerData);
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+                break;
+            case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
+                // this is a semi-container record
+
+                // initialize
+                $innerData = '';
+
+                // here we treat the inner data
+                if ($blip = $this->object->getBlip()) {
+                    $writer = new PHPExcel_Writer_Excel5_Escher($blip);
+                    $innerData .= $writer->close();
+                }
+
+                // initialize
+                $data = '';
+
+                $btWin32 = $this->object->getBlipType();
+                $btMacOS = $this->object->getBlipType();
+                $data .= pack('CC', $btWin32, $btMacOS);
+
+                $rgbUid = pack('VVVV', 0, 0, 0, 0); // todo
+                $data .= $rgbUid;
+
+                $tag = 0;
+                $size = strlen($innerData);
+                $cRef = 1;
+                $foDelay = 0; //todo
+                $unused1 = 0x0;
+                $cbName = 0x0;
+                $unused2 = 0x0;
+                $unused3 = 0x0;
+                $data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
+
+                $data .= $innerData;
+
+                // write the record
+                $recVer            = 0x2;
+                $recInstance    = $this->object->getBlipType();
+                $recType        = 0xF007;
+                $length            = strlen($data);
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |=    $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header;
+
+                $this->data .= $data;
+                break;
+            case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
+                // this is an atom record
+
+                // write the record
+                switch ($this->object->getParent()->getBlipType()) {
+                    case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+                        // initialize
+                        $innerData = '';
+
+                        $rgbUid1 = pack('VVVV', 0, 0, 0, 0); // todo
+                        $innerData .= $rgbUid1;
+
+                        $tag = 0xFF; // todo
+                        $innerData .= pack('C', $tag);
+
+                        $innerData .= $this->object->getData();
+
+                        $recVer            = 0x0;
+                        $recInstance    = 0x46A;
+                        $recType        = 0xF01D;
+                        $length            = strlen($innerData);
+
+                        $recVerInstance  = $recVer;
+                        $recVerInstance |=    $recInstance << 4;
+
+                        $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                        $this->data = $header;
+
+                        $this->data .= $innerData;
+                        break;
+
+                    case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+                        // initialize
+                        $innerData = '';
+
+                        $rgbUid1 = pack('VVVV', 0, 0, 0, 0); // todo
+                        $innerData .= $rgbUid1;
+
+                        $tag = 0xFF; // todo
+                        $innerData .= pack('C', $tag);
+
+                        $innerData .= $this->object->getData();
+
+                        $recVer            = 0x0;
+                        $recInstance    = 0x6E0;
+                        $recType        = 0xF01E;
+                        $length            = strlen($innerData);
+
+                        $recVerInstance  = $recVer;
+                        $recVerInstance |=    $recInstance << 4;
+
+                        $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                        $this->data = $header;
+
+                        $this->data .= $innerData;
+                        break;
+                }
+                break;
+            case 'PHPExcel_Shared_Escher_DgContainer':
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // write the dg
+                $recVer            = 0x0;
+                $recInstance    = $this->object->getDgId();
+                $recType        = 0xF008;
+                $length            = 8;
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                // number of shapes in this drawing (including group shape)
+                $countShapes = count($this->object->getSpgrContainer()->getChildren());
+                $innerData .= $header . pack('VV', $countShapes, $this->object->getLastSpId());
+                //$innerData .= $header . pack('VV', 0, 0);
+
+                // write the spgrContainer
+                if ($spgrContainer = $this->object->getSpgrContainer()) {
+                    $writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
+                    $innerData .= $writer->close();
+
+                    // get the shape offsets relative to the spgrContainer record
+                    $spOffsets = $writer->getSpOffsets();
+                    $spTypes   = $writer->getSpTypes();
+                    
+                    // save the shape offsets relative to dgContainer
+                    foreach ($spOffsets as & $spOffset) {
+                        $spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+                    }
+
+                    $this->spOffsets = $spOffsets;
+                    $this->spTypes = $spTypes;
+                }
+
+                // write the record
+                $recVer            = 0xF;
+                $recInstance    = 0x0000;
+                $recType        = 0xF002;
+                $length            = strlen($innerData);
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+                break;
+            case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // initialize spape offsets
+                $totalSize = 8;
+                $spOffsets = array();
+                $spTypes   = array();
+
+                // treat the inner data
+                foreach ($this->object->getChildren() as $spContainer) {
+                    $writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
+                    $spData = $writer->close();
+                    $innerData .= $spData;
+
+                    // save the shape offsets (where new shape records begin)
+                    $totalSize += strlen($spData);
+                    $spOffsets[] = $totalSize;
+                    
+                    $spTypes = array_merge($spTypes, $writer->getSpTypes());
+                }
+
+                // write the record
+                $recVer            = 0xF;
+                $recInstance    = 0x0000;
+                $recType        = 0xF003;
+                $length            = strlen($innerData);
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+                $this->spOffsets = $spOffsets;
+                $this->spTypes = $spTypes;
+                break;
+            case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
+                // initialize
+                $data = '';
+
+                // build the data
+
+                // write group shape record, if necessary?
+                if ($this->object->getSpgr()) {
+                    $recVer            = 0x1;
+                    $recInstance    = 0x0000;
+                    $recType        = 0xF009;
+                    $length            = 0x00000010;
+
+                    $recVerInstance  = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                    $data .= $header . pack('VVVV', 0, 0, 0, 0);
+                }
+                $this->spTypes[] = ($this->object->getSpType());
+
+                // write the shape record
+                $recVer            = 0x2;
+                $recInstance    = $this->object->getSpType(); // shape type
+                $recType        = 0xF00A;
+                $length            = 0x00000008;
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $data .= $header . pack('VV', $this->object->getSpId(), $this->object->getSpgr() ? 0x0005 : 0x0A00);
+
+
+                // the options
+                if ($this->object->getOPTCollection()) {
+                    $optData = '';
+
+                    $recVer            = 0x3;
+                    $recInstance    = count($this->object->getOPTCollection());
+                    $recType        = 0xF00B;
+                    foreach ($this->object->getOPTCollection() as $property => $value) {
+                        $optData .= pack('vV', $property, $value);
+                    }
+                    $length            = strlen($optData);
+
+                    $recVerInstance  = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+                    $data .= $header . $optData;
+                }
+
+                // the client anchor
+                if ($this->object->getStartCoordinates()) {
+                    $clientAnchorData = '';
+
+                    $recVer            = 0x0;
+                    $recInstance    = 0x0;
+                    $recType        = 0xF010;
+
+                    // start coordinates
+                    list($column, $row) = PHPExcel_Cell::coordinateFromString($this->object->getStartCoordinates());
+                    $c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+                    $r1 = $row - 1;
+
+                    // start offsetX
+                    $startOffsetX = $this->object->getStartOffsetX();
+
+                    // start offsetY
+                    $startOffsetY = $this->object->getStartOffsetY();
+
+                    // end coordinates
+                    list($column, $row) = PHPExcel_Cell::coordinateFromString($this->object->getEndCoordinates());
+                    $c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+                    $r2 = $row - 1;
+
+                    // end offsetX
+                    $endOffsetX = $this->object->getEndOffsetX();
+
+                    // end offsetY
+                    $endOffsetY = $this->object->getEndOffsetY();
+
+                    $clientAnchorData = pack('vvvvvvvvv', $this->object->getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY);
+                    
+                    $length            = strlen($clientAnchorData);
+
+                    $recVerInstance  = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+                    $data .= $header . $clientAnchorData;
+                }
+
+                // the client data, just empty for now
+                if (!$this->object->getSpgr()) {
+                    $clientDataData = '';
+
+                    $recVer            = 0x0;
+                    $recInstance    = 0x0;
+                    $recType        = 0xF011;
+
+                    $length = strlen($clientDataData);
+
+                    $recVerInstance  = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+                    $data .= $header . $clientDataData;
+                }
+
+                // write the record
+                $recVer            = 0xF;
+                $recInstance    = 0x0000;
+                $recType        = 0xF004;
+                $length            = strlen($data);
+
+                $recVerInstance  = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $data;
+                break;
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Gets the shape offsets
+     *
+     * @return array
+     */
+    public function getSpOffsets()
+    {
+        return $this->spOffsets;
+    }
+
+    /**
+     * Gets the shape types
+     *
+     * @return array
+     */
+    public function getSpTypes()
+    {
+        return $this->spTypes;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/Font.php b/lib/PHPExcel/Writer/Excel5/Font.php
new file mode 100644
index 000000000..ed85ff457
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/Font.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5_Font
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Excel5_Font
+{
+    /**
+     * Color index
+     *
+     * @var int
+     */
+    private $colorIndex;
+
+    /**
+     * Font
+     *
+     * @var PHPExcel_Style_Font
+     */
+    private $font;
+
+    /**
+     * Constructor
+     *
+     * @param PHPExcel_Style_Font $font
+     */
+    public function __construct(PHPExcel_Style_Font $font = null)
+    {
+        $this->colorIndex = 0x7FFF;
+        $this->font = $font;
+    }
+
+    /**
+     * Set the color index
+     *
+     * @param int $colorIndex
+     */
+    public function setColorIndex($colorIndex)
+    {
+        $this->colorIndex = $colorIndex;
+    }
+
+    /**
+     * Get font record data
+     *
+     * @return string
+     */
+    public function writeFont()
+    {
+        $font_outline = 0;
+        $font_shadow = 0;
+
+        $icv = $this->colorIndex; // Index to color palette
+        if ($this->font->getSuperScript()) {
+            $sss = 1;
+        } elseif ($this->font->getSubScript()) {
+            $sss = 2;
+        } else {
+            $sss = 0;
+        }
+        $bFamily = 0; // Font family
+        $bCharSet = PHPExcel_Shared_Font::getCharsetFromFontName($this->font->getName()); // Character set
+
+        $record = 0x31;        // Record identifier
+        $reserved = 0x00;    // Reserved
+        $grbit = 0x00;        // Font attributes
+        if ($this->font->getItalic()) {
+            $grbit |= 0x02;
+        }
+        if ($this->font->getStrikethrough()) {
+            $grbit |= 0x08;
+        }
+        if ($font_outline) {
+            $grbit |= 0x10;
+        }
+        if ($font_shadow) {
+            $grbit |= 0x20;
+        }
+
+        $data = pack(
+            "vvvvvCCCC",
+            // Fontsize (in twips)
+            $this->font->getSize() * 20,
+            $grbit,
+            // Colour
+            $icv,
+            // Font weight
+            self::mapBold($this->font->getBold()),
+            // Superscript/Subscript
+            $sss,
+            self::mapUnderline($this->font->getUnderline()),
+            $bFamily,
+            $bCharSet,
+            $reserved
+        );
+        $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($this->font->getName());
+
+        $length = strlen($data);
+        $header = pack("vv", $record, $length);
+
+        return($header . $data);
+    }
+
+    /**
+     * Map to BIFF5-BIFF8 codes for bold
+     *
+     * @param boolean $bold
+     * @return int
+     */
+    private static function mapBold($bold)
+    {
+        if ($bold) {
+            return 0x2BC;  //  700 = Bold font weight
+        }
+        return 0x190;      //  400 = Normal font weight
+    }
+
+    /**
+     * Map of BIFF2-BIFF8 codes for underline styles
+     * @static    array of int
+     *
+     */
+    private static $mapUnderline = array(
+        PHPExcel_Style_Font::UNDERLINE_NONE              => 0x00,
+        PHPExcel_Style_Font::UNDERLINE_SINGLE            => 0x01,
+        PHPExcel_Style_Font::UNDERLINE_DOUBLE            => 0x02,
+        PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING  => 0x21,
+        PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING  => 0x22,
+    );
+
+    /**
+     * Map underline
+     *
+     * @param string
+     * @return int
+     */
+    private static function mapUnderline($underline)
+    {
+        if (isset(self::$mapUnderline[$underline])) {
+            return self::$mapUnderline[$underline];
+        }
+        return 0x00;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/Parser.php b/lib/PHPExcel/Writer/Excel5/Parser.php
new file mode 100644
index 000000000..781996f46
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/Parser.php
@@ -0,0 +1,1531 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5_Parser
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// *  Class for parsing Excel formulas
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class PHPExcel_Writer_Excel5_Parser
+{
+    /**    Constants                */
+    // Sheet title in unquoted form
+    // Invalid sheet title characters cannot occur in the sheet title:
+    //         *:/\?[]
+    // Moreover, there are valid sheet title characters that cannot occur in unquoted form (there may be more?)
+    // +-% '^&<>=,;#()"{}
+    const REGEX_SHEET_TITLE_UNQUOTED = '[^\*\:\/\\\\\?\[\]\+\-\% \\\'\^\&\<\>\=\,\;\#\(\)\"\{\}]+';
+
+    // Sheet title in quoted form (without surrounding quotes)
+    // Invalid sheet title characters cannot occur in the sheet title:
+    // *:/\?[]                    (usual invalid sheet title characters)
+    // Single quote is represented as a pair ''
+    const REGEX_SHEET_TITLE_QUOTED = '(([^\*\:\/\\\\\?\[\]\\\'])+|(\\\'\\\')+)+';
+
+    /**
+     * The index of the character we are currently looking at
+     * @var integer
+     */
+    public $currentCharacter;
+
+    /**
+     * The token we are working on.
+     * @var string
+     */
+    public $currentToken;
+
+    /**
+     * The formula to parse
+     * @var string
+     */
+    private $formula;
+
+    /**
+     * The character ahead of the current char
+     * @var string
+     */
+    public $lookAhead;
+
+    /**
+     * The parse tree to be generated
+     * @var string
+     */
+    private $parseTree;
+
+    /**
+     * Array of external sheets
+     * @var array
+     */
+    private $externalSheets;
+
+    /**
+     * Array of sheet references in the form of REF structures
+     * @var array
+     */
+    public $references;
+
+    /**
+     * The class constructor
+     *
+     */
+    public function __construct()
+    {
+        $this->currentCharacter  = 0;
+        $this->currentToken = '';       // The token we are working on.
+        $this->formula       = '';       // The formula to parse.
+        $this->lookAhead     = '';       // The character ahead of the current char.
+        $this->parseTree    = '';       // The parse tree to be generated.
+        $this->initializeHashes();      // Initialize the hashes: ptg's and function's ptg's
+        $this->externalSheets = array();
+        $this->references = array();
+    }
+
+    /**
+     * Initialize the ptg and function hashes.
+     *
+     * @access private
+     */
+    private function initializeHashes()
+    {
+        // The Excel ptg indices
+        $this->ptg = array(
+            'ptgExp'       => 0x01,
+            'ptgTbl'       => 0x02,
+            'ptgAdd'       => 0x03,
+            'ptgSub'       => 0x04,
+            'ptgMul'       => 0x05,
+            'ptgDiv'       => 0x06,
+            'ptgPower'     => 0x07,
+            'ptgConcat'    => 0x08,
+            'ptgLT'        => 0x09,
+            'ptgLE'        => 0x0A,
+            'ptgEQ'        => 0x0B,
+            'ptgGE'        => 0x0C,
+            'ptgGT'        => 0x0D,
+            'ptgNE'        => 0x0E,
+            'ptgIsect'     => 0x0F,
+            'ptgUnion'     => 0x10,
+            'ptgRange'     => 0x11,
+            'ptgUplus'     => 0x12,
+            'ptgUminus'    => 0x13,
+            'ptgPercent'   => 0x14,
+            'ptgParen'     => 0x15,
+            'ptgMissArg'   => 0x16,
+            'ptgStr'       => 0x17,
+            'ptgAttr'      => 0x19,
+            'ptgSheet'     => 0x1A,
+            'ptgEndSheet'  => 0x1B,
+            'ptgErr'       => 0x1C,
+            'ptgBool'      => 0x1D,
+            'ptgInt'       => 0x1E,
+            'ptgNum'       => 0x1F,
+            'ptgArray'     => 0x20,
+            'ptgFunc'      => 0x21,
+            'ptgFuncVar'   => 0x22,
+            'ptgName'      => 0x23,
+            'ptgRef'       => 0x24,
+            'ptgArea'      => 0x25,
+            'ptgMemArea'   => 0x26,
+            'ptgMemErr'    => 0x27,
+            'ptgMemNoMem'  => 0x28,
+            'ptgMemFunc'   => 0x29,
+            'ptgRefErr'    => 0x2A,
+            'ptgAreaErr'   => 0x2B,
+            'ptgRefN'      => 0x2C,
+            'ptgAreaN'     => 0x2D,
+            'ptgMemAreaN'  => 0x2E,
+            'ptgMemNoMemN' => 0x2F,
+            'ptgNameX'     => 0x39,
+            'ptgRef3d'     => 0x3A,
+            'ptgArea3d'    => 0x3B,
+            'ptgRefErr3d'  => 0x3C,
+            'ptgAreaErr3d' => 0x3D,
+            'ptgArrayV'    => 0x40,
+            'ptgFuncV'     => 0x41,
+            'ptgFuncVarV'  => 0x42,
+            'ptgNameV'     => 0x43,
+            'ptgRefV'      => 0x44,
+            'ptgAreaV'     => 0x45,
+            'ptgMemAreaV'  => 0x46,
+            'ptgMemErrV'   => 0x47,
+            'ptgMemNoMemV' => 0x48,
+            'ptgMemFuncV'  => 0x49,
+            'ptgRefErrV'   => 0x4A,
+            'ptgAreaErrV'  => 0x4B,
+            'ptgRefNV'     => 0x4C,
+            'ptgAreaNV'    => 0x4D,
+            'ptgMemAreaNV' => 0x4E,
+            'ptgMemNoMemN' => 0x4F,
+            'ptgFuncCEV'   => 0x58,
+            'ptgNameXV'    => 0x59,
+            'ptgRef3dV'    => 0x5A,
+            'ptgArea3dV'   => 0x5B,
+            'ptgRefErr3dV' => 0x5C,
+            'ptgAreaErr3d' => 0x5D,
+            'ptgArrayA'    => 0x60,
+            'ptgFuncA'     => 0x61,
+            'ptgFuncVarA'  => 0x62,
+            'ptgNameA'     => 0x63,
+            'ptgRefA'      => 0x64,
+            'ptgAreaA'     => 0x65,
+            'ptgMemAreaA'  => 0x66,
+            'ptgMemErrA'   => 0x67,
+            'ptgMemNoMemA' => 0x68,
+            'ptgMemFuncA'  => 0x69,
+            'ptgRefErrA'   => 0x6A,
+            'ptgAreaErrA'  => 0x6B,
+            'ptgRefNA'     => 0x6C,
+            'ptgAreaNA'    => 0x6D,
+            'ptgMemAreaNA' => 0x6E,
+            'ptgMemNoMemN' => 0x6F,
+            'ptgFuncCEA'   => 0x78,
+            'ptgNameXA'    => 0x79,
+            'ptgRef3dA'    => 0x7A,
+            'ptgArea3dA'   => 0x7B,
+            'ptgRefErr3dA' => 0x7C,
+            'ptgAreaErr3d' => 0x7D
+        );
+
+        // Thanks to Michael Meeks and Gnumeric for the initial arg values.
+        //
+        // The following hash was generated by "function_locale.pl" in the distro.
+        // Refer to function_locale.pl for non-English function names.
+        //
+        // The array elements are as follow:
+        // ptg:   The Excel function ptg code.
+        // args:  The number of arguments that the function takes:
+        //           >=0 is a fixed number of arguments.
+        //           -1  is a variable  number of arguments.
+        // class: The reference, value or array class of the function args.
+        // vol:   The function is volatile.
+        //
+        $this->functions = array(
+            // function                  ptg  args  class  vol
+            'COUNT'           => array(   0,   -1,    0,    0 ),
+            'IF'              => array(   1,   -1,    1,    0 ),
+            'ISNA'            => array(   2,    1,    1,    0 ),
+            'ISERROR'         => array(   3,    1,    1,    0 ),
+            'SUM'             => array(   4,   -1,    0,    0 ),
+            'AVERAGE'         => array(   5,   -1,    0,    0 ),
+            'MIN'             => array(   6,   -1,    0,    0 ),
+            'MAX'             => array(   7,   -1,    0,    0 ),
+            'ROW'             => array(   8,   -1,    0,    0 ),
+            'COLUMN'          => array(   9,   -1,    0,    0 ),
+            'NA'              => array(  10,    0,    0,    0 ),
+            'NPV'             => array(  11,   -1,    1,    0 ),
+            'STDEV'           => array(  12,   -1,    0,    0 ),
+            'DOLLAR'          => array(  13,   -1,    1,    0 ),
+            'FIXED'           => array(  14,   -1,    1,    0 ),
+            'SIN'             => array(  15,    1,    1,    0 ),
+            'COS'             => array(  16,    1,    1,    0 ),
+            'TAN'             => array(  17,    1,    1,    0 ),
+            'ATAN'            => array(  18,    1,    1,    0 ),
+            'PI'              => array(  19,    0,    1,    0 ),
+            'SQRT'            => array(  20,    1,    1,    0 ),
+            'EXP'             => array(  21,    1,    1,    0 ),
+            'LN'              => array(  22,    1,    1,    0 ),
+            'LOG10'           => array(  23,    1,    1,    0 ),
+            'ABS'             => array(  24,    1,    1,    0 ),
+            'INT'             => array(  25,    1,    1,    0 ),
+            'SIGN'            => array(  26,    1,    1,    0 ),
+            'ROUND'           => array(  27,    2,    1,    0 ),
+            'LOOKUP'          => array(  28,   -1,    0,    0 ),
+            'INDEX'           => array(  29,   -1,    0,    1 ),
+            'REPT'            => array(  30,    2,    1,    0 ),
+            'MID'             => array(  31,    3,    1,    0 ),
+            'LEN'             => array(  32,    1,    1,    0 ),
+            'VALUE'           => array(  33,    1,    1,    0 ),
+            'TRUE'            => array(  34,    0,    1,    0 ),
+            'FALSE'           => array(  35,    0,    1,    0 ),
+            'AND'             => array(  36,   -1,    0,    0 ),
+            'OR'              => array(  37,   -1,    0,    0 ),
+            'NOT'             => array(  38,    1,    1,    0 ),
+            'MOD'             => array(  39,    2,    1,    0 ),
+            'DCOUNT'          => array(  40,    3,    0,    0 ),
+            'DSUM'            => array(  41,    3,    0,    0 ),
+            'DAVERAGE'        => array(  42,    3,    0,    0 ),
+            'DMIN'            => array(  43,    3,    0,    0 ),
+            'DMAX'            => array(  44,    3,    0,    0 ),
+            'DSTDEV'          => array(  45,    3,    0,    0 ),
+            'VAR'             => array(  46,   -1,    0,    0 ),
+            'DVAR'            => array(  47,    3,    0,    0 ),
+            'TEXT'            => array(  48,    2,    1,    0 ),
+            'LINEST'          => array(  49,   -1,    0,    0 ),
+            'TREND'           => array(  50,   -1,    0,    0 ),
+            'LOGEST'          => array(  51,   -1,    0,    0 ),
+            'GROWTH'          => array(  52,   -1,    0,    0 ),
+            'PV'              => array(  56,   -1,    1,    0 ),
+            'FV'              => array(  57,   -1,    1,    0 ),
+            'NPER'            => array(  58,   -1,    1,    0 ),
+            'PMT'             => array(  59,   -1,    1,    0 ),
+            'RATE'            => array(  60,   -1,    1,    0 ),
+            'MIRR'            => array(  61,    3,    0,    0 ),
+            'IRR'             => array(  62,   -1,    0,    0 ),
+            'RAND'            => array(  63,    0,    1,    1 ),
+            'MATCH'           => array(  64,   -1,    0,    0 ),
+            'DATE'            => array(  65,    3,    1,    0 ),
+            'TIME'            => array(  66,    3,    1,    0 ),
+            'DAY'             => array(  67,    1,    1,    0 ),
+            'MONTH'           => array(  68,    1,    1,    0 ),
+            'YEAR'            => array(  69,    1,    1,    0 ),
+            'WEEKDAY'         => array(  70,   -1,    1,    0 ),
+            'HOUR'            => array(  71,    1,    1,    0 ),
+            'MINUTE'          => array(  72,    1,    1,    0 ),
+            'SECOND'          => array(  73,    1,    1,    0 ),
+            'NOW'             => array(  74,    0,    1,    1 ),
+            'AREAS'           => array(  75,    1,    0,    1 ),
+            'ROWS'            => array(  76,    1,    0,    1 ),
+            'COLUMNS'         => array(  77,    1,    0,    1 ),
+            'OFFSET'          => array(  78,   -1,    0,    1 ),
+            'SEARCH'          => array(  82,   -1,    1,    0 ),
+            'TRANSPOSE'       => array(  83,    1,    1,    0 ),
+            'TYPE'            => array(  86,    1,    1,    0 ),
+            'ATAN2'           => array(  97,    2,    1,    0 ),
+            'ASIN'            => array(  98,    1,    1,    0 ),
+            'ACOS'            => array(  99,    1,    1,    0 ),
+            'CHOOSE'          => array( 100,   -1,    1,    0 ),
+            'HLOOKUP'         => array( 101,   -1,    0,    0 ),
+            'VLOOKUP'         => array( 102,   -1,    0,    0 ),
+            'ISREF'           => array( 105,    1,    0,    0 ),
+            'LOG'             => array( 109,   -1,    1,    0 ),
+            'CHAR'            => array( 111,    1,    1,    0 ),
+            'LOWER'           => array( 112,    1,    1,    0 ),
+            'UPPER'           => array( 113,    1,    1,    0 ),
+            'PROPER'          => array( 114,    1,    1,    0 ),
+            'LEFT'            => array( 115,   -1,    1,    0 ),
+            'RIGHT'           => array( 116,   -1,    1,    0 ),
+            'EXACT'           => array( 117,    2,    1,    0 ),
+            'TRIM'            => array( 118,    1,    1,    0 ),
+            'REPLACE'         => array( 119,    4,    1,    0 ),
+            'SUBSTITUTE'      => array( 120,   -1,    1,    0 ),
+            'CODE'            => array( 121,    1,    1,    0 ),
+            'FIND'            => array( 124,   -1,    1,    0 ),
+            'CELL'            => array( 125,   -1,    0,    1 ),
+            'ISERR'           => array( 126,    1,    1,    0 ),
+            'ISTEXT'          => array( 127,    1,    1,    0 ),
+            'ISNUMBER'        => array( 128,    1,    1,    0 ),
+            'ISBLANK'         => array( 129,    1,    1,    0 ),
+            'T'               => array( 130,    1,    0,    0 ),
+            'N'               => array( 131,    1,    0,    0 ),
+            'DATEVALUE'       => array( 140,    1,    1,    0 ),
+            'TIMEVALUE'       => array( 141,    1,    1,    0 ),
+            'SLN'             => array( 142,    3,    1,    0 ),
+            'SYD'             => array( 143,    4,    1,    0 ),
+            'DDB'             => array( 144,   -1,    1,    0 ),
+            'INDIRECT'        => array( 148,   -1,    1,    1 ),
+            'CALL'            => array( 150,   -1,    1,    0 ),
+            'CLEAN'           => array( 162,    1,    1,    0 ),
+            'MDETERM'         => array( 163,    1,    2,    0 ),
+            'MINVERSE'        => array( 164,    1,    2,    0 ),
+            'MMULT'           => array( 165,    2,    2,    0 ),
+            'IPMT'            => array( 167,   -1,    1,    0 ),
+            'PPMT'            => array( 168,   -1,    1,    0 ),
+            'COUNTA'          => array( 169,   -1,    0,    0 ),
+            'PRODUCT'         => array( 183,   -1,    0,    0 ),
+            'FACT'            => array( 184,    1,    1,    0 ),
+            'DPRODUCT'        => array( 189,    3,    0,    0 ),
+            'ISNONTEXT'       => array( 190,    1,    1,    0 ),
+            'STDEVP'          => array( 193,   -1,    0,    0 ),
+            'VARP'            => array( 194,   -1,    0,    0 ),
+            'DSTDEVP'         => array( 195,    3,    0,    0 ),
+            'DVARP'           => array( 196,    3,    0,    0 ),
+            'TRUNC'           => array( 197,   -1,    1,    0 ),
+            'ISLOGICAL'       => array( 198,    1,    1,    0 ),
+            'DCOUNTA'         => array( 199,    3,    0,    0 ),
+            'USDOLLAR'        => array( 204,   -1,    1,    0 ),
+            'FINDB'           => array( 205,   -1,    1,    0 ),
+            'SEARCHB'         => array( 206,   -1,    1,    0 ),
+            'REPLACEB'        => array( 207,    4,    1,    0 ),
+            'LEFTB'           => array( 208,   -1,    1,    0 ),
+            'RIGHTB'          => array( 209,   -1,    1,    0 ),
+            'MIDB'            => array( 210,    3,    1,    0 ),
+            'LENB'            => array( 211,    1,    1,    0 ),
+            'ROUNDUP'         => array( 212,    2,    1,    0 ),
+            'ROUNDDOWN'       => array( 213,    2,    1,    0 ),
+            'ASC'             => array( 214,    1,    1,    0 ),
+            'DBCS'            => array( 215,    1,    1,    0 ),
+            'RANK'            => array( 216,   -1,    0,    0 ),
+            'ADDRESS'         => array( 219,   -1,    1,    0 ),
+            'DAYS360'         => array( 220,   -1,    1,    0 ),
+            'TODAY'           => array( 221,    0,    1,    1 ),
+            'VDB'             => array( 222,   -1,    1,    0 ),
+            'MEDIAN'          => array( 227,   -1,    0,    0 ),
+            'SUMPRODUCT'      => array( 228,   -1,    2,    0 ),
+            'SINH'            => array( 229,    1,    1,    0 ),
+            'COSH'            => array( 230,    1,    1,    0 ),
+            'TANH'            => array( 231,    1,    1,    0 ),
+            'ASINH'           => array( 232,    1,    1,    0 ),
+            'ACOSH'           => array( 233,    1,    1,    0 ),
+            'ATANH'           => array( 234,    1,    1,    0 ),
+            'DGET'            => array( 235,    3,    0,    0 ),
+            'INFO'            => array( 244,    1,    1,    1 ),
+            'DB'              => array( 247,   -1,    1,    0 ),
+            'FREQUENCY'       => array( 252,    2,    0,    0 ),
+            'ERROR.TYPE'      => array( 261,    1,    1,    0 ),
+            'REGISTER.ID'     => array( 267,   -1,    1,    0 ),
+            'AVEDEV'          => array( 269,   -1,    0,    0 ),
+            'BETADIST'        => array( 270,   -1,    1,    0 ),
+            'GAMMALN'         => array( 271,    1,    1,    0 ),
+            'BETAINV'         => array( 272,   -1,    1,    0 ),
+            'BINOMDIST'       => array( 273,    4,    1,    0 ),
+            'CHIDIST'         => array( 274,    2,    1,    0 ),
+            'CHIINV'          => array( 275,    2,    1,    0 ),
+            'COMBIN'          => array( 276,    2,    1,    0 ),
+            'CONFIDENCE'      => array( 277,    3,    1,    0 ),
+            'CRITBINOM'       => array( 278,    3,    1,    0 ),
+            'EVEN'            => array( 279,    1,    1,    0 ),
+            'EXPONDIST'       => array( 280,    3,    1,    0 ),
+            'FDIST'           => array( 281,    3,    1,    0 ),
+            'FINV'            => array( 282,    3,    1,    0 ),
+            'FISHER'          => array( 283,    1,    1,    0 ),
+            'FISHERINV'       => array( 284,    1,    1,    0 ),
+            'FLOOR'           => array( 285,    2,    1,    0 ),
+            'GAMMADIST'       => array( 286,    4,    1,    0 ),
+            'GAMMAINV'        => array( 287,    3,    1,    0 ),
+            'CEILING'         => array( 288,    2,    1,    0 ),
+            'HYPGEOMDIST'     => array( 289,    4,    1,    0 ),
+            'LOGNORMDIST'     => array( 290,    3,    1,    0 ),
+            'LOGINV'          => array( 291,    3,    1,    0 ),
+            'NEGBINOMDIST'    => array( 292,    3,    1,    0 ),
+            'NORMDIST'        => array( 293,    4,    1,    0 ),
+            'NORMSDIST'       => array( 294,    1,    1,    0 ),
+            'NORMINV'         => array( 295,    3,    1,    0 ),
+            'NORMSINV'        => array( 296,    1,    1,    0 ),
+            'STANDARDIZE'     => array( 297,    3,    1,    0 ),
+            'ODD'             => array( 298,    1,    1,    0 ),
+            'PERMUT'          => array( 299,    2,    1,    0 ),
+            'POISSON'         => array( 300,    3,    1,    0 ),
+            'TDIST'           => array( 301,    3,    1,    0 ),
+            'WEIBULL'         => array( 302,    4,    1,    0 ),
+            'SUMXMY2'         => array( 303,    2,    2,    0 ),
+            'SUMX2MY2'        => array( 304,    2,    2,    0 ),
+            'SUMX2PY2'        => array( 305,    2,    2,    0 ),
+            'CHITEST'         => array( 306,    2,    2,    0 ),
+            'CORREL'          => array( 307,    2,    2,    0 ),
+            'COVAR'           => array( 308,    2,    2,    0 ),
+            'FORECAST'        => array( 309,    3,    2,    0 ),
+            'FTEST'           => array( 310,    2,    2,    0 ),
+            'INTERCEPT'       => array( 311,    2,    2,    0 ),
+            'PEARSON'         => array( 312,    2,    2,    0 ),
+            'RSQ'             => array( 313,    2,    2,    0 ),
+            'STEYX'           => array( 314,    2,    2,    0 ),
+            'SLOPE'           => array( 315,    2,    2,    0 ),
+            'TTEST'           => array( 316,    4,    2,    0 ),
+            'PROB'            => array( 317,   -1,    2,    0 ),
+            'DEVSQ'           => array( 318,   -1,    0,    0 ),
+            'GEOMEAN'         => array( 319,   -1,    0,    0 ),
+            'HARMEAN'         => array( 320,   -1,    0,    0 ),
+            'SUMSQ'           => array( 321,   -1,    0,    0 ),
+            'KURT'            => array( 322,   -1,    0,    0 ),
+            'SKEW'            => array( 323,   -1,    0,    0 ),
+            'ZTEST'           => array( 324,   -1,    0,    0 ),
+            'LARGE'           => array( 325,    2,    0,    0 ),
+            'SMALL'           => array( 326,    2,    0,    0 ),
+            'QUARTILE'        => array( 327,    2,    0,    0 ),
+            'PERCENTILE'      => array( 328,    2,    0,    0 ),
+            'PERCENTRANK'     => array( 329,   -1,    0,    0 ),
+            'MODE'            => array( 330,   -1,    2,    0 ),
+            'TRIMMEAN'        => array( 331,    2,    0,    0 ),
+            'TINV'            => array( 332,    2,    1,    0 ),
+            'CONCATENATE'     => array( 336,   -1,    1,    0 ),
+            'POWER'           => array( 337,    2,    1,    0 ),
+            'RADIANS'         => array( 342,    1,    1,    0 ),
+            'DEGREES'         => array( 343,    1,    1,    0 ),
+            'SUBTOTAL'        => array( 344,   -1,    0,    0 ),
+            'SUMIF'           => array( 345,   -1,    0,    0 ),
+            'COUNTIF'         => array( 346,    2,    0,    0 ),
+            'COUNTBLANK'      => array( 347,    1,    0,    0 ),
+            'ISPMT'           => array( 350,    4,    1,    0 ),
+            'DATEDIF'         => array( 351,    3,    1,    0 ),
+            'DATESTRING'      => array( 352,    1,    1,    0 ),
+            'NUMBERSTRING'    => array( 353,    2,    1,    0 ),
+            'ROMAN'           => array( 354,   -1,    1,    0 ),
+            'GETPIVOTDATA'    => array( 358,   -1,    0,    0 ),
+            'HYPERLINK'       => array( 359,   -1,    1,    0 ),
+            'PHONETIC'        => array( 360,    1,    0,    0 ),
+            'AVERAGEA'        => array( 361,   -1,    0,    0 ),
+            'MAXA'            => array( 362,   -1,    0,    0 ),
+            'MINA'            => array( 363,   -1,    0,    0 ),
+            'STDEVPA'         => array( 364,   -1,    0,    0 ),
+            'VARPA'           => array( 365,   -1,    0,    0 ),
+            'STDEVA'          => array( 366,   -1,    0,    0 ),
+            'VARA'            => array( 367,   -1,    0,    0 ),
+            'BAHTTEXT'        => array( 368,    1,    0,    0 ),
+        );
+    }
+
+    /**
+     * Convert a token to the proper ptg value.
+     *
+     * @access private
+     * @param mixed $token The token to convert.
+     * @return mixed the converted token on success
+     */
+    private function convert($token)
+    {
+        if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token)) {
+            return $this->convertString($token);
+
+        } elseif (is_numeric($token)) {
+            return $this->convertNumber($token);
+
+        // match references like A1 or $A$1
+        } elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
+            return $this->convertRef2d($token);
+
+        // match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
+        } elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
+            return $this->convertRef3d($token);
+
+        // match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
+            return $this->convertRef3d($token);
+
+        // match ranges like A1:B2 or $A$1:$B$2
+        } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
+            return $this->convertRange2d($token);
+
+        // match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
+        } elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
+            return $this->convertRange3d($token);
+
+        // match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
+            return $this->convertRange3d($token);
+
+        // operators (including parentheses)
+        } elseif (isset($this->ptg[$token])) {
+            return pack("C", $this->ptg[$token]);
+
+        // match error codes
+        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
+            return $this->convertError($token);
+
+        // commented so argument number can be processed correctly. See toReversePolish().
+        /*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
+        {
+            return($this->convertFunction($token, $this->_func_args));
+        }*/
+
+        // if it's an argument, ignore the token (the argument remains)
+        } elseif ($token == 'arg') {
+            return '';
+        }
+
+        // TODO: use real error codes
+        throw new PHPExcel_Writer_Exception("Unknown token $token");
+    }
+
+    /**
+     * Convert a number token to ptgInt or ptgNum
+     *
+     * @access private
+     * @param mixed $num an integer or double for conversion to its ptg value
+     */
+    private function convertNumber($num)
+    {
+        // Integer in the range 0..2**16-1
+        if ((preg_match("/^\d+$/", $num)) and ($num <= 65535)) {
+            return pack("Cv", $this->ptg['ptgInt'], $num);
+        } else { // A float
+            if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+                $num = strrev($num);
+            }
+            return pack("Cd", $this->ptg['ptgNum'], $num);
+        }
+    }
+
+    /**
+     * Convert a string token to ptgStr
+     *
+     * @access private
+     * @param string $string A string for conversion to its ptg value.
+     * @return mixed the converted token on success
+     */
+    private function convertString($string)
+    {
+        // chop away beggining and ending quotes
+        $string = substr($string, 1, strlen($string) - 2);
+        if (strlen($string) > 255) {
+            throw new PHPExcel_Writer_Exception("String is too long");
+        }
+
+        return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
+    }
+
+    /**
+     * Convert a function to a ptgFunc or ptgFuncVarV depending on the number of
+     * args that it takes.
+     *
+     * @access private
+     * @param string  $token    The name of the function for convertion to ptg value.
+     * @param integer $num_args The number of arguments the function receives.
+     * @return string The packed ptg for the function
+     */
+    private function convertFunction($token, $num_args)
+    {
+        $args     = $this->functions[$token][1];
+//        $volatile = $this->functions[$token][3];
+
+        // Fixed number of args eg. TIME($i, $j, $k).
+        if ($args >= 0) {
+            return pack("Cv", $this->ptg['ptgFuncV'], $this->functions[$token][0]);
+        }
+        // Variable number of args eg. SUM($i, $j, $k, ..).
+        if ($args == -1) {
+            return pack("CCv", $this->ptg['ptgFuncVarV'], $num_args, $this->functions[$token][0]);
+        }
+    }
+
+    /**
+     * Convert an Excel range such as A1:D4 to a ptgRefV.
+     *
+     * @access private
+     * @param string    $range    An Excel range in the A1:A2
+     * @param int        $class
+     */
+    private function convertRange2d($range, $class = 0)
+    {
+
+        // TODO: possible class value 0,1,2 check Formula.pm
+        // Split the range into 2 cell refs
+        if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) {
+            list($cell1, $cell2) = explode(':', $range);
+        } else {
+            // TODO: use real error codes
+            throw new PHPExcel_Writer_Exception("Unknown range separator");
+        }
+
+        // Convert the cell references
+        list($row1, $col1) = $this->cellToPackedRowcol($cell1);
+        list($row2, $col2) = $this->cellToPackedRowcol($cell2);
+
+        // The ptg value depends on the class of the ptg.
+        if ($class == 0) {
+            $ptgArea = pack("C", $this->ptg['ptgArea']);
+        } elseif ($class == 1) {
+            $ptgArea = pack("C", $this->ptg['ptgAreaV']);
+        } elseif ($class == 2) {
+            $ptgArea = pack("C", $this->ptg['ptgAreaA']);
+        } else {
+            // TODO: use real error codes
+            throw new PHPExcel_Writer_Exception("Unknown class $class");
+        }
+        return $ptgArea . $row1 . $row2 . $col1. $col2;
+    }
+
+    /**
+     * Convert an Excel 3d range such as "Sheet1!A1:D4" or "Sheet1:Sheet2!A1:D4" to
+     * a ptgArea3d.
+     *
+     * @access private
+     * @param string $token An Excel range in the Sheet1!A1:A2 format.
+     * @return mixed The packed ptgArea3d token on success.
+     */
+    private function convertRange3d($token)
+    {
+//        $class = 0; // formulas like Sheet1!$A$1:$A$2 in list type data validation need this class (0x3B)
+
+        // Split the ref at the ! symbol
+        list($ext_ref, $range) = explode('!', $token);
+
+        // Convert the external reference part (different for BIFF8)
+        $ext_ref = $this->getRefIndex($ext_ref);
+
+        // Split the range into 2 cell refs
+        list($cell1, $cell2) = explode(':', $range);
+
+        // Convert the cell references
+        if (preg_match("/^(\\$)?[A-Ia-i]?[A-Za-z](\\$)?(\d+)$/", $cell1)) {
+            list($row1, $col1) = $this->cellToPackedRowcol($cell1);
+            list($row2, $col2) = $this->cellToPackedRowcol($cell2);
+        } else { // It's a rows range (like 26:27)
+             list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
+        }
+
+        // The ptg value depends on the class of the ptg.
+//        if ($class == 0) {
+            $ptgArea = pack("C", $this->ptg['ptgArea3d']);
+//        } elseif ($class == 1) {
+//            $ptgArea = pack("C", $this->ptg['ptgArea3dV']);
+//        } elseif ($class == 2) {
+//            $ptgArea = pack("C", $this->ptg['ptgArea3dA']);
+//        } else {
+//            throw new PHPExcel_Writer_Exception("Unknown class $class");
+//        }
+
+        return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
+    }
+
+    /**
+     * Convert an Excel reference such as A1, $B2, C$3 or $D$4 to a ptgRefV.
+     *
+     * @access private
+     * @param string $cell An Excel cell reference
+     * @return string The cell in packed() format with the corresponding ptg
+     */
+    private function convertRef2d($cell)
+    {
+//        $class = 2; // as far as I know, this is magick.
+
+        // Convert the cell reference
+        $cell_array = $this->cellToPackedRowcol($cell);
+        list($row, $col) = $cell_array;
+
+        // The ptg value depends on the class of the ptg.
+//        if ($class == 0) {
+//            $ptgRef = pack("C", $this->ptg['ptgRef']);
+//        } elseif ($class == 1) {
+//            $ptgRef = pack("C", $this->ptg['ptgRefV']);
+//        } elseif ($class == 2) {
+            $ptgRef = pack("C", $this->ptg['ptgRefA']);
+//        } else {
+//            // TODO: use real error codes
+//            throw new PHPExcel_Writer_Exception("Unknown class $class");
+//        }
+        return $ptgRef.$row.$col;
+    }
+
+    /**
+     * Convert an Excel 3d reference such as "Sheet1!A1" or "Sheet1:Sheet2!A1" to a
+     * ptgRef3d.
+     *
+     * @access private
+     * @param string $cell An Excel cell reference
+     * @return mixed The packed ptgRef3d token on success.
+     */
+    private function convertRef3d($cell)
+    {
+//        $class = 2; // as far as I know, this is magick.
+
+        // Split the ref at the ! symbol
+        list($ext_ref, $cell) = explode('!', $cell);
+
+        // Convert the external reference part (different for BIFF8)
+        $ext_ref = $this->getRefIndex($ext_ref);
+
+        // Convert the cell reference part
+        list($row, $col) = $this->cellToPackedRowcol($cell);
+
+        // The ptg value depends on the class of the ptg.
+//        if ($class == 0) {
+//            $ptgRef = pack("C", $this->ptg['ptgRef3d']);
+//        } elseif ($class == 1) {
+//            $ptgRef = pack("C", $this->ptg['ptgRef3dV']);
+//        } elseif ($class == 2) {
+            $ptgRef = pack("C", $this->ptg['ptgRef3dA']);
+//        } else {
+//            throw new PHPExcel_Writer_Exception("Unknown class $class");
+//        }
+
+        return $ptgRef . $ext_ref. $row . $col;
+    }
+
+    /**
+     * Convert an error code to a ptgErr
+     *
+     * @access    private
+     * @param    string    $errorCode    The error code for conversion to its ptg value
+     * @return    string                The error code ptgErr
+     */
+    private function convertError($errorCode)
+    {
+        switch ($errorCode) {
+            case '#NULL!':
+                return pack("C", 0x00);
+            case '#DIV/0!':
+                return pack("C", 0x07);
+            case '#VALUE!':
+                return pack("C", 0x0F);
+            case '#REF!':
+                return pack("C", 0x17);
+            case '#NAME?':
+                return pack("C", 0x1D);
+            case '#NUM!':
+                return pack("C", 0x24);
+            case '#N/A':
+                return pack("C", 0x2A);
+        }
+        return pack("C", 0xFF);
+    }
+
+    /**
+     * Convert the sheet name part of an external reference, for example "Sheet1" or
+     * "Sheet1:Sheet2", to a packed structure.
+     *
+     * @access    private
+     * @param    string    $ext_ref    The name of the external reference
+     * @return    string                The reference index in packed() format
+     */
+    private function packExtRef($ext_ref)
+    {
+        $ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
+        $ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
+
+        // Check if there is a sheet range eg., Sheet1:Sheet2.
+        if (preg_match("/:/", $ext_ref)) {
+            list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
+
+            $sheet1 = $this->getSheetIndex($sheet_name1);
+            if ($sheet1 == -1) {
+                throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name1 in formula");
+            }
+            $sheet2 = $this->getSheetIndex($sheet_name2);
+            if ($sheet2 == -1) {
+                throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name2 in formula");
+            }
+
+            // Reverse max and min sheet numbers if necessary
+            if ($sheet1 > $sheet2) {
+                list($sheet1, $sheet2) = array($sheet2, $sheet1);
+            }
+        } else { // Single sheet name only.
+            $sheet1 = $this->getSheetIndex($ext_ref);
+            if ($sheet1 == -1) {
+                throw new PHPExcel_Writer_Exception("Unknown sheet name $ext_ref in formula");
+            }
+            $sheet2 = $sheet1;
+        }
+
+        // References are stored relative to 0xFFFF.
+        $offset = -1 - $sheet1;
+
+        return pack('vdvv', $offset, 0x00, $sheet1, $sheet2);
+    }
+
+    /**
+     * Look up the REF index that corresponds to an external sheet name
+     * (or range). If it doesn't exist yet add it to the workbook's references
+     * array. It assumes all sheet names given must exist.
+     *
+     * @access private
+     * @param string $ext_ref The name of the external reference
+     * @return mixed The reference index in packed() format on success
+     */
+    private function getRefIndex($ext_ref)
+    {
+        $ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
+        $ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
+        $ext_ref = str_replace('\'\'', '\'', $ext_ref); // Replace escaped '' with '
+
+        // Check if there is a sheet range eg., Sheet1:Sheet2.
+        if (preg_match("/:/", $ext_ref)) {
+            list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
+
+            $sheet1 = $this->getSheetIndex($sheet_name1);
+            if ($sheet1 == -1) {
+                throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name1 in formula");
+            }
+            $sheet2 = $this->getSheetIndex($sheet_name2);
+            if ($sheet2 == -1) {
+                throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name2 in formula");
+            }
+
+            // Reverse max and min sheet numbers if necessary
+            if ($sheet1 > $sheet2) {
+                list($sheet1, $sheet2) = array($sheet2, $sheet1);
+            }
+        } else { // Single sheet name only.
+            $sheet1 = $this->getSheetIndex($ext_ref);
+            if ($sheet1 == -1) {
+                throw new PHPExcel_Writer_Exception("Unknown sheet name $ext_ref in formula");
+            }
+            $sheet2 = $sheet1;
+        }
+
+        // assume all references belong to this document
+        $supbook_index = 0x00;
+        $ref = pack('vvv', $supbook_index, $sheet1, $sheet2);
+        $totalreferences = count($this->references);
+        $index = -1;
+        for ($i = 0; $i < $totalreferences; ++$i) {
+            if ($ref == $this->references[$i]) {
+                $index = $i;
+                break;
+            }
+        }
+        // if REF was not found add it to references array
+        if ($index == -1) {
+            $this->references[$totalreferences] = $ref;
+            $index = $totalreferences;
+        }
+
+        return pack('v', $index);
+    }
+
+    /**
+     * Look up the index that corresponds to an external sheet name. The hash of
+     * sheet names is updated by the addworksheet() method of the
+     * PHPExcel_Writer_Excel5_Workbook class.
+     *
+     * @access    private
+     * @param    string    $sheet_name        Sheet name
+     * @return    integer                    The sheet index, -1 if the sheet was not found
+     */
+    private function getSheetIndex($sheet_name)
+    {
+        if (!isset($this->externalSheets[$sheet_name])) {
+            return -1;
+        } else {
+            return $this->externalSheets[$sheet_name];
+        }
+    }
+
+    /**
+     * This method is used to update the array of sheet names. It is
+     * called by the addWorksheet() method of the
+     * PHPExcel_Writer_Excel5_Workbook class.
+     *
+     * @access public
+     * @see PHPExcel_Writer_Excel5_Workbook::addWorksheet()
+     * @param string  $name  The name of the worksheet being added
+     * @param integer $index The index of the worksheet being added
+     */
+    public function setExtSheet($name, $index)
+    {
+        $this->externalSheets[$name] = $index;
+    }
+
+    /**
+     * pack() row and column into the required 3 or 4 byte format.
+     *
+     * @access private
+     * @param string $cell The Excel cell reference to be packed
+     * @return array Array containing the row and column in packed() format
+     */
+    private function cellToPackedRowcol($cell)
+    {
+        $cell = strtoupper($cell);
+        list($row, $col, $row_rel, $col_rel) = $this->cellToRowcol($cell);
+        if ($col >= 256) {
+            throw new PHPExcel_Writer_Exception("Column in: $cell greater than 255");
+        }
+        if ($row >= 65536) {
+            throw new PHPExcel_Writer_Exception("Row in: $cell greater than 65536 ");
+        }
+
+        // Set the high bits to indicate if row or col are relative.
+        $col |= $col_rel << 14;
+        $col |= $row_rel << 15;
+        $col = pack('v', $col);
+
+        $row = pack('v', $row);
+
+        return array($row, $col);
+    }
+
+    /**
+     * pack() row range into the required 3 or 4 byte format.
+     * Just using maximum col/rows, which is probably not the correct solution
+     *
+     * @access private
+     * @param string $range The Excel range to be packed
+     * @return array Array containing (row1,col1,row2,col2) in packed() format
+     */
+    private function rangeToPackedRange($range)
+    {
+        preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match);
+        // return absolute rows if there is a $ in the ref
+        $row1_rel = empty($match[1]) ? 1 : 0;
+        $row1     = $match[2];
+        $row2_rel = empty($match[3]) ? 1 : 0;
+        $row2     = $match[4];
+        // Convert 1-index to zero-index
+        --$row1;
+        --$row2;
+        // Trick poor inocent Excel
+        $col1 = 0;
+        $col2 = 65535; // FIXME: maximum possible value for Excel 5 (change this!!!)
+
+        // FIXME: this changes for BIFF8
+        if (($row1 >= 65536) or ($row2 >= 65536)) {
+            throw new PHPExcel_Writer_Exception("Row in: $range greater than 65536 ");
+        }
+
+        // Set the high bits to indicate if rows are relative.
+        $col1 |= $row1_rel << 15;
+        $col2 |= $row2_rel << 15;
+        $col1 = pack('v', $col1);
+        $col2 = pack('v', $col2);
+
+        $row1 = pack('v', $row1);
+        $row2 = pack('v', $row2);
+
+        return array($row1, $col1, $row2, $col2);
+    }
+
+    /**
+     * Convert an Excel cell reference such as A1 or $B2 or C$3 or $D$4 to a zero
+     * indexed row and column number. Also returns two (0,1) values to indicate
+     * whether the row or column are relative references.
+     *
+     * @access private
+     * @param string $cell The Excel cell reference in A1 format.
+     * @return array
+     */
+    private function cellToRowcol($cell)
+    {
+        preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match);
+        // return absolute column if there is a $ in the ref
+        $col_rel = empty($match[1]) ? 1 : 0;
+        $col_ref = $match[2];
+        $row_rel = empty($match[3]) ? 1 : 0;
+        $row     = $match[4];
+
+        // Convert base26 column string to a number.
+        $expn = strlen($col_ref) - 1;
+        $col  = 0;
+        $col_ref_length = strlen($col_ref);
+        for ($i = 0; $i < $col_ref_length; ++$i) {
+            $col += (ord($col_ref[$i]) - 64) * pow(26, $expn);
+            --$expn;
+        }
+
+        // Convert 1-index to zero-index
+        --$row;
+        --$col;
+
+        return array($row, $col, $row_rel, $col_rel);
+    }
+
+    /**
+     * Advance to the next valid token.
+     *
+     * @access private
+     */
+    private function advance()
+    {
+        $i = $this->currentCharacter;
+        $formula_length = strlen($this->formula);
+        // eat up white spaces
+        if ($i < $formula_length) {
+            while ($this->formula[$i] == " ") {
+                ++$i;
+            }
+
+            if ($i < ($formula_length - 1)) {
+                $this->lookAhead = $this->formula[$i+1];
+            }
+            $token = '';
+        }
+
+        while ($i < $formula_length) {
+            $token .= $this->formula[$i];
+
+            if ($i < ($formula_length - 1)) {
+                $this->lookAhead = $this->formula[$i+1];
+            } else {
+                $this->lookAhead = '';
+            }
+
+            if ($this->match($token) != '') {
+                //if ($i < strlen($this->formula) - 1) {
+                //    $this->lookAhead = $this->formula[$i+1];
+                //}
+                $this->currentCharacter = $i + 1;
+                $this->currentToken = $token;
+                return 1;
+            }
+
+            if ($i < ($formula_length - 2)) {
+                $this->lookAhead = $this->formula[$i+2];
+            } else { // if we run out of characters lookAhead becomes empty
+                $this->lookAhead = '';
+            }
+            ++$i;
+        }
+        //die("Lexical error ".$this->currentCharacter);
+    }
+
+    /**
+     * Checks if it's a valid token.
+     *
+     * @access private
+     * @param mixed $token The token to check.
+     * @return mixed       The checked token or false on failure
+     */
+    private function match($token)
+    {
+        switch ($token) {
+            case "+":
+            case "-":
+            case "*":
+            case "/":
+            case "(":
+            case ")":
+            case ",":
+            case ";":
+            case ">=":
+            case "<=":
+            case "=":
+            case "<>":
+            case "^":
+            case "&":
+            case "%":
+                return $token;
+                break;
+            case ">":
+                if ($this->lookAhead == '=') { // it's a GE token
+                    break;
+                }
+                return $token;
+                break;
+            case "<":
+                // it's a LE or a NE token
+                if (($this->lookAhead == '=') or ($this->lookAhead == '>')) {
+                    break;
+                }
+                return $token;
+                break;
+            default:
+                // if it's a reference A1 or $A$1 or $A1 or A$1
+                if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/', $token) and !preg_match("/[0-9]/", $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.') and ($this->lookAhead != '!')) {
+                    return $token;
+                } elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and !preg_match("/[0-9]/", $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.')) {
+                    // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
+                    return $token;
+                } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and !preg_match("/[0-9]/", $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.')) {
+                    // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
+                    return $token;
+                } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $token) && !preg_match("/[0-9]/", $this->lookAhead)) {
+                    // if it's a range A1:A2 or $A$1:$A$2
+                    return $token;
+                } elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and !preg_match("/[0-9]/", $this->lookAhead)) {
+                    // If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
+                    return $token;
+                } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and !preg_match("/[0-9]/", $this->lookAhead)) {
+                    // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
+                    return $token;
+                } elseif (is_numeric($token) and (!is_numeric($token.$this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
+                    // If it's a number (check that it's not a sheet name or range)
+                    return $token;
+                } elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token) and $this->lookAhead != '"' and (substr_count($token, '"')%2 == 0)) {
+                    // If it's a string (of maximum 255 characters)
+                    return $token;
+                } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
+                    // If it's an error code
+                    return $token;
+                } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i", $token) and ($this->lookAhead == "(")) {
+                    // if it's a function call
+                    return $token;
+                } elseif (substr($token, -1) == ')') {
+                    //    It's an argument of some description (e.g. a named range),
+                    //        precise nature yet to be determined
+                    return $token;
+                }
+                return '';
+        }
+    }
+
+    /**
+     * The parsing method. It parses a formula.
+     *
+     * @access public
+     * @param string $formula The formula to parse, without the initial equal
+     *                        sign (=).
+     * @return mixed true on success
+     */
+    public function parse($formula)
+    {
+        $this->currentCharacter = 0;
+        $this->formula      = $formula;
+        $this->lookAhead    = isset($formula[1]) ? $formula[1] : '';
+        $this->advance();
+        $this->parseTree   = $this->condition();
+        return true;
+    }
+
+    /**
+     * It parses a condition. It assumes the following rule:
+     * Cond -> Expr [(">" | "<") Expr]
+     *
+     * @access private
+     * @return mixed The parsed ptg'd tree on success
+     */
+    private function condition()
+    {
+        $result = $this->expression();
+        if ($this->currentToken == "<") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgLT', $result, $result2);
+        } elseif ($this->currentToken == ">") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgGT', $result, $result2);
+        } elseif ($this->currentToken == "<=") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgLE', $result, $result2);
+        } elseif ($this->currentToken == ">=") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgGE', $result, $result2);
+        } elseif ($this->currentToken == "=") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgEQ', $result, $result2);
+        } elseif ($this->currentToken == "<>") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgNE', $result, $result2);
+        } elseif ($this->currentToken == "&") {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgConcat', $result, $result2);
+        }
+        return $result;
+    }
+
+    /**
+     * It parses a expression. It assumes the following rule:
+     * Expr -> Term [("+" | "-") Term]
+     *      -> "string"
+     *      -> "-" Term : Negative value
+     *      -> "+" Term : Positive value
+     *      -> Error code
+     *
+     * @access private
+     * @return mixed The parsed ptg'd tree on success
+     */
+    private function expression()
+    {
+        // If it's a string return a string node
+        if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $this->currentToken)) {
+            $tmp = str_replace('""', '"', $this->currentToken);
+            if (($tmp == '"') || ($tmp == '')) {
+                //    Trap for "" that has been used for an empty string
+                $tmp = '""';
+            }
+            $result = $this->createTree($tmp, '', '');
+            $this->advance();
+            return $result;
+        // If it's an error code
+        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->currentToken) or $this->currentToken == '#N/A') {
+            $result = $this->createTree($this->currentToken, 'ptgErr', '');
+            $this->advance();
+            return $result;
+        // If it's a negative value
+        } elseif ($this->currentToken == "-") {
+            // catch "-" Term
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgUminus', $result2, '');
+            return $result;
+        // If it's a positive value
+        } elseif ($this->currentToken == "+") {
+            // catch "+" Term
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgUplus', $result2, '');
+            return $result;
+        }
+        $result = $this->term();
+        while (($this->currentToken == "+") or
+               ($this->currentToken == "-") or
+               ($this->currentToken == "^")) {
+        /**/
+            if ($this->currentToken == "+") {
+                $this->advance();
+                $result2 = $this->term();
+                $result = $this->createTree('ptgAdd', $result, $result2);
+            } elseif ($this->currentToken == "-") {
+                $this->advance();
+                $result2 = $this->term();
+                $result = $this->createTree('ptgSub', $result, $result2);
+            } else {
+                $this->advance();
+                $result2 = $this->term();
+                $result = $this->createTree('ptgPower', $result, $result2);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * This function just introduces a ptgParen element in the tree, so that Excel
+     * doesn't get confused when working with a parenthesized formula afterwards.
+     *
+     * @access private
+     * @see fact()
+     * @return array The parsed ptg'd tree
+     */
+    private function parenthesizedExpression()
+    {
+        $result = $this->createTree('ptgParen', $this->expression(), '');
+        return $result;
+    }
+
+    /**
+     * It parses a term. It assumes the following rule:
+     * Term -> Fact [("*" | "/") Fact]
+     *
+     * @access private
+     * @return mixed The parsed ptg'd tree on success
+     */
+    private function term()
+    {
+        $result = $this->fact();
+        while (($this->currentToken == "*") or
+               ($this->currentToken == "/")) {
+        /**/
+            if ($this->currentToken == "*") {
+                $this->advance();
+                $result2 = $this->fact();
+                $result = $this->createTree('ptgMul', $result, $result2);
+            } else {
+                $this->advance();
+                $result2 = $this->fact();
+                $result = $this->createTree('ptgDiv', $result, $result2);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * It parses a factor. It assumes the following rule:
+     * Fact -> ( Expr )
+     *       | CellRef
+     *       | CellRange
+     *       | Number
+     *       | Function
+     *
+     * @access private
+     * @return mixed The parsed ptg'd tree on success
+     */
+    private function fact()
+    {
+        if ($this->currentToken == "(") {
+            $this->advance();         // eat the "("
+            $result = $this->parenthesizedExpression();
+            if ($this->currentToken != ")") {
+                throw new PHPExcel_Writer_Exception("')' token expected.");
+            }
+            $this->advance();         // eat the ")"
+            return $result;
+        }
+        // if it's a reference
+        if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/', $this->currentToken)) {
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+            return $result;
+        } elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->currentToken)) {
+            // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+            return $result;
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->currentToken)) {
+            // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+            return $result;
+        } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $this->currentToken) or
+                preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $this->currentToken)) {
+            // if it's a range A1:B2 or $A$1:$B$2
+            // must be an error?
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+            return $result;
+        } elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $this->currentToken)) {
+            // If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
+            // must be an error?
+            //$result = $this->currentToken;
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+            return $result;
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $this->currentToken)) {
+            // If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
+            // must be an error?
+            //$result = $this->currentToken;
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+            return $result;
+        } elseif (is_numeric($this->currentToken)) {
+            // If it's a number or a percent
+            if ($this->lookAhead == '%') {
+                $result = $this->createTree('ptgPercent', $this->currentToken, '');
+                $this->advance();  // Skip the percentage operator once we've pre-built that tree
+            } else {
+                $result = $this->createTree($this->currentToken, '', '');
+            }
+            $this->advance();
+            return $result;
+        } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i", $this->currentToken)) {
+            // if it's a function call
+            $result = $this->func();
+            return $result;
+        }
+        throw new PHPExcel_Writer_Exception("Syntax error: ".$this->currentToken.", lookahead: ".$this->lookAhead.", current char: ".$this->currentCharacter);
+    }
+
+    /**
+     * It parses a function call. It assumes the following rule:
+     * Func -> ( Expr [,Expr]* )
+     *
+     * @access private
+     * @return mixed The parsed ptg'd tree on success
+     */
+    private function func()
+    {
+        $num_args = 0; // number of arguments received
+        $function = strtoupper($this->currentToken);
+        $result   = ''; // initialize result
+        $this->advance();
+        $this->advance();         // eat the "("
+        while ($this->currentToken != ')') {
+        /**/
+            if ($num_args > 0) {
+                if ($this->currentToken == "," || $this->currentToken == ";") {
+                    $this->advance();  // eat the "," or ";"
+                } else {
+                    throw new PHPExcel_Writer_Exception("Syntax error: comma expected in function $function, arg #{$num_args}");
+                }
+                $result2 = $this->condition();
+                $result = $this->createTree('arg', $result, $result2);
+            } else { // first argument
+                $result2 = $this->condition();
+                $result = $this->createTree('arg', '', $result2);
+            }
+            ++$num_args;
+        }
+        if (!isset($this->functions[$function])) {
+            throw new PHPExcel_Writer_Exception("Function $function() doesn't exist");
+        }
+        $args = $this->functions[$function][1];
+        // If fixed number of args eg. TIME($i, $j, $k). Check that the number of args is valid.
+        if (($args >= 0) and ($args != $num_args)) {
+            throw new PHPExcel_Writer_Exception("Incorrect number of arguments in function $function() ");
+        }
+
+        $result = $this->createTree($function, $result, $num_args);
+        $this->advance();         // eat the ")"
+        return $result;
+    }
+
+    /**
+     * Creates a tree. In fact an array which may have one or two arrays (sub-trees)
+     * as elements.
+     *
+     * @access private
+     * @param mixed $value The value of this node.
+     * @param mixed $left  The left array (sub-tree) or a final node.
+     * @param mixed $right The right array (sub-tree) or a final node.
+     * @return array A tree
+     */
+    private function createTree($value, $left, $right)
+    {
+        return array('value' => $value, 'left' => $left, 'right' => $right);
+    }
+
+    /**
+     * Builds a string containing the tree in reverse polish notation (What you
+     * would use in a HP calculator stack).
+     * The following tree:
+     *
+     *    +
+     *   / \
+     *  2   3
+     *
+     * produces: "23+"
+     *
+     * The following tree:
+     *
+     *    +
+     *   / \
+     *  3   *
+     *     / \
+     *    6   A1
+     *
+     * produces: "36A1*+"
+     *
+     * In fact all operands, functions, references, etc... are written as ptg's
+     *
+     * @access public
+     * @param array $tree The optional tree to convert.
+     * @return string The tree in reverse polish notation
+     */
+    public function toReversePolish($tree = array())
+    {
+        $polish = ""; // the string we are going to return
+        if (empty($tree)) { // If it's the first call use parseTree
+            $tree = $this->parseTree;
+        }
+
+        if (is_array($tree['left'])) {
+            $converted_tree = $this->toReversePolish($tree['left']);
+            $polish .= $converted_tree;
+        } elseif ($tree['left'] != '') { // It's a final node
+            $converted_tree = $this->convert($tree['left']);
+            $polish .= $converted_tree;
+        }
+        if (is_array($tree['right'])) {
+            $converted_tree = $this->toReversePolish($tree['right']);
+            $polish .= $converted_tree;
+        } elseif ($tree['right'] != '') { // It's a final node
+            $converted_tree = $this->convert($tree['right']);
+            $polish .= $converted_tree;
+        }
+        // if it's a function convert it here (so we can set it's arguments)
+        if (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/", $tree['value']) and
+            !preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value']) and
+            !preg_match("/^[A-Ia-i]?[A-Za-z](\d+)\.\.[A-Ia-i]?[A-Za-z](\d+)$/", $tree['value']) and
+            !is_numeric($tree['value']) and
+            !isset($this->ptg[$tree['value']])) {
+            // left subtree for a function is always an array.
+            if ($tree['left'] != '') {
+                $left_tree = $this->toReversePolish($tree['left']);
+            } else {
+                $left_tree = '';
+            }
+            // add it's left subtree and return.
+            return $left_tree.$this->convertFunction($tree['value'], $tree['right']);
+        } else {
+            $converted_tree = $this->convert($tree['value']);
+        }
+        $polish .= $converted_tree;
+        return $polish;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/Workbook.php b/lib/PHPExcel/Writer/Excel5/Workbook.php
new file mode 100644
index 000000000..5a0cca515
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/Workbook.php
@@ -0,0 +1,1444 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5_Workbook
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// /*
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
+{
+    /**
+     * Formula parser
+     *
+     * @var PHPExcel_Writer_Excel5_Parser
+     */
+    private $parser;
+
+    /**
+     * The BIFF file size for the workbook.
+     * @var integer
+     * @see calcSheetOffsets()
+     */
+    private $biffSize;
+
+    /**
+     * XF Writers
+     * @var PHPExcel_Writer_Excel5_Xf[]
+     */
+    private $xfWriters = array();
+
+    /**
+     * Array containing the colour palette
+     * @var array
+     */
+    private $palette;
+
+    /**
+     * The codepage indicates the text encoding used for strings
+     * @var integer
+     */
+    private $codepage;
+
+    /**
+     * The country code used for localization
+     * @var integer
+     */
+    private $countryCode;
+
+    /**
+     * Workbook
+     * @var PHPExcel
+     */
+    private $phpExcel;
+
+    /**
+     * Fonts writers
+     *
+     * @var PHPExcel_Writer_Excel5_Font[]
+     */
+    private $fontWriters = array();
+
+    /**
+     * Added fonts. Maps from font's hash => index in workbook
+     *
+     * @var array
+     */
+    private $addedFonts = array();
+
+    /**
+     * Shared number formats
+     *
+     * @var array
+     */
+    private $numberFormats = array();
+
+    /**
+     * Added number formats. Maps from numberFormat's hash => index in workbook
+     *
+     * @var array
+     */
+    private $addedNumberFormats = array();
+
+    /**
+     * Sizes of the binary worksheet streams
+     *
+     * @var array
+     */
+    private $worksheetSizes = array();
+
+    /**
+     * Offsets of the binary worksheet streams relative to the start of the global workbook stream
+     *
+     * @var array
+     */
+    private $worksheetOffsets = array();
+
+    /**
+     * Total number of shared strings in workbook
+     *
+     * @var int
+     */
+    private $stringTotal;
+
+    /**
+     * Number of unique shared strings in workbook
+     *
+     * @var int
+     */
+    private $stringUnique;
+
+    /**
+     * Array of unique shared strings in workbook
+     *
+     * @var array
+     */
+    private $stringTable;
+
+    /**
+     * Color cache
+     */
+    private $colors;
+
+    /**
+     * Escher object corresponding to MSODRAWINGGROUP
+     *
+     * @var PHPExcel_Shared_Escher
+     */
+    private $escher;
+
+
+    /**
+     * Class constructor
+     *
+     * @param PHPExcel    $phpExcel        The Workbook
+     * @param int        &$str_total        Total number of strings
+     * @param int        &$str_unique    Total number of unique strings
+     * @param array        &$str_table        String Table
+     * @param array        &$colors        Colour Table
+     * @param mixed        $parser            The formula parser created for the Workbook
+     */
+    public function __construct(PHPExcel $phpExcel = null, &$str_total, &$str_unique, &$str_table, &$colors, $parser)
+    {
+        // It needs to call its parent's constructor explicitly
+        parent::__construct();
+
+        $this->parser        = $parser;
+        $this->biffSize     = 0;
+        $this->palette      = array();
+        $this->countryCode = -1;
+
+        $this->stringTotal      = &$str_total;
+        $this->stringUnique     = &$str_unique;
+        $this->stringTable      = &$str_table;
+        $this->colors        = &$colors;
+        $this->setPaletteXl97();
+
+        $this->phpExcel = $phpExcel;
+
+        // set BIFFwriter limit for CONTINUE records
+        //        $this->_limit = 8224;
+        $this->codepage = 0x04B0;
+
+        // Add empty sheets and Build color cache
+        $countSheets = $phpExcel->getSheetCount();
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $phpSheet = $phpExcel->getSheet($i);
+
+            $this->parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
+
+            $supbook_index = 0x00;
+            $ref = pack('vvv', $supbook_index, $i, $i);
+            $this->parser->references[] = $ref;  // Register reference with parser
+
+            // Sheet tab colors?
+            if ($phpSheet->isTabColorSet()) {
+                $this->addColor($phpSheet->getTabColor()->getRGB());
+            }
+        }
+
+    }
+
+    /**
+     * Add a new XF writer
+     *
+     * @param PHPExcel_Style
+     * @param boolean Is it a style XF?
+     * @return int Index to XF record
+     */
+    public function addXfWriter($style, $isStyleXf = false)
+    {
+        $xfWriter = new PHPExcel_Writer_Excel5_Xf($style);
+        $xfWriter->setIsStyleXf($isStyleXf);
+
+        // Add the font if not already added
+        $fontIndex = $this->addFont($style->getFont());
+
+        // Assign the font index to the xf record
+        $xfWriter->setFontIndex($fontIndex);
+
+        // Background colors, best to treat these after the font so black will come after white in custom palette
+        $xfWriter->setFgColor($this->addColor($style->getFill()->getStartColor()->getRGB()));
+        $xfWriter->setBgColor($this->addColor($style->getFill()->getEndColor()->getRGB()));
+        $xfWriter->setBottomColor($this->addColor($style->getBorders()->getBottom()->getColor()->getRGB()));
+        $xfWriter->setTopColor($this->addColor($style->getBorders()->getTop()->getColor()->getRGB()));
+        $xfWriter->setRightColor($this->addColor($style->getBorders()->getRight()->getColor()->getRGB()));
+        $xfWriter->setLeftColor($this->addColor($style->getBorders()->getLeft()->getColor()->getRGB()));
+        $xfWriter->setDiagColor($this->addColor($style->getBorders()->getDiagonal()->getColor()->getRGB()));
+
+        // Add the number format if it is not a built-in one and not already added
+        if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
+            $numberFormatHashCode = $style->getNumberFormat()->getHashCode();
+
+            if (isset($this->addedNumberFormats[$numberFormatHashCode])) {
+                $numberFormatIndex = $this->addedNumberFormats[$numberFormatHashCode];
+            } else {
+                $numberFormatIndex = 164 + count($this->numberFormats);
+                $this->numberFormats[$numberFormatIndex] = $style->getNumberFormat();
+                $this->addedNumberFormats[$numberFormatHashCode] = $numberFormatIndex;
+            }
+        } else {
+            $numberFormatIndex = (int) $style->getNumberFormat()->getBuiltInFormatCode();
+        }
+
+        // Assign the number format index to xf record
+        $xfWriter->setNumberFormatIndex($numberFormatIndex);
+
+        $this->xfWriters[] = $xfWriter;
+
+        $xfIndex = count($this->xfWriters) - 1;
+        return $xfIndex;
+    }
+
+    /**
+     * Add a font to added fonts
+     *
+     * @param PHPExcel_Style_Font $font
+     * @return int Index to FONT record
+     */
+    public function addFont(PHPExcel_Style_Font $font)
+    {
+        $fontHashCode = $font->getHashCode();
+        if (isset($this->addedFonts[$fontHashCode])) {
+            $fontIndex = $this->addedFonts[$fontHashCode];
+        } else {
+            $countFonts = count($this->fontWriters);
+            $fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
+
+            $fontWriter = new PHPExcel_Writer_Excel5_Font($font);
+            $fontWriter->setColorIndex($this->addColor($font->getColor()->getRGB()));
+            $this->fontWriters[] = $fontWriter;
+
+            $this->addedFonts[$fontHashCode] = $fontIndex;
+        }
+        return $fontIndex;
+    }
+
+    /**
+     * Alter color palette adding a custom color
+     *
+     * @param string $rgb E.g. 'FF00AA'
+     * @return int Color index
+     */
+    private function addColor($rgb)
+    {
+        if (!isset($this->colors[$rgb])) {
+            if (count($this->colors) < 57) {
+                // then we add a custom color altering the palette
+                $colorIndex = 8 + count($this->colors);
+                $this->palette[$colorIndex] =
+                    array(
+                        hexdec(substr($rgb, 0, 2)),
+                        hexdec(substr($rgb, 2, 2)),
+                        hexdec(substr($rgb, 4)),
+                        0
+                    );
+                $this->colors[$rgb] = $colorIndex;
+            } else {
+                // no room for more custom colors, just map to black
+                $colorIndex = 0;
+            }
+        } else {
+            // fetch already added custom color
+            $colorIndex = $this->colors[$rgb];
+        }
+
+        return $colorIndex;
+    }
+
+    /**
+     * Sets the colour palette to the Excel 97+ default.
+     *
+     * @access private
+     */
+    private function setPaletteXl97()
+    {
+        $this->palette = array(
+            0x08 => array(0x00, 0x00, 0x00, 0x00),
+            0x09 => array(0xff, 0xff, 0xff, 0x00),
+            0x0A => array(0xff, 0x00, 0x00, 0x00),
+            0x0B => array(0x00, 0xff, 0x00, 0x00),
+            0x0C => array(0x00, 0x00, 0xff, 0x00),
+            0x0D => array(0xff, 0xff, 0x00, 0x00),
+            0x0E => array(0xff, 0x00, 0xff, 0x00),
+            0x0F => array(0x00, 0xff, 0xff, 0x00),
+            0x10 => array(0x80, 0x00, 0x00, 0x00),
+            0x11 => array(0x00, 0x80, 0x00, 0x00),
+            0x12 => array(0x00, 0x00, 0x80, 0x00),
+            0x13 => array(0x80, 0x80, 0x00, 0x00),
+            0x14 => array(0x80, 0x00, 0x80, 0x00),
+            0x15 => array(0x00, 0x80, 0x80, 0x00),
+            0x16 => array(0xc0, 0xc0, 0xc0, 0x00),
+            0x17 => array(0x80, 0x80, 0x80, 0x00),
+            0x18 => array(0x99, 0x99, 0xff, 0x00),
+            0x19 => array(0x99, 0x33, 0x66, 0x00),
+            0x1A => array(0xff, 0xff, 0xcc, 0x00),
+            0x1B => array(0xcc, 0xff, 0xff, 0x00),
+            0x1C => array(0x66, 0x00, 0x66, 0x00),
+            0x1D => array(0xff, 0x80, 0x80, 0x00),
+            0x1E => array(0x00, 0x66, 0xcc, 0x00),
+            0x1F => array(0xcc, 0xcc, 0xff, 0x00),
+            0x20 => array(0x00, 0x00, 0x80, 0x00),
+            0x21 => array(0xff, 0x00, 0xff, 0x00),
+            0x22 => array(0xff, 0xff, 0x00, 0x00),
+            0x23 => array(0x00, 0xff, 0xff, 0x00),
+            0x24 => array(0x80, 0x00, 0x80, 0x00),
+            0x25 => array(0x80, 0x00, 0x00, 0x00),
+            0x26 => array(0x00, 0x80, 0x80, 0x00),
+            0x27 => array(0x00, 0x00, 0xff, 0x00),
+            0x28 => array(0x00, 0xcc, 0xff, 0x00),
+            0x29 => array(0xcc, 0xff, 0xff, 0x00),
+            0x2A => array(0xcc, 0xff, 0xcc, 0x00),
+            0x2B => array(0xff, 0xff, 0x99, 0x00),
+            0x2C => array(0x99, 0xcc, 0xff, 0x00),
+            0x2D => array(0xff, 0x99, 0xcc, 0x00),
+            0x2E => array(0xcc, 0x99, 0xff, 0x00),
+            0x2F => array(0xff, 0xcc, 0x99, 0x00),
+            0x30 => array(0x33, 0x66, 0xff, 0x00),
+            0x31 => array(0x33, 0xcc, 0xcc, 0x00),
+            0x32 => array(0x99, 0xcc, 0x00, 0x00),
+            0x33 => array(0xff, 0xcc, 0x00, 0x00),
+            0x34 => array(0xff, 0x99, 0x00, 0x00),
+            0x35 => array(0xff, 0x66, 0x00, 0x00),
+            0x36 => array(0x66, 0x66, 0x99, 0x00),
+            0x37 => array(0x96, 0x96, 0x96, 0x00),
+            0x38 => array(0x00, 0x33, 0x66, 0x00),
+            0x39 => array(0x33, 0x99, 0x66, 0x00),
+            0x3A => array(0x00, 0x33, 0x00, 0x00),
+            0x3B => array(0x33, 0x33, 0x00, 0x00),
+            0x3C => array(0x99, 0x33, 0x00, 0x00),
+            0x3D => array(0x99, 0x33, 0x66, 0x00),
+            0x3E => array(0x33, 0x33, 0x99, 0x00),
+            0x3F => array(0x33, 0x33, 0x33, 0x00),
+        );
+    }
+
+    /**
+     * Assemble worksheets into a workbook and send the BIFF data to an OLE
+     * storage.
+     *
+     * @param    array    $pWorksheetSizes    The sizes in bytes of the binary worksheet streams
+     * @return    string    Binary data for workbook stream
+     */
+    public function writeWorkbook($pWorksheetSizes = null)
+    {
+        $this->worksheetSizes = $pWorksheetSizes;
+
+        // Calculate the number of selected worksheet tabs and call the finalization
+        // methods for each worksheet
+        $total_worksheets = $this->phpExcel->getSheetCount();
+
+        // Add part 1 of the Workbook globals, what goes before the SHEET records
+        $this->storeBof(0x0005);
+        $this->writeCodepage();
+        $this->writeWindow1();
+
+        $this->writeDateMode();
+        $this->writeAllFonts();
+        $this->writeAllNumberFormats();
+        $this->writeAllXfs();
+        $this->writeAllStyles();
+        $this->writePalette();
+
+        // Prepare part 3 of the workbook global stream, what goes after the SHEET records
+        $part3 = '';
+        if ($this->countryCode != -1) {
+            $part3 .= $this->writeCountry();
+        }
+        $part3 .= $this->writeRecalcId();
+
+        $part3 .= $this->writeSupbookInternal();
+        /* TODO: store external SUPBOOK records and XCT and CRN records
+        in case of external references for BIFF8 */
+        $part3 .= $this->writeExternalsheetBiff8();
+        $part3 .= $this->writeAllDefinedNamesBiff8();
+        $part3 .= $this->writeMsoDrawingGroup();
+        $part3 .= $this->writeSharedStringsTable();
+
+        $part3 .= $this->writeEof();
+
+        // Add part 2 of the Workbook globals, the SHEET records
+        $this->calcSheetOffsets();
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $this->writeBoundSheet($this->phpExcel->getSheet($i), $this->worksheetOffsets[$i]);
+        }
+
+        // Add part 3 of the Workbook globals
+        $this->_data .= $part3;
+
+        return $this->_data;
+    }
+
+    /**
+     * Calculate offsets for Worksheet BOF records.
+     *
+     * @access private
+     */
+    private function calcSheetOffsets()
+    {
+        $boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
+
+        // size of Workbook globals part 1 + 3
+        $offset            = $this->_datasize;
+
+        // add size of Workbook globals part 2, the length of the SHEET records
+        $total_worksheets = count($this->phpExcel->getAllSheets());
+        foreach ($this->phpExcel->getWorksheetIterator() as $sheet) {
+            $offset += $boundsheet_length + strlen(PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
+        }
+
+        // add the sizes of each of the Sheet substreams, respectively
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $this->worksheetOffsets[$i] = $offset;
+            $offset += $this->worksheetSizes[$i];
+        }
+        $this->biffSize = $offset;
+    }
+
+    /**
+     * Store the Excel FONT records.
+     */
+    private function writeAllFonts()
+    {
+        foreach ($this->fontWriters as $fontWriter) {
+            $this->append($fontWriter->writeFont());
+        }
+    }
+
+    /**
+     * Store user defined numerical formats i.e. FORMAT records
+     */
+    private function writeAllNumberFormats()
+    {
+        foreach ($this->numberFormats as $numberFormatIndex => $numberFormat) {
+            $this->writeNumberFormat($numberFormat->getFormatCode(), $numberFormatIndex);
+        }
+    }
+
+    /**
+     * Write all XF records.
+     */
+    private function writeAllXfs()
+    {
+        foreach ($this->xfWriters as $xfWriter) {
+            $this->append($xfWriter->writeXf());
+        }
+    }
+
+    /**
+     * Write all STYLE records.
+     */
+    private function writeAllStyles()
+    {
+        $this->writeStyle();
+    }
+
+    /**
+     * Write the EXTERNCOUNT and EXTERNSHEET records. These are used as indexes for
+     * the NAME records.
+     */
+    private function writeExternals()
+    {
+        $countSheets = $this->phpExcel->getSheetCount();
+        // Create EXTERNCOUNT with number of worksheets
+        $this->writeExternalCount($countSheets);
+
+        // Create EXTERNSHEET for each worksheet
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $this->writeExternalSheet($this->phpExcel->getSheet($i)->getTitle());
+        }
+    }
+
+    /**
+     * Write the NAME record to define the print area and the repeat rows and cols.
+     */
+    private function writeNames()
+    {
+        // total number of sheets
+        $total_worksheets = $this->phpExcel->getSheetCount();
+
+        // Create the print area NAME records
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetSetup = $this->phpExcel->getSheet($i)->getPageSetup();
+            // Write a Name record if the print area has been defined
+            if ($sheetSetup->isPrintAreaSet()) {
+                // Print area
+                $printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
+                $printArea = $printArea[0];
+                $printArea[0] = PHPExcel_Cell::coordinateFromString($printArea[0]);
+                $printArea[1] = PHPExcel_Cell::coordinateFromString($printArea[1]);
+
+                $print_rowmin = $printArea[0][1] - 1;
+                $print_rowmax = $printArea[1][1] - 1;
+                $print_colmin = PHPExcel_Cell::columnIndexFromString($printArea[0][0]) - 1;
+                $print_colmax = PHPExcel_Cell::columnIndexFromString($printArea[1][0]) - 1;
+
+                $this->writeNameShort(
+                    $i, // sheet index
+                    0x06, // NAME type
+                    $print_rowmin,
+                    $print_rowmax,
+                    $print_colmin,
+                    $print_colmax
+                );
+            }
+        }
+
+        // Create the print title NAME records
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetSetup = $this->phpExcel->getSheet($i)->getPageSetup();
+
+            // simultaneous repeatColumns repeatRows
+            if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
+                $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
+                $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
+                $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+
+                $repeat = $sheetSetup->getRowsToRepeatAtTop();
+                $rowmin = $repeat[0] - 1;
+                $rowmax = $repeat[1] - 1;
+
+                $this->writeNameLong(
+                    $i, // sheet index
+                    0x07, // NAME type
+                    $rowmin,
+                    $rowmax,
+                    $colmin,
+                    $colmax
+                );
+
+            // (exclusive) either repeatColumns or repeatRows
+            } elseif ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
+                // Columns to repeat
+                if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
+                    $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
+                    $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
+                    $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+                } else {
+                    $colmin = 0;
+                    $colmax = 255;
+                }
+
+                // Rows to repeat
+                if ($sheetSetup->isRowsToRepeatAtTopSet()) {
+                    $repeat = $sheetSetup->getRowsToRepeatAtTop();
+                    $rowmin = $repeat[0] - 1;
+                    $rowmax = $repeat[1] - 1;
+                } else {
+                    $rowmin = 0;
+                    $rowmax = 65535;
+                }
+
+                $this->writeNameShort(
+                    $i, // sheet index
+                    0x07, // NAME type
+                    $rowmin,
+                    $rowmax,
+                    $colmin,
+                    $colmax
+                );
+            }
+        }
+    }
+
+    /**
+     * Writes all the DEFINEDNAME records (BIFF8).
+     * So far this is only used for repeating rows/columns (print titles) and print areas
+     */
+    private function writeAllDefinedNamesBiff8()
+    {
+        $chunk = '';
+
+        // Named ranges
+        if (count($this->phpExcel->getNamedRanges()) > 0) {
+            // Loop named ranges
+            $namedRanges = $this->phpExcel->getNamedRanges();
+            foreach ($namedRanges as $namedRange) {
+                // Create absolute coordinate
+                $range = PHPExcel_Cell::splitRange($namedRange->getRange());
+                for ($i = 0; $i < count($range); $i++) {
+                    $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
+                    if (isset($range[$i][1])) {
+                        $range[$i][1] = PHPExcel_Cell::absoluteCoordinate($range[$i][1]);
+                    }
+                }
+                $range = PHPExcel_Cell::buildRange($range); // e.g. Sheet1!$A$1:$B$2
+
+                // parse formula
+                try {
+                    $error = $this->parser->parse($range);
+                    $formulaData = $this->parser->toReversePolish();
+
+                    // make sure tRef3d is of type tRef3dR (0x3A)
+                    if (isset($formulaData[0]) and ($formulaData[0] == "\x7A" or $formulaData[0] == "\x5A")) {
+                        $formulaData = "\x3A" . substr($formulaData, 1);
+                    }
+
+                    if ($namedRange->getLocalOnly()) {
+                        // local scope
+                        $scope = $this->phpExcel->getIndex($namedRange->getScope()) + 1;
+                    } else {
+                        // global scope
+                        $scope = 0;
+                    }
+                    $chunk .= $this->writeData($this->writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
+
+                } catch (PHPExcel_Exception $e) {
+                    // do nothing
+                }
+            }
+        }
+
+        // total number of sheets
+        $total_worksheets = $this->phpExcel->getSheetCount();
+
+        // write the print titles (repeating rows, columns), if any
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetSetup = $this->phpExcel->getSheet($i)->getPageSetup();
+            // simultaneous repeatColumns repeatRows
+            if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
+                $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
+                $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
+                $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+
+                $repeat = $sheetSetup->getRowsToRepeatAtTop();
+                $rowmin = $repeat[0] - 1;
+                $rowmax = $repeat[1] - 1;
+
+                // construct formula data manually
+                $formulaData = pack('Cv', 0x29, 0x17); // tMemFunc
+                $formulaData .= pack('Cvvvvv', 0x3B, $i, 0, 65535, $colmin, $colmax); // tArea3d
+                $formulaData .= pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, 0, 255); // tArea3d
+                $formulaData .= pack('C', 0x10); // tList
+
+                // store the DEFINEDNAME record
+                $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
+
+            // (exclusive) either repeatColumns or repeatRows
+            } elseif ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
+                // Columns to repeat
+                if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
+                    $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
+                    $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
+                    $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+                } else {
+                    $colmin = 0;
+                    $colmax = 255;
+                }
+                // Rows to repeat
+                if ($sheetSetup->isRowsToRepeatAtTopSet()) {
+                    $repeat = $sheetSetup->getRowsToRepeatAtTop();
+                    $rowmin = $repeat[0] - 1;
+                    $rowmax = $repeat[1] - 1;
+                } else {
+                    $rowmin = 0;
+                    $rowmax = 65535;
+                }
+
+                // construct formula data manually because parser does not recognize absolute 3d cell references
+                $formulaData = pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, $colmin, $colmax);
+
+                // store the DEFINEDNAME record
+                $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
+            }
+        }
+
+        // write the print areas, if any
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetSetup = $this->phpExcel->getSheet($i)->getPageSetup();
+            if ($sheetSetup->isPrintAreaSet()) {
+                // Print area, e.g. A3:J6,H1:X20
+                $printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
+                $countPrintArea = count($printArea);
+
+                $formulaData = '';
+                for ($j = 0; $j < $countPrintArea; ++$j) {
+                    $printAreaRect = $printArea[$j]; // e.g. A3:J6
+                    $printAreaRect[0] = PHPExcel_Cell::coordinateFromString($printAreaRect[0]);
+                    $printAreaRect[1] = PHPExcel_Cell::coordinateFromString($printAreaRect[1]);
+
+                    $print_rowmin = $printAreaRect[0][1] - 1;
+                    $print_rowmax = $printAreaRect[1][1] - 1;
+                    $print_colmin = PHPExcel_Cell::columnIndexFromString($printAreaRect[0][0]) - 1;
+                    $print_colmax = PHPExcel_Cell::columnIndexFromString($printAreaRect[1][0]) - 1;
+
+                    // construct formula data manually because parser does not recognize absolute 3d cell references
+                    $formulaData .= pack('Cvvvvv', 0x3B, $i, $print_rowmin, $print_rowmax, $print_colmin, $print_colmax);
+
+                    if ($j > 0) {
+                        $formulaData .= pack('C', 0x10); // list operator token ','
+                    }
+                }
+
+                // store the DEFINEDNAME record
+                $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x06), $formulaData, $i + 1, true));
+            }
+        }
+
+        // write autofilters, if any
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetAutoFilter = $this->phpExcel->getSheet($i)->getAutoFilter();
+            $autoFilterRange = $sheetAutoFilter->getRange();
+            if (!empty($autoFilterRange)) {
+                $rangeBounds = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
+
+                //Autofilter built in name
+                $name = pack('C', 0x0D);
+
+                $chunk .= $this->writeData($this->writeShortNameBiff8($name, $i + 1, $rangeBounds, true));
+            }
+        }
+
+        return $chunk;
+    }
+
+    /**
+     * Write a DEFINEDNAME record for BIFF8 using explicit binary formula data
+     *
+     * @param    string        $name            The name in UTF-8
+     * @param    string        $formulaData    The binary formula data
+     * @param    string        $sheetIndex        1-based sheet index the defined name applies to. 0 = global
+     * @param    boolean        $isBuiltIn        Built-in name?
+     * @return    string    Complete binary record data
+     */
+    private function writeDefinedNameBiff8($name, $formulaData, $sheetIndex = 0, $isBuiltIn = false)
+    {
+        $record = 0x0018;
+
+        // option flags
+        $options = $isBuiltIn ? 0x20 : 0x00;
+
+        // length of the name, character count
+        $nlen = PHPExcel_Shared_String::CountCharacters($name);
+
+        // name with stripped length field
+        $name = substr(PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($name), 2);
+
+        // size of the formula (in bytes)
+        $sz = strlen($formulaData);
+
+        // combine the parts
+        $data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
+            . $name . $formulaData;
+        $length = strlen($data);
+
+        $header = pack('vv', $record, $length);
+
+        return $header . $data;
+    }
+
+    /**
+     * Write a short NAME record
+     *
+     * @param    string         $name
+     * @param    string         $sheetIndex        1-based sheet index the defined name applies to. 0 = global
+     * @param    integer[][]  $rangeBounds    range boundaries
+     * @param    boolean      $isHidden
+     * @return    string    Complete binary record data
+     * */
+    private function writeShortNameBiff8($name, $sheetIndex = 0, $rangeBounds, $isHidden = false)
+    {
+        $record = 0x0018;
+
+        // option flags
+        $options = ($isHidden  ? 0x21 : 0x00);
+
+        $extra  = pack(
+            'Cvvvvv',
+            0x3B,
+            $sheetIndex - 1,
+            $rangeBounds[0][1] - 1,
+            $rangeBounds[1][1] - 1,
+            $rangeBounds[0][0] - 1,
+            $rangeBounds[1][0] - 1
+        );
+
+        // size of the formula (in bytes)
+        $sz = strlen($extra);
+
+        // combine the parts
+        $data = pack('vCCvvvCCCCC', $options, 0, 1, $sz, 0, $sheetIndex, 0, 0, 0, 0, 0)
+            . $name . $extra;
+        $length = strlen($data);
+
+        $header = pack('vv', $record, $length);
+
+        return $header . $data;
+    }
+
+    /**
+     * Stores the CODEPAGE biff record.
+     */
+    private function writeCodepage()
+    {
+        $record = 0x0042;             // Record identifier
+        $length = 0x0002;             // Number of bytes to follow
+        $cv  = $this->codepage;   // The code page
+
+        $header = pack('vv', $record, $length);
+        $data   = pack('v', $cv);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write Excel BIFF WINDOW1 record.
+     */
+    private function writeWindow1()
+    {
+        $record = 0x003D;   // Record identifier
+        $length = 0x0012;   // Number of bytes to follow
+
+        $xWn  = 0x0000;     // Horizontal position of window
+        $yWn  = 0x0000;     // Vertical position of window
+        $dxWn = 0x25BC;     // Width of window
+        $dyWn = 0x1572;     // Height of window
+
+        $grbit = 0x0038;    // Option flags
+
+        // not supported by PHPExcel, so there is only one selected sheet, the active
+        $ctabsel = 1;       // Number of workbook tabs selected
+
+        $wTabRatio = 0x0258;    // Tab to scrollbar ratio
+
+        // not supported by PHPExcel, set to 0
+        $itabFirst = 0;     // 1st displayed worksheet
+        $itabCur   = $this->phpExcel->getActiveSheetIndex();    // Active worksheet
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn, $grbit, $itabCur, $itabFirst, $ctabsel, $wTabRatio);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes Excel BIFF BOUNDSHEET record.
+     *
+     * @param PHPExcel_Worksheet  $sheet Worksheet name
+     * @param integer $offset    Location of worksheet BOF
+     */
+    private function writeBoundSheet($sheet, $offset)
+    {
+        $sheetname = $sheet->getTitle();
+        $record    = 0x0085;                    // Record identifier
+
+        // sheet state
+        switch ($sheet->getSheetState()) {
+            case PHPExcel_Worksheet::SHEETSTATE_VISIBLE:
+                $ss = 0x00;
+                break;
+            case PHPExcel_Worksheet::SHEETSTATE_HIDDEN:
+                $ss = 0x01;
+                break;
+            case PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN:
+                $ss = 0x02;
+                break;
+            default:
+                $ss = 0x00;
+                break;
+        }
+
+        // sheet type
+        $st = 0x00;
+
+        $grbit = 0x0000;                    // Visibility and sheet type
+
+        $data = pack("VCC", $offset, $ss, $st);
+        $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
+
+        $length = strlen($data);
+        $header = pack("vv", $record, $length);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write Internal SUPBOOK record
+     */
+    private function writeSupbookInternal()
+    {
+        $record    = 0x01AE;   // Record identifier
+        $length    = 0x0004;   // Bytes to follow
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("vv", $this->phpExcel->getSheetCount(), 0x0401);
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Writes the Excel BIFF EXTERNSHEET record. These references are used by
+     * formulas.
+     *
+     */
+    private function writeExternalsheetBiff8()
+    {
+        $totalReferences = count($this->parser->references);
+        $record = 0x0017;                     // Record identifier
+        $length = 2 + 6 * $totalReferences;  // Number of bytes to follow
+
+        $supbook_index = 0;           // FIXME: only using internal SUPBOOK record
+        $header = pack("vv", $record, $length);
+        $data   = pack('v', $totalReferences);
+        for ($i = 0; $i < $totalReferences; ++$i) {
+            $data .= $this->parser->references[$i];
+        }
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Write Excel BIFF STYLE records.
+     */
+    private function writeStyle()
+    {
+        $record = 0x0293;   // Record identifier
+        $length = 0x0004;   // Bytes to follow
+
+        $ixfe    = 0x8000;  // Index to cell style XF
+        $BuiltIn = 0x00;     // Built-in style
+        $iLevel  = 0xff;     // Outline style level
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("vCC", $ixfe, $BuiltIn, $iLevel);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes Excel FORMAT record for non "built-in" numerical formats.
+     *
+     * @param string  $format Custom format string
+     * @param integer $ifmt   Format index code
+     */
+    private function writeNumberFormat($format, $ifmt)
+    {
+        $record = 0x041E;    // Record identifier
+
+        $numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
+        $length = 2 + strlen($numberFormatString);    // Number of bytes to follow
+
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("v", $ifmt) .  $numberFormatString;
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write DATEMODE record to indicate the date system in use (1904 or 1900).
+     */
+    private function writeDateMode()
+    {
+        $record = 0x0022;   // Record identifier
+        $length = 0x0002;   // Bytes to follow
+
+        $f1904  = (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904)
+            ? 1
+            : 0;   // Flag for 1904 date system
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("v", $f1904);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
+     * references in the workbook.
+     *
+     * Excel only stores references to external sheets that are used in NAME.
+     * The workbook NAME record is required to define the print area and the repeat
+     * rows and columns.
+     *
+     * A similar method is used in Worksheet.php for a slightly different purpose.
+     *
+     * @param integer $cxals Number of external references
+     */
+    private function writeExternalCount($cxals)
+    {
+        $record = 0x0016;   // Record identifier
+        $length = 0x0002;   // Number of bytes to follow
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("v", $cxals);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes the Excel BIFF EXTERNSHEET record. These references are used by
+     * formulas. NAME record is required to define the print area and the repeat
+     * rows and columns.
+     *
+     * A similar method is used in Worksheet.php for a slightly different purpose.
+     *
+     * @param string $sheetname Worksheet name
+     */
+    private function writeExternalSheet($sheetname)
+    {
+        $record = 0x0017;                     // Record identifier
+        $length = 0x02 + strlen($sheetname);  // Number of bytes to follow
+
+        $cch    = strlen($sheetname);         // Length of sheet name
+        $rgch   = 0x03;                       // Filename encoding
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("CC", $cch, $rgch);
+        $this->append($header . $data . $sheetname);
+    }
+
+    /**
+     * Store the NAME record in the short format that is used for storing the print
+     * area, repeat rows only and repeat columns only.
+     *
+     * @param integer $index  Sheet index
+     * @param integer $type   Built-in name type
+     * @param integer $rowmin Start row
+     * @param integer $rowmax End row
+     * @param integer $colmin Start colum
+     * @param integer $colmax End column
+     */
+    private function writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
+    {
+        $record = 0x0018;       // Record identifier
+        $length = 0x0024;       // Number of bytes to follow
+
+        $grbit  = 0x0020;       // Option flags
+        $chKey  = 0x00;         // Keyboard shortcut
+        $cch    = 0x01;         // Length of text name
+        $cce    = 0x0015;       // Length of text definition
+        $ixals  = $index + 1;   // Sheet index
+        $itab   = $ixals;       // Equal to ixals
+        $cchCustMenu    = 0x00;         // Length of cust menu text
+        $cchDescription = 0x00;         // Length of description text
+        $cchHelptopic   = 0x00;         // Length of help topic text
+        $cchStatustext  = 0x00;         // Length of status bar text
+        $rgch           = $type;        // Built-in name type
+
+        $unknown03 = 0x3b;
+        $unknown04 = 0xffff - $index;
+        $unknown05 = 0x0000;
+        $unknown06 = 0x0000;
+        $unknown07 = 0x1087;
+        $unknown08 = 0x8005;
+
+        $header = pack("vv", $record, $length);
+        $data = pack("v", $grbit);
+        $data .= pack("C", $chKey);
+        $data .= pack("C", $cch);
+        $data .= pack("v", $cce);
+        $data .= pack("v", $ixals);
+        $data .= pack("v", $itab);
+        $data .= pack("C", $cchCustMenu);
+        $data .= pack("C", $cchDescription);
+        $data .= pack("C", $cchHelptopic);
+        $data .= pack("C", $cchStatustext);
+        $data .= pack("C", $rgch);
+        $data .= pack("C", $unknown03);
+        $data .= pack("v", $unknown04);
+        $data .= pack("v", $unknown05);
+        $data .= pack("v", $unknown06);
+        $data .= pack("v", $unknown07);
+        $data .= pack("v", $unknown08);
+        $data .= pack("v", $index);
+        $data .= pack("v", $index);
+        $data .= pack("v", $rowmin);
+        $data .= pack("v", $rowmax);
+        $data .= pack("C", $colmin);
+        $data .= pack("C", $colmax);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the NAME record in the long format that is used for storing the repeat
+     * rows and columns when both are specified. This shares a lot of code with
+     * writeNameShort() but we use a separate method to keep the code clean.
+     * Code abstraction for reuse can be carried too far, and I should know. ;-)
+     *
+     * @param integer $index Sheet index
+     * @param integer $type  Built-in name type
+     * @param integer $rowmin Start row
+     * @param integer $rowmax End row
+     * @param integer $colmin Start colum
+     * @param integer $colmax End column
+     */
+    private function writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
+    {
+        $record          = 0x0018;       // Record identifier
+        $length          = 0x003d;       // Number of bytes to follow
+        $grbit           = 0x0020;       // Option flags
+        $chKey           = 0x00;         // Keyboard shortcut
+        $cch             = 0x01;         // Length of text name
+        $cce             = 0x002e;       // Length of text definition
+        $ixals           = $index + 1;   // Sheet index
+        $itab            = $ixals;       // Equal to ixals
+        $cchCustMenu     = 0x00;         // Length of cust menu text
+        $cchDescription  = 0x00;         // Length of description text
+        $cchHelptopic    = 0x00;         // Length of help topic text
+        $cchStatustext   = 0x00;         // Length of status bar text
+        $rgch            = $type;        // Built-in name type
+
+        $unknown01       = 0x29;
+        $unknown02       = 0x002b;
+        $unknown03       = 0x3b;
+        $unknown04       = 0xffff-$index;
+        $unknown05       = 0x0000;
+        $unknown06       = 0x0000;
+        $unknown07       = 0x1087;
+        $unknown08       = 0x8008;
+
+        $header = pack("vv", $record, $length);
+        $data = pack("v", $grbit);
+        $data .= pack("C", $chKey);
+        $data .= pack("C", $cch);
+        $data .= pack("v", $cce);
+        $data .= pack("v", $ixals);
+        $data .= pack("v", $itab);
+        $data .= pack("C", $cchCustMenu);
+        $data .= pack("C", $cchDescription);
+        $data .= pack("C", $cchHelptopic);
+        $data .= pack("C", $cchStatustext);
+        $data .= pack("C", $rgch);
+        $data .= pack("C", $unknown01);
+        $data .= pack("v", $unknown02);
+        // Column definition
+        $data .= pack("C", $unknown03);
+        $data .= pack("v", $unknown04);
+        $data .= pack("v", $unknown05);
+        $data .= pack("v", $unknown06);
+        $data .= pack("v", $unknown07);
+        $data .= pack("v", $unknown08);
+        $data .= pack("v", $index);
+        $data .= pack("v", $index);
+        $data .= pack("v", 0x0000);
+        $data .= pack("v", 0x3fff);
+        $data .= pack("C", $colmin);
+        $data .= pack("C", $colmax);
+        // Row definition
+        $data .= pack("C", $unknown03);
+        $data .= pack("v", $unknown04);
+        $data .= pack("v", $unknown05);
+        $data .= pack("v", $unknown06);
+        $data .= pack("v", $unknown07);
+        $data .= pack("v", $unknown08);
+        $data .= pack("v", $index);
+        $data .= pack("v", $index);
+        $data .= pack("v", $rowmin);
+        $data .= pack("v", $rowmax);
+        $data .= pack("C", 0x00);
+        $data .= pack("C", 0xff);
+        // End of data
+        $data .= pack("C", 0x10);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Stores the COUNTRY record for localization
+     *
+     * @return string
+     */
+    private function writeCountry()
+    {
+        $record = 0x008C;    // Record identifier
+        $length = 4;         // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        /* using the same country code always for simplicity */
+        $data = pack('vv', $this->countryCode, $this->countryCode);
+        //$this->append($header . $data);
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Write the RECALCID record
+     *
+     * @return string
+     */
+    private function writeRecalcId()
+    {
+        $record = 0x01C1;    // Record identifier
+        $length = 8;         // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+
+        // by inspection of real Excel files, MS Office Excel 2007 writes this
+        $data = pack('VV', 0x000001C1, 0x00001E667);
+
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Stores the PALETTE biff record.
+     */
+    private function writePalette()
+    {
+        $aref = $this->palette;
+
+        $record = 0x0092;                // Record identifier
+        $length = 2 + 4 * count($aref);  // Number of bytes to follow
+        $ccv    = count($aref);          // Number of RGB values to follow
+        $data = '';                      // The RGB data
+
+        // Pack the RGB data
+        foreach ($aref as $color) {
+            foreach ($color as $byte) {
+                $data .= pack("C", $byte);
+            }
+        }
+
+        $header = pack("vvv", $record, $length, $ccv);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Handling of the SST continue blocks is complicated by the need to include an
+     * additional continuation byte depending on whether the string is split between
+     * blocks or whether it starts at the beginning of the block. (There are also
+     * additional complications that will arise later when/if Rich Strings are
+     * supported).
+     *
+     * The Excel documentation says that the SST record should be followed by an
+     * EXTSST record. The EXTSST record is a hash table that is used to optimise
+     * access to SST. However, despite the documentation it doesn't seem to be
+     * required so we will ignore it.
+     *
+     * @return string Binary data
+     */
+    private function writeSharedStringsTable()
+    {
+        // maximum size of record data (excluding record header)
+        $continue_limit = 8224;
+
+        // initialize array of record data blocks
+        $recordDatas = array();
+
+        // start SST record data block with total number of strings, total number of unique strings
+        $recordData = pack("VV", $this->stringTotal, $this->stringUnique);
+
+        // loop through all (unique) strings in shared strings table
+        foreach (array_keys($this->stringTable) as $string) {
+            // here $string is a BIFF8 encoded string
+
+            // length = character count
+            $headerinfo = unpack("vlength/Cencoding", $string);
+
+            // currently, this is always 1 = uncompressed
+            $encoding = $headerinfo["encoding"];
+
+            // initialize finished writing current $string
+            $finished = false;
+
+            while ($finished === false) {
+                // normally, there will be only one cycle, but if string cannot immediately be written as is
+                // there will be need for more than one cylcle, if string longer than one record data block, there
+                // may be need for even more cycles
+
+                if (strlen($recordData) + strlen($string) <= $continue_limit) {
+                    // then we can write the string (or remainder of string) without any problems
+                    $recordData .= $string;
+
+                    if (strlen($recordData) + strlen($string) == $continue_limit) {
+                        // we close the record data block, and initialize a new one
+                        $recordDatas[] = $recordData;
+                        $recordData = '';
+                    }
+
+                    // we are finished writing this string
+                    $finished = true;
+                } else {
+                    // special treatment writing the string (or remainder of the string)
+                    // If the string is very long it may need to be written in more than one CONTINUE record.
+
+                    // check how many bytes more there is room for in the current record
+                    $space_remaining = $continue_limit - strlen($recordData);
+
+                    // minimum space needed
+                    // uncompressed: 2 byte string length length field + 1 byte option flags + 2 byte character
+                    // compressed:   2 byte string length length field + 1 byte option flags + 1 byte character
+                    $min_space_needed = ($encoding == 1) ? 5 : 4;
+
+                    // We have two cases
+                    // 1. space remaining is less than minimum space needed
+                    //        here we must waste the space remaining and move to next record data block
+                    // 2. space remaining is greater than or equal to minimum space needed
+                    //        here we write as much as we can in the current block, then move to next record data block
+
+                    // 1. space remaining is less than minimum space needed
+                    if ($space_remaining < $min_space_needed) {
+                        // we close the block, store the block data
+                        $recordDatas[] = $recordData;
+
+                        // and start new record data block where we start writing the string
+                        $recordData = '';
+
+                    // 2. space remaining is greater than or equal to minimum space needed
+                    } else {
+                        // initialize effective remaining space, for Unicode strings this may need to be reduced by 1, see below
+                        $effective_space_remaining = $space_remaining;
+
+                        // for uncompressed strings, sometimes effective space remaining is reduced by 1
+                        if ($encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1) {
+                            --$effective_space_remaining;
+                        }
+
+                        // one block fininshed, store the block data
+                        $recordData .= substr($string, 0, $effective_space_remaining);
+
+                        $string = substr($string, $effective_space_remaining); // for next cycle in while loop
+                        $recordDatas[] = $recordData;
+
+                        // start new record data block with the repeated option flags
+                        $recordData = pack('C', $encoding);
+                    }
+                }
+            }
+        }
+
+        // Store the last record data block unless it is empty
+        // if there was no need for any continue records, this will be the for SST record data block itself
+        if (strlen($recordData) > 0) {
+            $recordDatas[] = $recordData;
+        }
+
+        // combine into one chunk with all the blocks SST, CONTINUE,...
+        $chunk = '';
+        foreach ($recordDatas as $i => $recordData) {
+            // first block should have the SST record header, remaing should have CONTINUE header
+            $record = ($i == 0) ? 0x00FC : 0x003C;
+
+            $header = pack("vv", $record, strlen($recordData));
+            $data = $header . $recordData;
+
+            $chunk .= $this->writeData($data);
+        }
+
+        return $chunk;
+    }
+
+    /**
+     * Writes the MSODRAWINGGROUP record if needed. Possibly split using CONTINUE records.
+     */
+    private function writeMsoDrawingGroup()
+    {
+        // write the Escher stream if necessary
+        if (isset($this->escher)) {
+            $writer = new PHPExcel_Writer_Excel5_Escher($this->escher);
+            $data = $writer->close();
+
+            $record = 0x00EB;
+            $length = strlen($data);
+            $header = pack("vv", $record, $length);
+
+            return $this->writeData($header . $data);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Get Escher object
+     *
+     * @return PHPExcel_Shared_Escher
+     */
+    public function getEscher()
+    {
+        return $this->escher;
+    }
+
+    /**
+     * Set Escher object
+     *
+     * @param PHPExcel_Shared_Escher $pValue
+     */
+    public function setEscher(PHPExcel_Shared_Escher $pValue = null)
+    {
+        $this->escher = $pValue;
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/Worksheet.php b/lib/PHPExcel/Writer/Excel5/Worksheet.php
new file mode 100644
index 000000000..5ff0806bc
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/Worksheet.php
@@ -0,0 +1,4240 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5_Worksheet
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// /*
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
+{
+    /**
+     * Formula parser
+     *
+     * @var PHPExcel_Writer_Excel5_Parser
+     */
+    private $parser;
+
+    /**
+     * Maximum number of characters for a string (LABEL record in BIFF5)
+     * @var integer
+     */
+    private $xlsStringMaxLength;
+
+    /**
+     * Array containing format information for columns
+     * @var array
+     */
+    private $columnInfo;
+
+    /**
+     * Array containing the selected area for the worksheet
+     * @var array
+     */
+    private $selection;
+
+    /**
+     * The active pane for the worksheet
+     * @var integer
+     */
+    private $activePane;
+
+    /**
+     * Whether to use outline.
+     * @var integer
+     */
+    private $outlineOn;
+
+    /**
+     * Auto outline styles.
+     * @var bool
+     */
+    private $outlineStyle;
+
+    /**
+     * Whether to have outline summary below.
+     * @var bool
+     */
+    private $outlineBelow;
+
+    /**
+     * Whether to have outline summary at the right.
+     * @var bool
+     */
+    private $outlineRight;
+
+    /**
+     * Reference to the total number of strings in the workbook
+     * @var integer
+     */
+    private $stringTotal;
+
+    /**
+     * Reference to the number of unique strings in the workbook
+     * @var integer
+     */
+    private $stringUnique;
+
+    /**
+     * Reference to the array containing all the unique strings in the workbook
+     * @var array
+     */
+    private $stringTable;
+
+    /**
+     * Color cache
+     */
+    private $colors;
+
+    /**
+     * Index of first used row (at least 0)
+     * @var int
+     */
+    private $firstRowIndex;
+
+    /**
+     * Index of last used row. (no used rows means -1)
+     * @var int
+     */
+    private $lastRowIndex;
+
+    /**
+     * Index of first used column (at least 0)
+     * @var int
+     */
+    private $firstColumnIndex;
+
+    /**
+     * Index of last used column (no used columns means -1)
+     * @var int
+     */
+    private $lastColumnIndex;
+
+    /**
+     * Sheet object
+     * @var PHPExcel_Worksheet
+     */
+    public $phpSheet;
+
+    /**
+     * Count cell style Xfs
+     *
+     * @var int
+     */
+    private $countCellStyleXfs;
+
+    /**
+     * Escher object corresponding to MSODRAWING
+     *
+     * @var PHPExcel_Shared_Escher
+     */
+    private $escher;
+
+    /**
+     * Array of font hashes associated to FONT records index
+     *
+     * @var array
+     */
+    public $fontHashIndex;
+
+    /**
+     * Constructor
+     *
+     * @param int        &$str_total        Total number of strings
+     * @param int        &$str_unique    Total number of unique strings
+     * @param array        &$str_table        String Table
+     * @param array        &$colors        Colour Table
+     * @param mixed        $parser            The formula parser created for the Workbook
+     * @param boolean    $preCalculateFormulas    Flag indicating whether formulas should be calculated or just written
+     * @param string    $phpSheet        The worksheet to write
+     * @param PHPExcel_Worksheet $phpSheet
+     */
+    public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet)
+    {
+        // It needs to call its parent's constructor explicitly
+        parent::__construct();
+
+        // change BIFFwriter limit for CONTINUE records
+//        $this->_limit = 8224;
+
+
+        $this->_preCalculateFormulas = $preCalculateFormulas;
+        $this->stringTotal        = &$str_total;
+        $this->stringUnique        = &$str_unique;
+        $this->stringTable        = &$str_table;
+        $this->colors            = &$colors;
+        $this->parser            = $parser;
+
+        $this->phpSheet = $phpSheet;
+
+        //$this->ext_sheets        = array();
+        //$this->offset            = 0;
+        $this->xlsStringMaxLength = 255;
+        $this->columnInfo  = array();
+        $this->selection   = array(0,0,0,0);
+        $this->activePane  = 3;
+
+        $this->_print_headers = 0;
+
+        $this->outlineStyle  = 0;
+        $this->outlineBelow  = 1;
+        $this->outlineRight  = 1;
+        $this->outlineOn     = 1;
+
+        $this->fontHashIndex = array();
+
+        // calculate values for DIMENSIONS record
+        $minR = 1;
+        $minC = 'A';
+
+        $maxR  = $this->phpSheet->getHighestRow();
+        $maxC = $this->phpSheet->getHighestColumn();
+
+        // Determine lowest and highest column and row
+//        $this->firstRowIndex = ($minR > 65535) ? 65535 : $minR;
+        $this->lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
+
+        $this->firstColumnIndex = PHPExcel_Cell::columnIndexFromString($minC);
+        $this->lastColumnIndex  = PHPExcel_Cell::columnIndexFromString($maxC);
+
+//        if ($this->firstColumnIndex > 255) $this->firstColumnIndex = 255;
+        if ($this->lastColumnIndex > 255) {
+            $this->lastColumnIndex = 255;
+        }
+
+        $this->countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
+    }
+
+    /**
+     * Add data to the beginning of the workbook (note the reverse order)
+     * and to the end of the workbook.
+     *
+     * @access public
+     * @see PHPExcel_Writer_Excel5_Workbook::storeWorkbook()
+     */
+    public function close()
+    {
+        $phpSheet = $this->phpSheet;
+
+        $num_sheets = $phpSheet->getParent()->getSheetCount();
+
+        // Write BOF record
+        $this->storeBof(0x0010);
+
+        // Write PRINTHEADERS
+        $this->writePrintHeaders();
+
+        // Write PRINTGRIDLINES
+        $this->writePrintGridlines();
+
+        // Write GRIDSET
+        $this->writeGridset();
+
+        // Calculate column widths
+        $phpSheet->calculateColumnWidths();
+
+        // Column dimensions
+        if (($defaultWidth = $phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
+            $defaultWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($phpSheet->getParent()->getDefaultStyle()->getFont());
+        }
+
+        $columnDimensions = $phpSheet->getColumnDimensions();
+        $maxCol = $this->lastColumnIndex -1;
+        for ($i = 0; $i <= $maxCol; ++$i) {
+            $hidden = 0;
+            $level = 0;
+            $xfIndex = 15; // there are 15 cell style Xfs
+
+            $width = $defaultWidth;
+
+            $columnLetter = PHPExcel_Cell::stringFromColumnIndex($i);
+            if (isset($columnDimensions[$columnLetter])) {
+                $columnDimension = $columnDimensions[$columnLetter];
+                if ($columnDimension->getWidth() >= 0) {
+                    $width = $columnDimension->getWidth();
+                }
+                $hidden = $columnDimension->getVisible() ? 0 : 1;
+                $level = $columnDimension->getOutlineLevel();
+                $xfIndex = $columnDimension->getXfIndex() + 15; // there are 15 cell style Xfs
+            }
+
+            // Components of columnInfo:
+            // $firstcol first column on the range
+            // $lastcol  last column on the range
+            // $width    width to set
+            // $xfIndex  The optional cell style Xf index to apply to the columns
+            // $hidden   The optional hidden atribute
+            // $level    The optional outline level
+            $this->columnInfo[] = array($i, $i, $width, $xfIndex, $hidden, $level);
+        }
+
+        // Write GUTS
+        $this->writeGuts();
+
+        // Write DEFAULTROWHEIGHT
+        $this->writeDefaultRowHeight();
+        // Write WSBOOL
+        $this->writeWsbool();
+        // Write horizontal and vertical page breaks
+        $this->writeBreaks();
+        // Write page header
+        $this->writeHeader();
+        // Write page footer
+        $this->writeFooter();
+        // Write page horizontal centering
+        $this->writeHcenter();
+        // Write page vertical centering
+        $this->writeVcenter();
+        // Write left margin
+        $this->writeMarginLeft();
+        // Write right margin
+        $this->writeMarginRight();
+        // Write top margin
+        $this->writeMarginTop();
+        // Write bottom margin
+        $this->writeMarginBottom();
+        // Write page setup
+        $this->writeSetup();
+        // Write sheet protection
+        $this->writeProtect();
+        // Write SCENPROTECT
+        $this->writeScenProtect();
+        // Write OBJECTPROTECT
+        $this->writeObjectProtect();
+        // Write sheet password
+        $this->writePassword();
+        // Write DEFCOLWIDTH record
+        $this->writeDefcol();
+
+        // Write the COLINFO records if they exist
+        if (!empty($this->columnInfo)) {
+            $colcount = count($this->columnInfo);
+            for ($i = 0; $i < $colcount; ++$i) {
+                $this->writeColinfo($this->columnInfo[$i]);
+            }
+        }
+        $autoFilterRange = $phpSheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            // Write AUTOFILTERINFO
+            $this->writeAutoFilterInfo();
+        }
+
+        // Write sheet dimensions
+        $this->writeDimensions();
+
+        // Row dimensions
+        foreach ($phpSheet->getRowDimensions() as $rowDimension) {
+            $xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
+            $this->writeRow($rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel());
+        }
+
+        // Write Cells
+        foreach ($phpSheet->getCellCollection() as $cellID) {
+            $cell = $phpSheet->getCell($cellID);
+            $row = $cell->getRow() - 1;
+            $column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
+
+            // Don't break Excel!
+//            if ($row + 1 > 65536 or $column + 1 > 256) {
+            if ($row > 65535 || $column > 255) {
+                break;
+            }
+
+            // Write cell value
+            $xfIndex = $cell->getXfIndex() + 15; // there are 15 cell style Xfs
+
+            $cVal = $cell->getValue();
+            if ($cVal instanceof PHPExcel_RichText) {
+                // $this->writeString($row, $column, $cVal->getPlainText(), $xfIndex);
+                $arrcRun = array();
+                $str_len = PHPExcel_Shared_String::CountCharacters($cVal->getPlainText(), 'UTF-8');
+                $str_pos = 0;
+                $elements = $cVal->getRichTextElements();
+                foreach ($elements as $element) {
+                    // FONT Index
+                    if ($element instanceof PHPExcel_RichText_Run) {
+                        $str_fontidx = $this->fontHashIndex[$element->getFont()->getHashCode()];
+                    } else {
+                        $str_fontidx = 0;
+                    }
+                    $arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);
+                    // Position FROM
+                    $str_pos += PHPExcel_Shared_String::CountCharacters($element->getText(), 'UTF-8');
+                }
+                $this->writeRichTextString($row, $column, $cVal->getPlainText(), $xfIndex, $arrcRun);
+            } else {
+                switch ($cell->getDatatype()) {
+                    case PHPExcel_Cell_DataType::TYPE_STRING:
+                    case PHPExcel_Cell_DataType::TYPE_NULL:
+                        if ($cVal === '' || $cVal === null) {
+                            $this->writeBlank($row, $column, $xfIndex);
+                        } else {
+                            $this->writeString($row, $column, $cVal, $xfIndex);
+                        }
+                        break;
+
+                    case PHPExcel_Cell_DataType::TYPE_NUMERIC:
+                        $this->writeNumber($row, $column, $cVal, $xfIndex);
+                        break;
+
+                    case PHPExcel_Cell_DataType::TYPE_FORMULA:
+                        $calculatedValue = $this->_preCalculateFormulas ?
+                            $cell->getCalculatedValue() : null;
+                        $this->writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue);
+                        break;
+
+                    case PHPExcel_Cell_DataType::TYPE_BOOL:
+                        $this->writeBoolErr($row, $column, $cVal, 0, $xfIndex);
+                        break;
+
+                    case PHPExcel_Cell_DataType::TYPE_ERROR:
+                        $this->writeBoolErr($row, $column, self::mapErrorCode($cVal), 1, $xfIndex);
+                        break;
+
+                }
+            }
+        }
+
+        // Append
+        $this->writeMsoDrawing();
+
+        // Write WINDOW2 record
+        $this->writeWindow2();
+
+        // Write PLV record
+        $this->writePageLayoutView();
+
+        // Write ZOOM record
+        $this->writeZoom();
+        if ($phpSheet->getFreezePane()) {
+            $this->writePanes();
+        }
+
+        // Write SELECTION record
+        $this->writeSelection();
+
+        // Write MergedCellsTable Record
+        $this->writeMergedCells();
+
+        // Hyperlinks
+        foreach ($phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
+            list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinate);
+
+            $url = $hyperlink->getUrl();
+
+            if (strpos($url, 'sheet://') !== false) {
+                // internal to current workbook
+                $url = str_replace('sheet://', 'internal:', $url);
+
+            } elseif (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) {
+                // URL
+                // $url = $url;
+
+            } else {
+                // external (local file)
+                $url = 'external:' . $url;
+            }
+
+            $this->writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
+        }
+
+        $this->writeDataValidity();
+        $this->writeSheetLayout();
+
+        // Write SHEETPROTECTION record
+        $this->writeSheetProtection();
+        $this->writeRangeProtection();
+
+        $arrConditionalStyles = $phpSheet->getConditionalStylesCollection();
+        if (!empty($arrConditionalStyles)) {
+            $arrConditional = array();
+            // @todo CFRule & CFHeader
+            // Write CFHEADER record
+            $this->writeCFHeader();
+            // Write ConditionalFormattingTable records
+            foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
+                foreach ($conditionalStyles as $conditional) {
+                    if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
+                        || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS) {
+                        if (!in_array($conditional->getHashCode(), $arrConditional)) {
+                            $arrConditional[] = $conditional->getHashCode();
+                            // Write CFRULE record
+                            $this->writeCFRule($conditional);
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->storeEof();
+    }
+
+    /**
+     * Write a cell range address in BIFF8
+     * always fixed range
+     * See section 2.5.14 in OpenOffice.org's Documentation of the Microsoft Excel File Format
+     *
+     * @param string $range E.g. 'A1' or 'A1:B6'
+     * @return string Binary data
+     */
+    private function writeBIFF8CellRangeAddressFixed($range = 'A1')
+    {
+        $explodes = explode(':', $range);
+
+        // extract first cell, e.g. 'A1'
+        $firstCell = $explodes[0];
+
+        // extract last cell, e.g. 'B6'
+        if (count($explodes) == 1) {
+            $lastCell = $firstCell;
+        } else {
+            $lastCell = $explodes[1];
+        }
+
+        $firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
+        $lastCellCoordinates  = PHPExcel_Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
+
+        return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, PHPExcel_Cell::columnIndexFromString($firstCellCoordinates[0]) - 1, PHPExcel_Cell::columnIndexFromString($lastCellCoordinates[0]) - 1);
+    }
+
+    /**
+     * Retrieves data from memory in one chunk, or from disk in $buffer
+     * sized chunks.
+     *
+     * @return string The data
+     */
+    public function getData()
+    {
+        $buffer = 4096;
+
+        // Return data stored in memory
+        if (isset($this->_data)) {
+            $tmp   = $this->_data;
+            unset($this->_data);
+            return $tmp;
+        }
+        // No data to return
+        return false;
+    }
+
+    /**
+     * Set the option to print the row and column headers on the printed page.
+     *
+     * @access public
+     * @param integer $print Whether to print the headers or not. Defaults to 1 (print).
+     */
+    public function printRowColHeaders($print = 1)
+    {
+        $this->_print_headers = $print;
+    }
+
+    /**
+     * This method sets the properties for outlining and grouping. The defaults
+     * correspond to Excel's defaults.
+     *
+     * @param bool $visible
+     * @param bool $symbols_below
+     * @param bool $symbols_right
+     * @param bool $auto_style
+     */
+    public function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false)
+    {
+        $this->outlineOn    = $visible;
+        $this->outlineBelow = $symbols_below;
+        $this->outlineRight = $symbols_right;
+        $this->outlineStyle = $auto_style;
+
+        // Ensure this is a boolean vale for Window2
+        if ($this->outlineOn) {
+            $this->outlineOn = 1;
+        }
+    }
+
+    /**
+     * Write a double to the specified row and column (zero indexed).
+     * An integer can be written as a double. Excel will display an
+     * integer. $format is optional.
+     *
+     * Returns  0 : normal termination
+     *         -2 : row or column out of range
+     *
+     * @param integer $row    Zero indexed row
+     * @param integer $col    Zero indexed column
+     * @param float   $num    The number to write
+     * @param mixed   $xfIndex The optional XF format
+     * @return integer
+     */
+    private function writeNumber($row, $col, $num, $xfIndex)
+    {
+        $record    = 0x0203;                 // Record identifier
+        $length    = 0x000E;                 // Number of bytes to follow
+
+        $header        = pack("vv", $record, $length);
+        $data        = pack("vvv", $row, $col, $xfIndex);
+        $xl_double    = pack("d", $num);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $xl_double = strrev($xl_double);
+        }
+
+        $this->append($header.$data.$xl_double);
+        return(0);
+    }
+
+    /**
+     * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
+     *
+     * @param int $row Row index (0-based)
+     * @param int $col Column index (0-based)
+     * @param string $str The string
+     * @param int $xfIndex Index to XF record
+     */
+    private function writeString($row, $col, $str, $xfIndex)
+    {
+        $this->writeLabelSst($row, $col, $str, $xfIndex);
+    }
+
+    /**
+     * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
+     * It differs from writeString by the writing of rich text strings.
+     * @param int $row Row index (0-based)
+     * @param int $col Column index (0-based)
+     * @param string $str The string
+     * @param mixed   $xfIndex The XF format index for the cell
+     * @param array $arrcRun Index to Font record and characters beginning
+     */
+    private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun)
+    {
+        $record    = 0x00FD;                   // Record identifier
+        $length    = 0x000A;                   // Bytes to follow
+        $str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
+
+        /* check if string is already present */
+        if (!isset($this->stringTable[$str])) {
+            $this->stringTable[$str] = $this->stringUnique++;
+        }
+        $this->stringTotal++;
+
+        $header    = pack('vv', $record, $length);
+        $data    = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
+        $this->append($header.$data);
+    }
+
+    /**
+     * Write a string to the specified row and column (zero indexed).
+     * NOTE: there is an Excel 5 defined limit of 255 characters.
+     * $format is optional.
+     * Returns  0 : normal termination
+     *         -2 : row or column out of range
+     *         -3 : long string truncated to 255 chars
+     *
+     * @access public
+     * @param integer $row    Zero indexed row
+     * @param integer $col    Zero indexed column
+     * @param string  $str    The string to write
+     * @param mixed   $xfIndex The XF format index for the cell
+     * @return integer
+     */
+    private function writeLabel($row, $col, $str, $xfIndex)
+    {
+        $strlen    = strlen($str);
+        $record    = 0x0204;                   // Record identifier
+        $length    = 0x0008 + $strlen;         // Bytes to follow
+
+        $str_error = 0;
+
+        if ($strlen > $this->xlsStringMaxLength) { // LABEL must be < 255 chars
+            $str    = substr($str, 0, $this->xlsStringMaxLength);
+            $length    = 0x0008 + $this->xlsStringMaxLength;
+            $strlen    = $this->xlsStringMaxLength;
+            $str_error = -3;
+        }
+
+        $header    = pack("vv", $record, $length);
+        $data    = pack("vvvv", $row, $col, $xfIndex, $strlen);
+        $this->append($header . $data . $str);
+        return($str_error);
+    }
+
+    /**
+     * Write a string to the specified row and column (zero indexed).
+     * This is the BIFF8 version (no 255 chars limit).
+     * $format is optional.
+     * Returns  0 : normal termination
+     *         -2 : row or column out of range
+     *         -3 : long string truncated to 255 chars
+     *
+     * @access public
+     * @param integer $row    Zero indexed row
+     * @param integer $col    Zero indexed column
+     * @param string  $str    The string to write
+     * @param mixed   $xfIndex The XF format index for the cell
+     * @return integer
+     */
+    private function writeLabelSst($row, $col, $str, $xfIndex)
+    {
+        $record    = 0x00FD;                   // Record identifier
+        $length    = 0x000A;                   // Bytes to follow
+
+        $str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($str);
+
+        /* check if string is already present */
+        if (!isset($this->stringTable[$str])) {
+            $this->stringTable[$str] = $this->stringUnique++;
+        }
+        $this->stringTotal++;
+
+        $header    = pack('vv', $record, $length);
+        $data    = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
+        $this->append($header.$data);
+    }
+
+    /**
+     * Writes a note associated with the cell given by the row and column.
+     * NOTE records don't have a length limit.
+     *
+     * @param integer $row    Zero indexed row
+     * @param integer $col    Zero indexed column
+     * @param string  $note   The note to write
+     */
+    private function writeNote($row, $col, $note)
+    {
+        $note_length    = strlen($note);
+        $record            = 0x001C;            // Record identifier
+        $max_length        = 2048;                // Maximun length for a NOTE record
+
+        // Length for this record is no more than 2048 + 6
+        $length    = 0x0006 + min($note_length, 2048);
+        $header    = pack("vv", $record, $length);
+        $data    = pack("vvv", $row, $col, $note_length);
+        $this->append($header . $data . substr($note, 0, 2048));
+
+        for ($i = $max_length; $i < $note_length; $i += $max_length) {
+            $chunk  = substr($note, $i, $max_length);
+            $length = 0x0006 + strlen($chunk);
+            $header = pack("vv", $record, $length);
+            $data   = pack("vvv", -1, 0, strlen($chunk));
+            $this->append($header.$data.$chunk);
+        }
+        return(0);
+    }
+
+    /**
+     * Write a blank cell to the specified row and column (zero indexed).
+     * A blank cell is used to specify formatting without adding a string
+     * or a number.
+     *
+     * A blank cell without a format serves no purpose. Therefore, we don't write
+     * a BLANK record unless a format is specified.
+     *
+     * Returns  0 : normal termination (including no format)
+     *         -1 : insufficient number of arguments
+     *         -2 : row or column out of range
+     *
+     * @param integer $row    Zero indexed row
+     * @param integer $col    Zero indexed column
+     * @param mixed   $xfIndex The XF format index
+     */
+    public function writeBlank($row, $col, $xfIndex)
+    {
+        $record    = 0x0201;                 // Record identifier
+        $length    = 0x0006;                 // Number of bytes to follow
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("vvv", $row, $col, $xfIndex);
+        $this->append($header . $data);
+        return 0;
+    }
+
+    /**
+     * Write a boolean or an error type to the specified row and column (zero indexed)
+     *
+     * @param int $row Row index (0-based)
+     * @param int $col Column index (0-based)
+     * @param int $value
+     * @param boolean $isError Error or Boolean?
+     * @param int $xfIndex
+     */
+    private function writeBoolErr($row, $col, $value, $isError, $xfIndex)
+    {
+        $record = 0x0205;
+        $length = 8;
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("vvvCC", $row, $col, $xfIndex, $value, $isError);
+        $this->append($header . $data);
+        return 0;
+    }
+
+    /**
+     * Write a formula to the specified row and column (zero indexed).
+     * The textual representation of the formula is passed to the parser in
+     * Parser.php which returns a packed binary string.
+     *
+     * Returns  0 : normal termination
+     *         -1 : formula errors (bad formula)
+     *         -2 : row or column out of range
+     *
+     * @param integer $row     Zero indexed row
+     * @param integer $col     Zero indexed column
+     * @param string  $formula The formula text string
+     * @param mixed   $xfIndex  The XF format index
+     * @param mixed   $calculatedValue  Calculated value
+     * @return integer
+     */
+    private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
+    {
+        $record    = 0x0006;     // Record identifier
+
+        // Initialize possible additional value for STRING record that should be written after the FORMULA record?
+        $stringValue = null;
+
+        // calculated value
+        if (isset($calculatedValue)) {
+            // Since we can't yet get the data type of the calculated value,
+            // we use best effort to determine data type
+            if (is_bool($calculatedValue)) {
+                // Boolean value
+                $num = pack('CCCvCv', 0x01, 0x00, (int)$calculatedValue, 0x00, 0x00, 0xFFFF);
+            } elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
+                // Numeric value
+                $num = pack('d', $calculatedValue);
+            } elseif (is_string($calculatedValue)) {
+                if (array_key_exists($calculatedValue, PHPExcel_Cell_DataType::getErrorCodes())) {
+                    // Error value
+                    $num = pack('CCCvCv', 0x02, 0x00, self::mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
+                } elseif ($calculatedValue === '') {
+                    // Empty string (and BIFF8)
+                    $num = pack('CCCvCv', 0x03, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
+                } else {
+                    // Non-empty string value (or empty string BIFF5)
+                    $stringValue = $calculatedValue;
+                    $num = pack('CCCvCv', 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
+                }
+            } else {
+                // We are really not supposed to reach here
+                $num = pack('d', 0x00);
+            }
+        } else {
+            $num = pack('d', 0x00);
+        }
+
+        $grbit        = 0x03;                // Option flags
+        $unknown    = 0x0000;            // Must be zero
+
+        // Strip the '=' or '@' sign at the beginning of the formula string
+        if ($formula[0] == '=') {
+            $formula = substr($formula, 1);
+        } else {
+            // Error handling
+            $this->writeString($row, $col, 'Unrecognised character for formula');
+            return -1;
+        }
+
+        // Parse the formula using the parser in Parser.php
+        try {
+            $error = $this->parser->parse($formula);
+            $formula = $this->parser->toReversePolish();
+
+            $formlen    = strlen($formula);    // Length of the binary string
+            $length     = 0x16 + $formlen;     // Length of the record data
+
+            $header    = pack("vv", $record, $length);
+
+            $data      = pack("vvv", $row, $col, $xfIndex)
+                        . $num
+                        . pack("vVv", $grbit, $unknown, $formlen);
+            $this->append($header . $data . $formula);
+
+            // Append also a STRING record if necessary
+            if ($stringValue !== null) {
+                $this->writeStringRecord($stringValue);
+            }
+
+            return 0;
+
+        } catch (PHPExcel_Exception $e) {
+            // do nothing
+        }
+
+    }
+
+    /**
+     * Write a STRING record. This
+     *
+     * @param string $stringValue
+     */
+    private function writeStringRecord($stringValue)
+    {
+        $record = 0x0207;     // Record identifier
+        $data = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($stringValue);
+
+        $length = strlen($data);
+        $header = pack('vv', $record, $length);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write a hyperlink.
+     * This is comprised of two elements: the visible label and
+     * the invisible link. The visible label is the same as the link unless an
+     * alternative string is specified. The label is written using the
+     * writeString() method. Therefore the 255 characters string limit applies.
+     * $string and $format are optional.
+     *
+     * The hyperlink can be to a http, ftp, mail, internal sheet (not yet), or external
+     * directory url.
+     *
+     * Returns  0 : normal termination
+     *         -2 : row or column out of range
+     *         -3 : long string truncated to 255 chars
+     *
+     * @param integer $row    Row
+     * @param integer $col    Column
+     * @param string  $url    URL string
+     * @return integer
+     */
+    private function writeUrl($row, $col, $url)
+    {
+        // Add start row and col to arg list
+        return($this->writeUrlRange($row, $col, $row, $col, $url));
+    }
+
+    /**
+     * This is the more general form of writeUrl(). It allows a hyperlink to be
+     * written to a range of cells. This function also decides the type of hyperlink
+     * to be written. These are either, Web (http, ftp, mailto), Internal
+     * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
+     *
+     * @access private
+     * @see writeUrl()
+     * @param integer $row1   Start row
+     * @param integer $col1   Start column
+     * @param integer $row2   End row
+     * @param integer $col2   End column
+     * @param string  $url    URL string
+     * @return integer
+     */
+    public function writeUrlRange($row1, $col1, $row2, $col2, $url)
+    {
+        // Check for internal/external sheet links or default to web link
+        if (preg_match('[^internal:]', $url)) {
+            return($this->writeUrlInternal($row1, $col1, $row2, $col2, $url));
+        }
+        if (preg_match('[^external:]', $url)) {
+            return($this->writeUrlExternal($row1, $col1, $row2, $col2, $url));
+        }
+        return($this->writeUrlWeb($row1, $col1, $row2, $col2, $url));
+    }
+
+    /**
+     * Used to write http, ftp and mailto hyperlinks.
+     * The link type ($options) is 0x03 is the same as absolute dir ref without
+     * sheet. However it is differentiated by the $unknown2 data stream.
+     *
+     * @access private
+     * @see writeUrl()
+     * @param integer $row1   Start row
+     * @param integer $col1   Start column
+     * @param integer $row2   End row
+     * @param integer $col2   End column
+     * @param string  $url    URL string
+     * @return integer
+     */
+    public function writeUrlWeb($row1, $col1, $row2, $col2, $url)
+    {
+        $record      = 0x01B8;                       // Record identifier
+        $length      = 0x00000;                      // Bytes to follow
+
+        // Pack the undocumented parts of the hyperlink stream
+        $unknown1    = pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
+        $unknown2    = pack("H*", "E0C9EA79F9BACE118C8200AA004BA90B");
+
+        // Pack the option flags
+        $options     = pack("V", 0x03);
+
+        // Convert URL to a null terminated wchar string
+        $url         = join("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
+        $url         = $url . "\0\0\0";
+
+        // Pack the length of the URL
+        $url_len     = pack("V", strlen($url));
+
+        // Calculate the data length
+        $length      = 0x34 + strlen($url);
+
+        // Pack the header data
+        $header      = pack("vv", $record, $length);
+        $data        = pack("vvvv", $row1, $row2, $col1, $col2);
+
+        // Write the packed data
+        $this->append($header . $data .
+                       $unknown1 . $options .
+                       $unknown2 . $url_len . $url);
+        return 0;
+    }
+
+    /**
+     * Used to write internal reference hyperlinks such as "Sheet1!A1".
+     *
+     * @access private
+     * @see writeUrl()
+     * @param integer $row1   Start row
+     * @param integer $col1   Start column
+     * @param integer $row2   End row
+     * @param integer $col2   End column
+     * @param string  $url    URL string
+     * @return integer
+     */
+    public function writeUrlInternal($row1, $col1, $row2, $col2, $url)
+    {
+        $record      = 0x01B8;                       // Record identifier
+        $length      = 0x00000;                      // Bytes to follow
+
+        // Strip URL type
+        $url = preg_replace('/^internal:/', '', $url);
+
+        // Pack the undocumented parts of the hyperlink stream
+        $unknown1    = pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
+
+        // Pack the option flags
+        $options     = pack("V", 0x08);
+
+        // Convert the URL type and to a null terminated wchar string
+        $url .= "\0";
+
+        // character count
+        $url_len = PHPExcel_Shared_String::CountCharacters($url);
+        $url_len = pack('V', $url_len);
+
+        $url = PHPExcel_Shared_String::ConvertEncoding($url, 'UTF-16LE', 'UTF-8');
+
+        // Calculate the data length
+        $length      = 0x24 + strlen($url);
+
+        // Pack the header data
+        $header      = pack("vv", $record, $length);
+        $data        = pack("vvvv", $row1, $row2, $col1, $col2);
+
+        // Write the packed data
+        $this->append($header . $data .
+                       $unknown1 . $options .
+                       $url_len . $url);
+        return 0;
+    }
+
+    /**
+     * Write links to external directory names such as 'c:\foo.xls',
+     * c:\foo.xls#Sheet1!A1', '../../foo.xls'. and '../../foo.xls#Sheet1!A1'.
+     *
+     * Note: Excel writes some relative links with the $dir_long string. We ignore
+     * these cases for the sake of simpler code.
+     *
+     * @access private
+     * @see writeUrl()
+     * @param integer $row1   Start row
+     * @param integer $col1   Start column
+     * @param integer $row2   End row
+     * @param integer $col2   End column
+     * @param string  $url    URL string
+     * @return integer
+     */
+    public function writeUrlExternal($row1, $col1, $row2, $col2, $url)
+    {
+        // Network drives are different. We will handle them separately
+        // MS/Novell network drives and shares start with \\
+        if (preg_match('[^external:\\\\]', $url)) {
+            return; //($this->writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
+        }
+
+        $record      = 0x01B8;                       // Record identifier
+        $length      = 0x00000;                      // Bytes to follow
+
+        // Strip URL type and change Unix dir separator to Dos style (if needed)
+        //
+        $url = preg_replace('/^external:/', '', $url);
+        $url = preg_replace('/\//', "\\", $url);
+
+        // Determine if the link is relative or absolute:
+        //   relative if link contains no dir separator, "somefile.xls"
+        //   relative if link starts with up-dir, "..\..\somefile.xls"
+        //   otherwise, absolute
+
+        $absolute = 0x00; // relative path
+        if (preg_match('/^[A-Z]:/', $url)) {
+            $absolute = 0x02; // absolute path on Windows, e.g. C:\...
+        }
+        $link_type               = 0x01 | $absolute;
+
+        // Determine if the link contains a sheet reference and change some of the
+        // parameters accordingly.
+        // Split the dir name and sheet name (if it exists)
+        $dir_long = $url;
+        if (preg_match("/\#/", $url)) {
+            $link_type |= 0x08;
+        }
+
+
+        // Pack the link type
+        $link_type   = pack("V", $link_type);
+
+        // Calculate the up-level dir count e.g.. (..\..\..\ == 3)
+        $up_count    = preg_match_all("/\.\.\\\/", $dir_long, $useless);
+        $up_count    = pack("v", $up_count);
+
+        // Store the short dos dir name (null terminated)
+        $dir_short   = preg_replace("/\.\.\\\/", '', $dir_long) . "\0";
+
+        // Store the long dir name as a wchar string (non-null terminated)
+        $dir_long       = $dir_long . "\0";
+
+        // Pack the lengths of the dir strings
+        $dir_short_len = pack("V", strlen($dir_short));
+        $dir_long_len  = pack("V", strlen($dir_long));
+        $stream_len    = pack("V", 0); //strlen($dir_long) + 0x06);
+
+        // Pack the undocumented parts of the hyperlink stream
+        $unknown1 = pack("H*", 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
+        $unknown2 = pack("H*", '0303000000000000C000000000000046');
+        $unknown3 = pack("H*", 'FFFFADDE000000000000000000000000000000000000000');
+        $unknown4 = pack("v", 0x03);
+
+        // Pack the main data stream
+        $data        = pack("vvvv", $row1, $row2, $col1, $col2) .
+                          $unknown1     .
+                          $link_type    .
+                          $unknown2     .
+                          $up_count     .
+                          $dir_short_len.
+                          $dir_short    .
+                          $unknown3     .
+                          $stream_len   ;/*.
+                          $dir_long_len .
+                          $unknown4     .
+                          $dir_long     .
+                          $sheet_len    .
+                          $sheet        ;*/
+
+        // Pack the header data
+        $length   = strlen($data);
+        $header   = pack("vv", $record, $length);
+
+        // Write the packed data
+        $this->append($header. $data);
+        return 0;
+    }
+
+    /**
+     * This method is used to set the height and format for a row.
+     *
+     * @param integer $row    The row to set
+     * @param integer $height Height we are giving to the row.
+     *                        Use null to set XF without setting height
+     * @param integer $xfIndex  The optional cell style Xf index to apply to the columns
+     * @param bool    $hidden The optional hidden attribute
+     * @param integer $level  The optional outline level for row, in range [0,7]
+     */
+    private function writeRow($row, $height, $xfIndex, $hidden = false, $level = 0)
+    {
+        $record      = 0x0208;               // Record identifier
+        $length      = 0x0010;               // Number of bytes to follow
+
+        $colMic      = 0x0000;               // First defined column
+        $colMac      = 0x0000;               // Last defined column
+        $irwMac      = 0x0000;               // Used by Excel to optimise loading
+        $reserved    = 0x0000;               // Reserved
+        $grbit       = 0x0000;               // Option flags
+        $ixfe        = $xfIndex;
+
+        if ($height < 0) {
+            $height = null;
+        }
+
+        // Use writeRow($row, null, $XF) to set XF format without setting height
+        if ($height != null) {
+            $miyRw = $height * 20;  // row height
+        } else {
+            $miyRw = 0xff;          // default row height is 256
+        }
+
+        // Set the options flags. fUnsynced is used to show that the font and row
+        // heights are not compatible. This is usually the case for WriteExcel.
+        // The collapsed flag 0x10 doesn't seem to be used to indicate that a row
+        // is collapsed. Instead it is used to indicate that the previous row is
+        // collapsed. The zero height flag, 0x20, is used to collapse a row.
+
+        $grbit |= $level;
+        if ($hidden) {
+            $grbit |= 0x0030;
+        }
+        if ($height !== null) {
+            $grbit |= 0x0040; // fUnsynced
+        }
+        if ($xfIndex !== 0xF) {
+            $grbit |= 0x0080;
+        }
+        $grbit |= 0x0100;
+
+        $header   = pack("vv", $record, $length);
+        $data     = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw, $irwMac, $reserved, $grbit, $ixfe);
+        $this->append($header.$data);
+    }
+
+    /**
+     * Writes Excel DIMENSIONS to define the area in which there is data.
+     */
+    private function writeDimensions()
+    {
+        $record = 0x0200; // Record identifier
+
+        $length = 0x000E;
+        $data = pack('VVvvv', $this->firstRowIndex, $this->lastRowIndex + 1, $this->firstColumnIndex, $this->lastColumnIndex + 1, 0x0000); // reserved
+
+        $header = pack("vv", $record, $length);
+        $this->append($header.$data);
+    }
+
+    /**
+     * Write BIFF record Window2.
+     */
+    private function writeWindow2()
+    {
+        $record         = 0x023E;     // Record identifier
+        $length         = 0x0012;
+
+        $grbit          = 0x00B6;     // Option flags
+        $rwTop          = 0x0000;     // Top row visible in window
+        $colLeft        = 0x0000;     // Leftmost column visible in window
+
+
+        // The options flags that comprise $grbit
+        $fDspFmla       = 0;                     // 0 - bit
+        $fDspGrid       = $this->phpSheet->getShowGridlines() ? 1 : 0; // 1
+        $fDspRwCol      = $this->phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
+        $fFrozen        = $this->phpSheet->getFreezePane() ? 1 : 0;        // 3
+        $fDspZeros      = 1;                     // 4
+        $fDefaultHdr    = 1;                     // 5
+        $fArabic        = $this->phpSheet->getRightToLeft() ? 1 : 0; // 6
+        $fDspGuts       = $this->outlineOn;    // 7
+        $fFrozenNoSplit = 0;                     // 0 - bit
+        // no support in PHPExcel for selected sheet, therefore sheet is only selected if it is the active sheet
+        $fSelected      = ($this->phpSheet === $this->phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
+        $fPaged         = 1;                     // 2
+        $fPageBreakPreview = $this->phpSheet->getSheetView()->getView() === PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
+
+        $grbit             = $fDspFmla;
+        $grbit            |= $fDspGrid       << 1;
+        $grbit            |= $fDspRwCol       << 2;
+        $grbit            |= $fFrozen           << 3;
+        $grbit            |= $fDspZeros       << 4;
+        $grbit            |= $fDefaultHdr       << 5;
+        $grbit            |= $fArabic           << 6;
+        $grbit            |= $fDspGuts       << 7;
+        $grbit            |= $fFrozenNoSplit << 8;
+        $grbit            |= $fSelected       << 9;
+        $grbit            |= $fPaged           << 10;
+        $grbit            |= $fPageBreakPreview << 11;
+
+        $header  = pack("vv", $record, $length);
+        $data    = pack("vvv", $grbit, $rwTop, $colLeft);
+
+        // FIXME !!!
+        $rgbHdr       = 0x0040; // Row/column heading and gridline color index
+        $zoom_factor_page_break = ($fPageBreakPreview ? $this->phpSheet->getSheetView()->getZoomScale() : 0x0000);
+        $zoom_factor_normal =  $this->phpSheet->getSheetView()->getZoomScaleNormal();
+
+        $data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
+
+        $this->append($header.$data);
+    }
+
+    /**
+     * Write BIFF record DEFAULTROWHEIGHT.
+     */
+    private function writeDefaultRowHeight()
+    {
+        $defaultRowHeight = $this->phpSheet->getDefaultRowDimension()->getRowHeight();
+
+        if ($defaultRowHeight < 0) {
+            return;
+        }
+
+        // convert to twips
+        $defaultRowHeight = (int) 20 * $defaultRowHeight;
+
+        $record   = 0x0225;      // Record identifier
+        $length   = 0x0004;      // Number of bytes to follow
+
+        $header   = pack("vv", $record, $length);
+        $data     = pack("vv", 1, $defaultRowHeight);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record DEFCOLWIDTH if COLINFO records are in use.
+     */
+    private function writeDefcol()
+    {
+        $defaultColWidth = 8;
+
+        $record   = 0x0055;      // Record identifier
+        $length   = 0x0002;      // Number of bytes to follow
+
+        $header = pack("vv", $record, $length);
+        $data = pack("v", $defaultColWidth);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record COLINFO to define column widths
+     *
+     * Note: The SDK says the record length is 0x0B but Excel writes a 0x0C
+     * length record.
+     *
+     * @param array $col_array This is the only parameter received and is composed of the following:
+     *                0 => First formatted column,
+     *                1 => Last formatted column,
+     *                2 => Col width (8.43 is Excel default),
+     *                3 => The optional XF format of the column,
+     *                4 => Option flags.
+     *                5 => Optional outline level
+     */
+    private function writeColinfo($col_array)
+    {
+        if (isset($col_array[0])) {
+            $colFirst = $col_array[0];
+        }
+        if (isset($col_array[1])) {
+            $colLast = $col_array[1];
+        }
+        if (isset($col_array[2])) {
+            $coldx = $col_array[2];
+        } else {
+            $coldx = 8.43;
+        }
+        if (isset($col_array[3])) {
+            $xfIndex = $col_array[3];
+        } else {
+            $xfIndex = 15;
+        }
+        if (isset($col_array[4])) {
+            $grbit = $col_array[4];
+        } else {
+            $grbit = 0;
+        }
+        if (isset($col_array[5])) {
+            $level = $col_array[5];
+        } else {
+            $level = 0;
+        }
+        $record   = 0x007D;          // Record identifier
+        $length   = 0x000C;          // Number of bytes to follow
+
+        $coldx   *= 256;             // Convert to units of 1/256 of a char
+
+        $ixfe     = $xfIndex;
+        $reserved = 0x0000;            // Reserved
+
+        $level = max(0, min($level, 7));
+        $grbit |= $level << 8;
+
+        $header   = pack("vv", $record, $length);
+        $data     = pack("vvvvvv", $colFirst, $colLast, $coldx, $ixfe, $grbit, $reserved);
+        $this->append($header.$data);
+    }
+
+    /**
+     * Write BIFF record SELECTION.
+     */
+    private function writeSelection()
+    {
+        // look up the selected cell range
+        $selectedCells = $this->phpSheet->getSelectedCells();
+        $selectedCells = PHPExcel_Cell::splitRange($this->phpSheet->getSelectedCells());
+        $selectedCells = $selectedCells[0];
+        if (count($selectedCells) == 2) {
+            list($first, $last) = $selectedCells;
+        } else {
+            $first = $selectedCells[0];
+            $last  = $selectedCells[0];
+        }
+
+        list($colFirst, $rwFirst) = PHPExcel_Cell::coordinateFromString($first);
+        $colFirst = PHPExcel_Cell::columnIndexFromString($colFirst) - 1; // base 0 column index
+        --$rwFirst; // base 0 row index
+
+        list($colLast, $rwLast) = PHPExcel_Cell::coordinateFromString($last);
+        $colLast = PHPExcel_Cell::columnIndexFromString($colLast) - 1; // base 0 column index
+        --$rwLast; // base 0 row index
+
+        // make sure we are not out of bounds
+        $colFirst = min($colFirst, 255);
+        $colLast  = min($colLast, 255);
+
+        $rwFirst = min($rwFirst, 65535);
+        $rwLast  = min($rwLast, 65535);
+
+        $record   = 0x001D;                  // Record identifier
+        $length   = 0x000F;                  // Number of bytes to follow
+
+        $pnn      = $this->activePane;     // Pane position
+        $rwAct    = $rwFirst;                // Active row
+        $colAct   = $colFirst;               // Active column
+        $irefAct  = 0;                       // Active cell ref
+        $cref     = 1;                       // Number of refs
+
+        if (!isset($rwLast)) {
+            $rwLast   = $rwFirst;       // Last  row in reference
+        }
+        if (!isset($colLast)) {
+            $colLast  = $colFirst;      // Last  col in reference
+        }
+
+        // Swap last row/col for first row/col as necessary
+        if ($rwFirst > $rwLast) {
+            list($rwFirst, $rwLast) = array($rwLast, $rwFirst);
+        }
+
+        if ($colFirst > $colLast) {
+            list($colFirst, $colLast) = array($colLast, $colFirst);
+        }
+
+        $header   = pack("vv", $record, $length);
+        $data     = pack("CvvvvvvCC", $pnn, $rwAct, $colAct, $irefAct, $cref, $rwFirst, $rwLast, $colFirst, $colLast);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the MERGEDCELLS records for all ranges of merged cells
+     */
+    private function writeMergedCells()
+    {
+        $mergeCells = $this->phpSheet->getMergeCells();
+        $countMergeCells = count($mergeCells);
+
+        if ($countMergeCells == 0) {
+            return;
+        }
+
+        // maximum allowed number of merged cells per record
+        $maxCountMergeCellsPerRecord = 1027;
+
+        // record identifier
+        $record = 0x00E5;
+
+        // counter for total number of merged cells treated so far by the writer
+        $i = 0;
+
+        // counter for number of merged cells written in record currently being written
+        $j = 0;
+
+        // initialize record data
+        $recordData = '';
+
+        // loop through the merged cells
+        foreach ($mergeCells as $mergeCell) {
+            ++$i;
+            ++$j;
+
+            // extract the row and column indexes
+            $range = PHPExcel_Cell::splitRange($mergeCell);
+            list($first, $last) = $range[0];
+            list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($first);
+            list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($last);
+
+            $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, PHPExcel_Cell::columnIndexFromString($firstColumn) - 1, PHPExcel_Cell::columnIndexFromString($lastColumn) - 1);
+
+            // flush record if we have reached limit for number of merged cells, or reached final merged cell
+            if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
+                $recordData = pack('v', $j) . $recordData;
+                $length = strlen($recordData);
+                $header = pack('vv', $record, $length);
+                $this->append($header . $recordData);
+
+                // initialize for next record, if any
+                $recordData = '';
+                $j = 0;
+            }
+        }
+    }
+
+    /**
+     * Write SHEETLAYOUT record
+     */
+    private function writeSheetLayout()
+    {
+        if (!$this->phpSheet->isTabColorSet()) {
+            return;
+        }
+
+        $recordData = pack(
+            'vvVVVvv',
+            0x0862,
+            0x0000, // unused
+            0x00000000, // unused
+            0x00000000, // unused
+            0x00000014, // size of record data
+            $this->colors[$this->phpSheet->getTabColor()->getRGB()], // color index
+            0x0000        // unused
+        );
+
+        $length = strlen($recordData);
+
+        $record = 0x0862; // Record identifier
+        $header = pack('vv', $record, $length);
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Write SHEETPROTECTION
+     */
+    private function writeSheetProtection()
+    {
+        // record identifier
+        $record = 0x0867;
+
+        // prepare options
+        $options  =   (int) !$this->phpSheet->getProtection()->getObjects()
+                    | (int) !$this->phpSheet->getProtection()->getScenarios()           << 1
+                    | (int) !$this->phpSheet->getProtection()->getFormatCells()         << 2
+                    | (int) !$this->phpSheet->getProtection()->getFormatColumns()       << 3
+                    | (int) !$this->phpSheet->getProtection()->getFormatRows()          << 4
+                    | (int) !$this->phpSheet->getProtection()->getInsertColumns()       << 5
+                    | (int) !$this->phpSheet->getProtection()->getInsertRows()          << 6
+                    | (int) !$this->phpSheet->getProtection()->getInsertHyperlinks()    << 7
+                    | (int) !$this->phpSheet->getProtection()->getDeleteColumns()       << 8
+                    | (int) !$this->phpSheet->getProtection()->getDeleteRows()          << 9
+                    | (int) !$this->phpSheet->getProtection()->getSelectLockedCells()   << 10
+                    | (int) !$this->phpSheet->getProtection()->getSort()                << 11
+                    | (int) !$this->phpSheet->getProtection()->getAutoFilter()          << 12
+                    | (int) !$this->phpSheet->getProtection()->getPivotTables()         << 13
+                    | (int) !$this->phpSheet->getProtection()->getSelectUnlockedCells() << 14 ;
+
+        // record data
+        $recordData = pack(
+            'vVVCVVvv',
+            0x0867, // repeated record identifier
+            0x0000, // not used
+            0x0000, // not used
+            0x00, // not used
+            0x01000200, // unknown data
+            0xFFFFFFFF, // unknown data
+            $options, // options
+            0x0000 // not used
+        );
+
+        $length = strlen($recordData);
+        $header = pack('vv', $record, $length);
+
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Write BIFF record RANGEPROTECTION
+     *
+     * Openoffice.org's Documentaion of the Microsoft Excel File Format uses term RANGEPROTECTION for these records
+     * Microsoft Office Excel 97-2007 Binary File Format Specification uses term FEAT for these records
+     */
+    private function writeRangeProtection()
+    {
+        foreach ($this->phpSheet->getProtectedCells() as $range => $password) {
+            // number of ranges, e.g. 'A1:B3 C20:D25'
+            $cellRanges = explode(' ', $range);
+            $cref = count($cellRanges);
+
+            $recordData = pack(
+                'vvVVvCVvVv',
+                0x0868,
+                0x00,
+                0x0000,
+                0x0000,
+                0x02,
+                0x0,
+                0x0000,
+                $cref,
+                0x0000,
+                0x00
+            );
+
+            foreach ($cellRanges as $cellRange) {
+                $recordData .= $this->writeBIFF8CellRangeAddressFixed($cellRange);
+            }
+
+            // the rgbFeat structure
+            $recordData .= pack(
+                'VV',
+                0x0000,
+                hexdec($password)
+            );
+
+            $recordData .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
+
+            $length = strlen($recordData);
+
+            $record = 0x0868;        // Record identifier
+            $header = pack("vv", $record, $length);
+            $this->append($header . $recordData);
+        }
+    }
+
+    /**
+     * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
+     * references in a worksheet.
+     *
+     * Excel only stores references to external sheets that are used in formulas.
+     * For simplicity we store references to all the sheets in the workbook
+     * regardless of whether they are used or not. This reduces the overall
+     * complexity and eliminates the need for a two way dialogue between the formula
+     * parser the worksheet objects.
+     *
+     * @param integer $count The number of external sheet references in this worksheet
+     */
+    private function writeExterncount($count)
+    {
+        $record = 0x0016;          // Record identifier
+        $length = 0x0002;          // Number of bytes to follow
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("v", $count);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes the Excel BIFF EXTERNSHEET record. These references are used by
+     * formulas. A formula references a sheet name via an index. Since we store a
+     * reference to all of the external worksheets the EXTERNSHEET index is the same
+     * as the worksheet index.
+     *
+     * @param string $sheetname The name of a external worksheet
+     */
+    private function writeExternsheet($sheetname)
+    {
+        $record    = 0x0017;         // Record identifier
+
+        // References to the current sheet are encoded differently to references to
+        // external sheets.
+        //
+        if ($this->phpSheet->getTitle() == $sheetname) {
+            $sheetname = '';
+            $length    = 0x02;  // The following 2 bytes
+            $cch       = 1;     // The following byte
+            $rgch      = 0x02;  // Self reference
+        } else {
+            $length    = 0x02 + strlen($sheetname);
+            $cch       = strlen($sheetname);
+            $rgch      = 0x03;  // Reference to a sheet in the current workbook
+        }
+
+        $header = pack("vv", $record, $length);
+        $data   = pack("CC", $cch, $rgch);
+        $this->append($header . $data . $sheetname);
+    }
+
+    /**
+     * Writes the Excel BIFF PANE record.
+     * The panes can either be frozen or thawed (unfrozen).
+     * Frozen panes are specified in terms of an integer number of rows and columns.
+     * Thawed panes are specified in terms of Excel's units for rows and columns.
+     */
+    private function writePanes()
+    {
+        $panes = array();
+        if ($freezePane = $this->phpSheet->getFreezePane()) {
+            list($column, $row) = PHPExcel_Cell::coordinateFromString($freezePane);
+            $panes[0] = $row - 1;
+            $panes[1] = PHPExcel_Cell::columnIndexFromString($column) - 1;
+        } else {
+            // thaw panes
+            return;
+        }
+
+        $y       = isset($panes[0]) ? $panes[0] : null;
+        $x       = isset($panes[1]) ? $panes[1] : null;
+        $rwTop   = isset($panes[2]) ? $panes[2] : null;
+        $colLeft = isset($panes[3]) ? $panes[3] : null;
+        if (count($panes) > 4) { // if Active pane was received
+            $pnnAct = $panes[4];
+        } else {
+            $pnnAct = null;
+        }
+        $record  = 0x0041;       // Record identifier
+        $length  = 0x000A;       // Number of bytes to follow
+
+        // Code specific to frozen or thawed panes.
+        if ($this->phpSheet->getFreezePane()) {
+            // Set default values for $rwTop and $colLeft
+            if (!isset($rwTop)) {
+                $rwTop   = $y;
+            }
+            if (!isset($colLeft)) {
+                $colLeft = $x;
+            }
+        } else {
+            // Set default values for $rwTop and $colLeft
+            if (!isset($rwTop)) {
+                $rwTop   = 0;
+            }
+            if (!isset($colLeft)) {
+                $colLeft = 0;
+            }
+
+            // Convert Excel's row and column units to the internal units.
+            // The default row height is 12.75
+            // The default column width is 8.43
+            // The following slope and intersection values were interpolated.
+            //
+            $y = 20*$y + 255;
+            $x = 113.879*$x + 390;
+        }
+
+
+        // Determine which pane should be active. There is also the undocumented
+        // option to override this should it be necessary: may be removed later.
+        //
+        if (!isset($pnnAct)) {
+            if ($x != 0 && $y != 0) {
+                $pnnAct = 0; // Bottom right
+            }
+            if ($x != 0 && $y == 0) {
+                $pnnAct = 1; // Top right
+            }
+            if ($x == 0 && $y != 0) {
+                $pnnAct = 2; // Bottom left
+            }
+            if ($x == 0 && $y == 0) {
+                $pnnAct = 3; // Top left
+            }
+        }
+
+        $this->activePane = $pnnAct; // Used in writeSelection
+
+        $header = pack("vv", $record, $length);
+        $data = pack("vvvvv", $x, $y, $rwTop, $colLeft, $pnnAct);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the page setup SETUP BIFF record.
+     */
+    private function writeSetup()
+    {
+        $record       = 0x00A1;                  // Record identifier
+        $length       = 0x0022;                  // Number of bytes to follow
+
+        $iPaperSize   = $this->phpSheet->getPageSetup()->getPaperSize();    // Paper size
+
+        $iScale = $this->phpSheet->getPageSetup()->getScale() ?
+            $this->phpSheet->getPageSetup()->getScale() : 100;   // Print scaling factor
+
+        $iPageStart   = 0x01;                 // Starting page number
+        $iFitWidth    = (int) $this->phpSheet->getPageSetup()->getFitToWidth();    // Fit to number of pages wide
+        $iFitHeight    = (int) $this->phpSheet->getPageSetup()->getFitToHeight();    // Fit to number of pages high
+        $grbit        = 0x00;                 // Option flags
+        $iRes         = 0x0258;               // Print resolution
+        $iVRes        = 0x0258;               // Vertical print resolution
+
+        $numHdr       = $this->phpSheet->getPageMargins()->getHeader();  // Header Margin
+
+        $numFtr       = $this->phpSheet->getPageMargins()->getFooter();   // Footer Margin
+        $iCopies      = 0x01;                 // Number of copies
+
+        $fLeftToRight = 0x0;                     // Print over then down
+
+        // Page orientation
+        $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
+            0x0 : 0x1;
+
+        $fNoPls       = 0x0;                     // Setup not read from printer
+        $fNoColor     = 0x0;                     // Print black and white
+        $fDraft       = 0x0;                     // Print draft quality
+        $fNotes       = 0x0;                     // Print notes
+        $fNoOrient    = 0x0;                     // Orientation not set
+        $fUsePage     = 0x0;                     // Use custom starting page
+
+        $grbit           = $fLeftToRight;
+        $grbit          |= $fLandscape    << 1;
+        $grbit          |= $fNoPls        << 2;
+        $grbit          |= $fNoColor      << 3;
+        $grbit          |= $fDraft        << 4;
+        $grbit          |= $fNotes        << 5;
+        $grbit          |= $fNoOrient     << 6;
+        $grbit          |= $fUsePage      << 7;
+
+        $numHdr = pack("d", $numHdr);
+        $numFtr = pack("d", $numFtr);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $numHdr = strrev($numHdr);
+            $numFtr = strrev($numFtr);
+        }
+
+        $header = pack("vv", $record, $length);
+        $data1  = pack("vvvvvvvv", $iPaperSize, $iScale, $iPageStart, $iFitWidth, $iFitHeight, $grbit, $iRes, $iVRes);
+        $data2  = $numHdr.$numFtr;
+        $data3  = pack("v", $iCopies);
+        $this->append($header . $data1 . $data2 . $data3);
+    }
+
+    /**
+     * Store the header caption BIFF record.
+     */
+    private function writeHeader()
+    {
+        $record  = 0x0014;               // Record identifier
+
+        /* removing for now
+        // need to fix character count (multibyte!)
+        if (strlen($this->phpSheet->getHeaderFooter()->getOddHeader()) <= 255) {
+            $str      = $this->phpSheet->getHeaderFooter()->getOddHeader();       // header string
+        } else {
+            $str = '';
+        }
+        */
+
+        $recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddHeader());
+        $length = strlen($recordData);
+
+        $header   = pack("vv", $record, $length);
+
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Store the footer caption BIFF record.
+     */
+    private function writeFooter()
+    {
+        $record  = 0x0015;               // Record identifier
+
+        /* removing for now
+        // need to fix character count (multibyte!)
+        if (strlen($this->phpSheet->getHeaderFooter()->getOddFooter()) <= 255) {
+            $str = $this->phpSheet->getHeaderFooter()->getOddFooter();
+        } else {
+            $str = '';
+        }
+        */
+
+        $recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddFooter());
+        $length = strlen($recordData);
+
+        $header    = pack("vv", $record, $length);
+
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Store the horizontal centering HCENTER BIFF record.
+     *
+     * @access private
+     */
+    private function writeHcenter()
+    {
+        $record   = 0x0083;              // Record identifier
+        $length   = 0x0002;              // Bytes to follow
+
+        $fHCenter = $this->phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0;     // Horizontal centering
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("v", $fHCenter);
+
+        $this->append($header.$data);
+    }
+
+    /**
+     * Store the vertical centering VCENTER BIFF record.
+     */
+    private function writeVcenter()
+    {
+        $record   = 0x0084;              // Record identifier
+        $length   = 0x0002;              // Bytes to follow
+
+        $fVCenter = $this->phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0;     // Horizontal centering
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("v", $fVCenter);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the LEFTMARGIN BIFF record.
+     */
+    private function writeMarginLeft()
+    {
+        $record  = 0x0026;                   // Record identifier
+        $length  = 0x0008;                   // Bytes to follow
+
+        $margin  = $this->phpSheet->getPageMargins()->getLeft();     // Margin in inches
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("d", $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the RIGHTMARGIN BIFF record.
+     */
+    private function writeMarginRight()
+    {
+        $record  = 0x0027;                   // Record identifier
+        $length  = 0x0008;                   // Bytes to follow
+
+        $margin  = $this->phpSheet->getPageMargins()->getRight();     // Margin in inches
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("d", $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the TOPMARGIN BIFF record.
+     */
+    private function writeMarginTop()
+    {
+        $record  = 0x0028;                   // Record identifier
+        $length  = 0x0008;                   // Bytes to follow
+
+        $margin  = $this->phpSheet->getPageMargins()->getTop();     // Margin in inches
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("d", $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the BOTTOMMARGIN BIFF record.
+     */
+    private function writeMarginBottom()
+    {
+        $record  = 0x0029;                   // Record identifier
+        $length  = 0x0008;                   // Bytes to follow
+
+        $margin  = $this->phpSheet->getPageMargins()->getBottom();     // Margin in inches
+
+        $header    = pack("vv", $record, $length);
+        $data      = pack("d", $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the PRINTHEADERS BIFF record.
+     */
+    private function writePrintHeaders()
+    {
+        $record      = 0x002a;                   // Record identifier
+        $length      = 0x0002;                   // Bytes to follow
+
+        $fPrintRwCol = $this->_print_headers;     // Boolean flag
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("v", $fPrintRwCol);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the PRINTGRIDLINES BIFF record. Must be used in conjunction with the
+     * GRIDSET record.
+     */
+    private function writePrintGridlines()
+    {
+        $record      = 0x002b;                    // Record identifier
+        $length      = 0x0002;                    // Bytes to follow
+
+        $fPrintGrid  = $this->phpSheet->getPrintGridlines() ? 1 : 0;    // Boolean flag
+
+        $header      = pack("vv", $record, $length);
+        $data      = pack("v", $fPrintGrid);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the GRIDSET BIFF record. Must be used in conjunction with the
+     * PRINTGRIDLINES record.
+     */
+    private function writeGridset()
+    {
+        $record      = 0x0082;                        // Record identifier
+        $length      = 0x0002;                        // Bytes to follow
+
+        $fGridSet    = !$this->phpSheet->getPrintGridlines();     // Boolean flag
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("v", $fGridSet);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the AUTOFILTERINFO BIFF record. This is used to configure the number of autofilter select used in the sheet.
+     */
+    private function writeAutoFilterInfo()
+    {
+        $record      = 0x009D;                        // Record identifier
+        $length      = 0x0002;                        // Bytes to follow
+
+        $rangeBounds = PHPExcel_Cell::rangeBoundaries($this->phpSheet->getAutoFilter()->getRange());
+        $iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
+
+        $header   = pack("vv", $record, $length);
+        $data     = pack("v", $iNumFilters);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the GUTS BIFF record. This is used to configure the gutter margins
+     * where Excel outline symbols are displayed. The visibility of the gutters is
+     * controlled by a flag in WSBOOL.
+     *
+     * @see writeWsbool()
+     */
+    private function writeGuts()
+    {
+        $record      = 0x0080;   // Record identifier
+        $length      = 0x0008;   // Bytes to follow
+
+        $dxRwGut     = 0x0000;   // Size of row gutter
+        $dxColGut    = 0x0000;   // Size of col gutter
+
+        // determine maximum row outline level
+        $maxRowOutlineLevel = 0;
+        foreach ($this->phpSheet->getRowDimensions() as $rowDimension) {
+            $maxRowOutlineLevel = max($maxRowOutlineLevel, $rowDimension->getOutlineLevel());
+        }
+
+        $col_level   = 0;
+
+        // Calculate the maximum column outline level. The equivalent calculation
+        // for the row outline level is carried out in writeRow().
+        $colcount = count($this->columnInfo);
+        for ($i = 0; $i < $colcount; ++$i) {
+            $col_level = max($this->columnInfo[$i][5], $col_level);
+        }
+
+        // Set the limits for the outline levels (0 <= x <= 7).
+        $col_level = max(0, min($col_level, 7));
+
+        // The displayed level is one greater than the max outline levels
+        if ($maxRowOutlineLevel) {
+            ++$maxRowOutlineLevel;
+        }
+        if ($col_level) {
+            ++$col_level;
+        }
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
+
+        $this->append($header.$data);
+    }
+
+    /**
+     * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
+     * with the SETUP record.
+     */
+    private function writeWsbool()
+    {
+        $record      = 0x0081;   // Record identifier
+        $length      = 0x0002;   // Bytes to follow
+        $grbit       = 0x0000;
+
+        // The only option that is of interest is the flag for fit to page. So we
+        // set all the options in one go.
+        //
+        // Set the option flags
+        $grbit |= 0x0001;                           // Auto page breaks visible
+        if ($this->outlineStyle) {
+            $grbit |= 0x0020; // Auto outline styles
+        }
+        if ($this->phpSheet->getShowSummaryBelow()) {
+            $grbit |= 0x0040; // Outline summary below
+        }
+        if ($this->phpSheet->getShowSummaryRight()) {
+            $grbit |= 0x0080; // Outline summary right
+        }
+        if ($this->phpSheet->getPageSetup()->getFitToPage()) {
+            $grbit |= 0x0100; // Page setup fit to page
+        }
+        if ($this->outlineOn) {
+            $grbit |= 0x0400; // Outline symbols displayed
+        }
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("v", $grbit);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the HORIZONTALPAGEBREAKS and VERTICALPAGEBREAKS BIFF records.
+     */
+    private function writeBreaks()
+    {
+        // initialize
+        $vbreaks = array();
+        $hbreaks = array();
+
+        foreach ($this->phpSheet->getBreaks() as $cell => $breakType) {
+            // Fetch coordinates
+            $coordinates = PHPExcel_Cell::coordinateFromString($cell);
+
+            // Decide what to do by the type of break
+            switch ($breakType) {
+                case PHPExcel_Worksheet::BREAK_COLUMN:
+                    // Add to list of vertical breaks
+                    $vbreaks[] = PHPExcel_Cell::columnIndexFromString($coordinates[0]) - 1;
+                    break;
+                case PHPExcel_Worksheet::BREAK_ROW:
+                    // Add to list of horizontal breaks
+                    $hbreaks[] = $coordinates[1];
+                    break;
+                case PHPExcel_Worksheet::BREAK_NONE:
+                default:
+                    // Nothing to do
+                    break;
+            }
+        }
+
+        //horizontal page breaks
+        if (!empty($hbreaks)) {
+            // Sort and filter array of page breaks
+            sort($hbreaks, SORT_NUMERIC);
+            if ($hbreaks[0] == 0) { // don't use first break if it's 0
+                array_shift($hbreaks);
+            }
+
+            $record  = 0x001b;               // Record identifier
+            $cbrk    = count($hbreaks);       // Number of page breaks
+            $length  = 2 + 6 * $cbrk;      // Bytes to follow
+
+            $header  = pack("vv", $record, $length);
+            $data    = pack("v", $cbrk);
+
+            // Append each page break
+            foreach ($hbreaks as $hbreak) {
+                $data .= pack("vvv", $hbreak, 0x0000, 0x00ff);
+            }
+
+            $this->append($header . $data);
+        }
+
+        // vertical page breaks
+        if (!empty($vbreaks)) {
+            // 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
+            // It is slightly higher in Excel 97/200, approx. 1026
+            $vbreaks = array_slice($vbreaks, 0, 1000);
+
+            // Sort and filter array of page breaks
+            sort($vbreaks, SORT_NUMERIC);
+            if ($vbreaks[0] == 0) { // don't use first break if it's 0
+                array_shift($vbreaks);
+            }
+
+            $record  = 0x001a;               // Record identifier
+            $cbrk    = count($vbreaks);       // Number of page breaks
+            $length  = 2 + 6 * $cbrk;      // Bytes to follow
+
+            $header  = pack("vv", $record, $length);
+            $data    = pack("v", $cbrk);
+
+            // Append each page break
+            foreach ($vbreaks as $vbreak) {
+                $data .= pack("vvv", $vbreak, 0x0000, 0xffff);
+            }
+
+            $this->append($header . $data);
+        }
+    }
+
+    /**
+     * Set the Biff PROTECT record to indicate that the worksheet is protected.
+     */
+    private function writeProtect()
+    {
+        // Exit unless sheet protection has been specified
+        if (!$this->phpSheet->getProtection()->getSheet()) {
+            return;
+        }
+
+        $record      = 0x0012;             // Record identifier
+        $length      = 0x0002;             // Bytes to follow
+
+        $fLock      = 1;    // Worksheet is protected
+
+        $header      = pack("vv", $record, $length);
+        $data      = pack("v", $fLock);
+
+        $this->append($header.$data);
+    }
+
+    /**
+     * Write SCENPROTECT
+     */
+    private function writeScenProtect()
+    {
+        // Exit if sheet protection is not active
+        if (!$this->phpSheet->getProtection()->getSheet()) {
+            return;
+        }
+
+        // Exit if scenarios are not protected
+        if (!$this->phpSheet->getProtection()->getScenarios()) {
+            return;
+        }
+
+        $record = 0x00DD; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', 1);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write OBJECTPROTECT
+     */
+    private function writeObjectProtect()
+    {
+        // Exit if sheet protection is not active
+        if (!$this->phpSheet->getProtection()->getSheet()) {
+            return;
+        }
+
+        // Exit if objects are not protected
+        if (!$this->phpSheet->getProtection()->getObjects()) {
+            return;
+        }
+
+        $record = 0x0063; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', 1);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the worksheet PASSWORD record.
+     */
+    private function writePassword()
+    {
+        // Exit unless sheet protection and password have been specified
+        if (!$this->phpSheet->getProtection()->getSheet() || !$this->phpSheet->getProtection()->getPassword()) {
+            return;
+        }
+
+        $record      = 0x0013;               // Record identifier
+        $length      = 0x0002;               // Bytes to follow
+
+        $wPassword   = hexdec($this->phpSheet->getProtection()->getPassword());     // Encoded password
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("v", $wPassword);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Insert a 24bit bitmap image in a worksheet.
+     *
+     * @access public
+     * @param integer $row     The row we are going to insert the bitmap into
+     * @param integer $col     The column we are going to insert the bitmap into
+     * @param mixed   $bitmap  The bitmap filename or GD-image resource
+     * @param integer $x       The horizontal position (offset) of the image inside the cell.
+     * @param integer $y       The vertical position (offset) of the image inside the cell.
+     * @param float   $scale_x The horizontal scale
+     * @param float   $scale_y The vertical scale
+     */
+    public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
+    {
+        $bitmap_array = (is_resource($bitmap) ? $this->processBitmapGd($bitmap) : $this->processBitmap($bitmap));
+        list($width, $height, $size, $data) = $bitmap_array; //$this->processBitmap($bitmap);
+
+        // Scale the frame of the image.
+        $width  *= $scale_x;
+        $height *= $scale_y;
+
+        // Calculate the vertices of the image and write the OBJ record
+        $this->positionImage($col, $row, $x, $y, $width, $height);
+
+        // Write the IMDATA record to store the bitmap data
+        $record      = 0x007f;
+        $length      = 8 + $size;
+        $cf          = 0x09;
+        $env         = 0x01;
+        $lcb         = $size;
+
+        $header      = pack("vvvvV", $record, $length, $cf, $env, $lcb);
+        $this->append($header.$data);
+    }
+
+    /**
+     * Calculate the vertices that define the position of the image as required by
+     * the OBJ record.
+     *
+     *         +------------+------------+
+     *         |     A      |      B     |
+     *   +-----+------------+------------+
+     *   |     |(x1,y1)     |            |
+     *   |  1  |(A1)._______|______      |
+     *   |     |    |              |     |
+     *   |     |    |              |     |
+     *   +-----+----|    BITMAP    |-----+
+     *   |     |    |              |     |
+     *   |  2  |    |______________.     |
+     *   |     |            |        (B2)|
+     *   |     |            |     (x2,y2)|
+     *   +---- +------------+------------+
+     *
+     * Example of a bitmap that covers some of the area from cell A1 to cell B2.
+     *
+     * Based on the width and height of the bitmap we need to calculate 8 vars:
+     *     $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
+     * The width and height of the cells are also variable and have to be taken into
+     * account.
+     * The values of $col_start and $row_start are passed in from the calling
+     * function. The values of $col_end and $row_end are calculated by subtracting
+     * the width and height of the bitmap from the width and height of the
+     * underlying cells.
+     * The vertices are expressed as a percentage of the underlying cell width as
+     * follows (rhs values are in pixels):
+     *
+     *       x1 = X / W *1024
+     *       y1 = Y / H *256
+     *       x2 = (X-1) / W *1024
+     *       y2 = (Y-1) / H *256
+     *
+     *       Where:  X is distance from the left side of the underlying cell
+     *               Y is distance from the top of the underlying cell
+     *               W is the width of the cell
+     *               H is the height of the cell
+     * The SDK incorrectly states that the height should be expressed as a
+     *        percentage of 1024.
+     *
+     * @access private
+     * @param integer $col_start Col containing upper left corner of object
+     * @param integer $row_start Row containing top left corner of object
+     * @param integer $x1        Distance to left side of object
+     * @param integer $y1        Distance to top of object
+     * @param integer $width     Width of image frame
+     * @param integer $height    Height of image frame
+     */
+    public function positionImage($col_start, $row_start, $x1, $y1, $width, $height)
+    {
+        // Initialise end cell to the same as the start cell
+        $col_end    = $col_start;  // Col containing lower right corner of object
+        $row_end    = $row_start;  // Row containing bottom right corner of object
+
+        // Zero the specified offset if greater than the cell dimensions
+        if ($x1 >= PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
+            $x1 = 0;
+        }
+        if ($y1 >= PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_start + 1)) {
+            $y1 = 0;
+        }
+
+        $width      = $width  + $x1 -1;
+        $height     = $height + $y1 -1;
+
+        // Subtract the underlying cell widths to find the end cell of the image
+        while ($width >= PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
+            $width -= PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
+            ++$col_end;
+        }
+
+        // Subtract the underlying cell heights to find the end cell of the image
+        while ($height >= PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_end + 1)) {
+            $height -= PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_end + 1);
+            ++$row_end;
+        }
+
+        // Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
+        // with zero eight or width.
+        //
+        if (PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
+            return;
+        }
+        if (PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
+            return;
+        }
+        if (PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_start + 1) == 0) {
+            return;
+        }
+        if (PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_end + 1)   == 0) {
+            return;
+        }
+
+        // Convert the pixel values to the percentage value expected by Excel
+        $x1 = $x1     / PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
+        $y1 = $y1     / PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_start + 1)   *  256;
+        $x2 = $width  / PHPExcel_Shared_Excel5::sizeCol($this->phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))     * 1024; // Distance to right side of object
+        $y2 = $height / PHPExcel_Shared_Excel5::sizeRow($this->phpSheet, $row_end + 1)     *  256; // Distance to bottom of object
+
+        $this->writeObjPicture($col_start, $x1, $row_start, $y1, $col_end, $x2, $row_end, $y2);
+    }
+
+    /**
+     * Store the OBJ record that precedes an IMDATA record. This could be generalise
+     * to support other Excel objects.
+     *
+     * @param integer $colL Column containing upper left corner of object
+     * @param integer $dxL  Distance from left side of cell
+     * @param integer $rwT  Row containing top left corner of object
+     * @param integer $dyT  Distance from top of cell
+     * @param integer $colR Column containing lower right corner of object
+     * @param integer $dxR  Distance from right of cell
+     * @param integer $rwB  Row containing bottom right corner of object
+     * @param integer $dyB  Distance from bottom of cell
+     */
+    private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dyB)
+    {
+        $record      = 0x005d;   // Record identifier
+        $length      = 0x003c;   // Bytes to follow
+
+        $cObj        = 0x0001;   // Count of objects in file (set to 1)
+        $OT          = 0x0008;   // Object type. 8 = Picture
+        $id          = 0x0001;   // Object ID
+        $grbit       = 0x0614;   // Option flags
+
+        $cbMacro     = 0x0000;   // Length of FMLA structure
+        $Reserved1   = 0x0000;   // Reserved
+        $Reserved2   = 0x0000;   // Reserved
+
+        $icvBack     = 0x09;     // Background colour
+        $icvFore     = 0x09;     // Foreground colour
+        $fls         = 0x00;     // Fill pattern
+        $fAuto       = 0x00;     // Automatic fill
+        $icv         = 0x08;     // Line colour
+        $lns         = 0xff;     // Line style
+        $lnw         = 0x01;     // Line weight
+        $fAutoB      = 0x00;     // Automatic border
+        $frs         = 0x0000;   // Frame style
+        $cf          = 0x0009;   // Image format, 9 = bitmap
+        $Reserved3   = 0x0000;   // Reserved
+        $cbPictFmla  = 0x0000;   // Length of FMLA structure
+        $Reserved4   = 0x0000;   // Reserved
+        $grbit2      = 0x0001;   // Option flags
+        $Reserved5   = 0x0000;   // Reserved
+
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("V", $cObj);
+        $data       .= pack("v", $OT);
+        $data       .= pack("v", $id);
+        $data       .= pack("v", $grbit);
+        $data       .= pack("v", $colL);
+        $data       .= pack("v", $dxL);
+        $data       .= pack("v", $rwT);
+        $data       .= pack("v", $dyT);
+        $data       .= pack("v", $colR);
+        $data       .= pack("v", $dxR);
+        $data       .= pack("v", $rwB);
+        $data       .= pack("v", $dyB);
+        $data       .= pack("v", $cbMacro);
+        $data       .= pack("V", $Reserved1);
+        $data       .= pack("v", $Reserved2);
+        $data       .= pack("C", $icvBack);
+        $data       .= pack("C", $icvFore);
+        $data       .= pack("C", $fls);
+        $data       .= pack("C", $fAuto);
+        $data       .= pack("C", $icv);
+        $data       .= pack("C", $lns);
+        $data       .= pack("C", $lnw);
+        $data       .= pack("C", $fAutoB);
+        $data       .= pack("v", $frs);
+        $data       .= pack("V", $cf);
+        $data       .= pack("v", $Reserved3);
+        $data       .= pack("v", $cbPictFmla);
+        $data       .= pack("v", $Reserved4);
+        $data       .= pack("v", $grbit2);
+        $data       .= pack("V", $Reserved5);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Convert a GD-image into the internal format.
+     *
+     * @access private
+     * @param resource $image The image to process
+     * @return array Array with data and properties of the bitmap
+     */
+    public function processBitmapGd($image)
+    {
+        $width = imagesx($image);
+        $height = imagesy($image);
+
+        $data = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
+        for ($j=$height; $j--;) {
+            for ($i=0; $i < $width; ++$i) {
+                $color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
+                foreach (array("red", "green", "blue") as $key) {
+                    $color[$key] = $color[$key] + round((255 - $color[$key]) * $color["alpha"] / 127);
+                }
+                $data .= chr($color["blue"]) . chr($color["green"]) . chr($color["red"]);
+            }
+            if (3*$width % 4) {
+                $data .= str_repeat("\x00", 4 - 3*$width % 4);
+            }
+        }
+
+        return array($width, $height, strlen($data), $data);
+    }
+
+    /**
+     * Convert a 24 bit bitmap into the modified internal format used by Windows.
+     * This is described in BITMAPCOREHEADER and BITMAPCOREINFO structures in the
+     * MSDN library.
+     *
+     * @access private
+     * @param string $bitmap The bitmap to process
+     * @return array Array with data and properties of the bitmap
+     */
+    public function processBitmap($bitmap)
+    {
+        // Open file.
+        $bmp_fd = @fopen($bitmap, "rb");
+        if (!$bmp_fd) {
+            throw new PHPExcel_Writer_Exception("Couldn't import $bitmap");
+        }
+
+        // Slurp the file into a string.
+        $data = fread($bmp_fd, filesize($bitmap));
+
+        // Check that the file is big enough to be a bitmap.
+        if (strlen($data) <= 0x36) {
+            throw new PHPExcel_Writer_Exception("$bitmap doesn't contain enough data.\n");
+        }
+
+        // The first 2 bytes are used to identify the bitmap.
+        $identity = unpack("A2ident", $data);
+        if ($identity['ident'] != "BM") {
+            throw new PHPExcel_Writer_Exception("$bitmap doesn't appear to be a valid bitmap image.\n");
+        }
+
+        // Remove bitmap data: ID.
+        $data = substr($data, 2);
+
+        // Read and remove the bitmap size. This is more reliable than reading
+        // the data size at offset 0x22.
+        //
+        $size_array   = unpack("Vsa", substr($data, 0, 4));
+        $size   = $size_array['sa'];
+        $data   = substr($data, 4);
+        $size  -= 0x36; // Subtract size of bitmap header.
+        $size  += 0x0C; // Add size of BIFF header.
+
+        // Remove bitmap data: reserved, offset, header length.
+        $data = substr($data, 12);
+
+        // Read and remove the bitmap width and height. Verify the sizes.
+        $width_and_height = unpack("V2", substr($data, 0, 8));
+        $width  = $width_and_height[1];
+        $height = $width_and_height[2];
+        $data   = substr($data, 8);
+        if ($width > 0xFFFF) {
+            throw new PHPExcel_Writer_Exception("$bitmap: largest image width supported is 65k.\n");
+        }
+        if ($height > 0xFFFF) {
+            throw new PHPExcel_Writer_Exception("$bitmap: largest image height supported is 65k.\n");
+        }
+
+        // Read and remove the bitmap planes and bpp data. Verify them.
+        $planes_and_bitcount = unpack("v2", substr($data, 0, 4));
+        $data = substr($data, 4);
+        if ($planes_and_bitcount[2] != 24) { // Bitcount
+            throw new PHPExcel_Writer_Exception("$bitmap isn't a 24bit true color bitmap.\n");
+        }
+        if ($planes_and_bitcount[1] != 1) {
+            throw new PHPExcel_Writer_Exception("$bitmap: only 1 plane supported in bitmap image.\n");
+        }
+
+        // Read and remove the bitmap compression. Verify compression.
+        $compression = unpack("Vcomp", substr($data, 0, 4));
+        $data = substr($data, 4);
+
+        //$compression = 0;
+        if ($compression['comp'] != 0) {
+            throw new PHPExcel_Writer_Exception("$bitmap: compression not supported in bitmap image.\n");
+        }
+
+        // Remove bitmap data: data size, hres, vres, colours, imp. colours.
+        $data = substr($data, 20);
+
+        // Add the BITMAPCOREHEADER data
+        $header  = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
+        $data    = $header . $data;
+
+        return (array($width, $height, $size, $data));
+    }
+
+    /**
+     * Store the window zoom factor. This should be a reduced fraction but for
+     * simplicity we will store all fractions with a numerator of 100.
+     */
+    private function writeZoom()
+    {
+        // If scale is 100 we don't need to write a record
+        if ($this->phpSheet->getSheetView()->getZoomScale() == 100) {
+            return;
+        }
+
+        $record      = 0x00A0;               // Record identifier
+        $length      = 0x0004;               // Bytes to follow
+
+        $header      = pack("vv", $record, $length);
+        $data        = pack("vv", $this->phpSheet->getSheetView()->getZoomScale(), 100);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Get Escher object
+     *
+     * @return PHPExcel_Shared_Escher
+     */
+    public function getEscher()
+    {
+        return $this->escher;
+    }
+
+    /**
+     * Set Escher object
+     *
+     * @param PHPExcel_Shared_Escher $pValue
+     */
+    public function setEscher(PHPExcel_Shared_Escher $pValue = null)
+    {
+        $this->escher = $pValue;
+    }
+
+    /**
+     * Write MSODRAWING record
+     */
+    private function writeMsoDrawing()
+    {
+        // write the Escher stream if necessary
+        if (isset($this->escher)) {
+            $writer = new PHPExcel_Writer_Excel5_Escher($this->escher);
+            $data = $writer->close();
+            $spOffsets = $writer->getSpOffsets();
+            $spTypes = $writer->getSpTypes();
+            // write the neccesary MSODRAWING, OBJ records
+
+            // split the Escher stream
+            $spOffsets[0] = 0;
+            $nm = count($spOffsets) - 1; // number of shapes excluding first shape
+            for ($i = 1; $i <= $nm; ++$i) {
+                // MSODRAWING record
+                $record = 0x00EC;            // Record identifier
+
+                // chunk of Escher stream for one shape
+                $dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]);
+
+                $length = strlen($dataChunk);
+                $header = pack("vv", $record, $length);
+
+                $this->append($header . $dataChunk);
+
+                // OBJ record
+                $record = 0x005D; // record identifier
+                $objData = '';
+
+                // ftCmo
+                if ($spTypes[$i] == 0x00C9) {
+                    // Add ftCmo (common object data) subobject
+                    $objData .=
+                        pack(
+                            'vvvvvVVV',
+                            0x0015, // 0x0015 = ftCmo
+                            0x0012, // length of ftCmo data
+                            0x0014, // object type, 0x0014 = filter
+                            $i, // object id number, Excel seems to use 1-based index, local for the sheet
+                            0x2101, // option flags, 0x2001 is what OpenOffice.org uses
+                            0, // reserved
+                            0, // reserved
+                            0  // reserved
+                        );
+
+                    // Add ftSbs Scroll bar subobject
+                    $objData .= pack('vv', 0x00C, 0x0014);
+                    $objData .= pack('H*', '0000000000000000640001000A00000010000100');
+                    // Add ftLbsData (List box data) subobject
+                    $objData .= pack('vv', 0x0013, 0x1FEE);
+                    $objData .= pack('H*', '00000000010001030000020008005700');
+                } else {
+                    // Add ftCmo (common object data) subobject
+                    $objData .=
+                        pack(
+                            'vvvvvVVV',
+                            0x0015, // 0x0015 = ftCmo
+                            0x0012, // length of ftCmo data
+                            0x0008, // object type, 0x0008 = picture
+                            $i, // object id number, Excel seems to use 1-based index, local for the sheet
+                            0x6011, // option flags, 0x6011 is what OpenOffice.org uses
+                            0, // reserved
+                            0, // reserved
+                            0  // reserved
+                        );
+                }
+
+                // ftEnd
+                $objData .=
+                    pack(
+                        'vv',
+                        0x0000, // 0x0000 = ftEnd
+                        0x0000  // length of ftEnd data
+                    );
+
+                $length = strlen($objData);
+                $header = pack('vv', $record, $length);
+                $this->append($header . $objData);
+            }
+        }
+    }
+
+    /**
+     * Store the DATAVALIDATIONS and DATAVALIDATION records.
+     */
+    private function writeDataValidity()
+    {
+        // Datavalidation collection
+        $dataValidationCollection = $this->phpSheet->getDataValidationCollection();
+
+        // Write data validations?
+        if (!empty($dataValidationCollection)) {
+            // DATAVALIDATIONS record
+            $record = 0x01B2;      // Record identifier
+            $length = 0x0012;      // Bytes to follow
+
+            $grbit  = 0x0000;       // Prompt box at cell, no cached validity data at DV records
+            $horPos = 0x00000000;  // Horizontal position of prompt box, if fixed position
+            $verPos = 0x00000000;  // Vertical position of prompt box, if fixed position
+            $objId  = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
+
+            $header = pack('vv', $record, $length);
+            $data   = pack('vVVVV', $grbit, $horPos, $verPos, $objId, count($dataValidationCollection));
+            $this->append($header.$data);
+
+            // DATAVALIDATION records
+            $record = 0x01BE;              // Record identifier
+
+            foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
+                // initialize record data
+                $data = '';
+
+                // options
+                $options = 0x00000000;
+
+                // data type
+                $type = $dataValidation->getType();
+                switch ($type) {
+                    case PHPExcel_Cell_DataValidation::TYPE_NONE:
+                        $type = 0x00;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_WHOLE:
+                        $type = 0x01;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_DECIMAL:
+                        $type = 0x02;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_LIST:
+                        $type = 0x03;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_DATE:
+                        $type = 0x04;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_TIME:
+                        $type = 0x05;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH:
+                        $type = 0x06;
+                        break;
+                    case PHPExcel_Cell_DataValidation::TYPE_CUSTOM:
+                        $type = 0x07;
+                        break;
+                }
+                $options |= $type << 0;
+
+                // error style
+                $errorStyle = $dataValidation->getType();
+                switch ($errorStyle) {
+                    case PHPExcel_Cell_DataValidation::STYLE_STOP:
+                        $errorStyle = 0x00;
+                        break;
+                    case PHPExcel_Cell_DataValidation::STYLE_WARNING:
+                        $errorStyle = 0x01;
+                        break;
+                    case PHPExcel_Cell_DataValidation::STYLE_INFORMATION:
+                        $errorStyle = 0x02;
+                        break;
+                }
+                $options |= $errorStyle << 4;
+
+                // explicit formula?
+                if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) {
+                    $options |= 0x01 << 7;
+                }
+
+                // empty cells allowed
+                $options |= $dataValidation->getAllowBlank() << 8;
+
+                // show drop down
+                $options |= (!$dataValidation->getShowDropDown()) << 9;
+
+                // show input message
+                $options |= $dataValidation->getShowInputMessage() << 18;
+
+                // show error message
+                $options |= $dataValidation->getShowErrorMessage() << 19;
+
+                // condition operator
+                $operator = $dataValidation->getOperator();
+                switch ($operator) {
+                    case PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN:
+                        $operator = 0x00;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN:
+                        $operator = 0x01;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_EQUAL:
+                        $operator = 0x02;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL:
+                        $operator = 0x03;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN:
+                        $operator = 0x04;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN:
+                        $operator = 0x05;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL:
+                        $operator = 0x06;
+                        break;
+                    case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL:
+                        $operator = 0x07;
+                        break;
+                }
+                $options |= $operator << 20;
+
+                $data        = pack('V', $options);
+
+                // prompt title
+                $promptTitle = $dataValidation->getPromptTitle() !== '' ?
+                    $dataValidation->getPromptTitle() : chr(0);
+                $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($promptTitle);
+
+                // error title
+                $errorTitle = $dataValidation->getErrorTitle() !== '' ?
+                    $dataValidation->getErrorTitle() : chr(0);
+                $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($errorTitle);
+
+                // prompt text
+                $prompt = $dataValidation->getPrompt() !== '' ?
+                    $dataValidation->getPrompt() : chr(0);
+                $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($prompt);
+
+                // error text
+                $error = $dataValidation->getError() !== '' ?
+                    $dataValidation->getError() : chr(0);
+                $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($error);
+
+                // formula 1
+                try {
+                    $formula1 = $dataValidation->getFormula1();
+                    if ($type == 0x03) { // list type
+                        $formula1 = str_replace(',', chr(0), $formula1);
+                    }
+                    $this->parser->parse($formula1);
+                    $formula1 = $this->parser->toReversePolish();
+                    $sz1 = strlen($formula1);
+                } catch (PHPExcel_Exception $e) {
+                    $sz1 = 0;
+                    $formula1 = '';
+                }
+                $data .= pack('vv', $sz1, 0x0000);
+                $data .= $formula1;
+
+                // formula 2
+                try {
+                    $formula2 = $dataValidation->getFormula2();
+                    if ($formula2 === '') {
+                        throw new PHPExcel_Writer_Exception('No formula2');
+                    }
+                    $this->parser->parse($formula2);
+                    $formula2 = $this->parser->toReversePolish();
+                    $sz2 = strlen($formula2);
+                } catch (PHPExcel_Exception $e) {
+                    $sz2 = 0;
+                    $formula2 = '';
+                }
+                $data .= pack('vv', $sz2, 0x0000);
+                $data .= $formula2;
+
+                // cell range address list
+                $data .= pack('v', 0x0001);
+                $data .= $this->writeBIFF8CellRangeAddressFixed($cellCoordinate);
+
+                $length = strlen($data);
+                $header = pack("vv", $record, $length);
+
+                $this->append($header . $data);
+            }
+        }
+    }
+
+    /**
+     * Map Error code
+     *
+     * @param string $errorCode
+     * @return int
+     */
+    private static function mapErrorCode($errorCode)
+    {
+        switch ($errorCode) {
+            case '#NULL!':
+                return 0x00;
+            case '#DIV/0!':
+                return 0x07;
+            case '#VALUE!':
+                return 0x0F;
+            case '#REF!':
+                return 0x17;
+            case '#NAME?':
+                return 0x1D;
+            case '#NUM!':
+                return 0x24;
+            case '#N/A':
+                return 0x2A;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Write PLV Record
+     */
+    private function writePageLayoutView()
+    {
+        $record      = 0x088B;               // Record identifier
+        $length      = 0x0010;               // Bytes to follow
+
+        $rt         = 0x088B; // 2
+        $grbitFrt   = 0x0000; // 2
+        $reserved   = 0x0000000000000000; // 8
+        $wScalvePLV = $this->phpSheet->getSheetView()->getZoomScale(); // 2
+
+        // The options flags that comprise $grbit
+        if ($this->phpSheet->getSheetView()->getView() == PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT) {
+            $fPageLayoutView   = 1;
+        } else {
+            $fPageLayoutView   = 0;
+        }
+        $fRulerVisible     = 0;
+        $fWhitespaceHidden = 0;
+
+        $grbit      = $fPageLayoutView; // 2
+        $grbit        |= $fRulerVisible       << 1;
+        $grbit        |= $fWhitespaceHidden  << 3;
+
+        $header      = pack("vv", $record, $length);
+        $data      = pack("vvVVvv", $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write CFRule Record
+     * @param PHPExcel_Style_Conditional $conditional
+     */
+    private function writeCFRule(PHPExcel_Style_Conditional $conditional)
+    {
+        $record      = 0x01B1;               // Record identifier
+
+        // $type : Type of the CF
+        // $operatorType : Comparison operator
+        if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) {
+            $type = 0x02;
+            $operatorType = 0x00;
+        } elseif ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS) {
+            $type = 0x01;
+
+            switch ($conditional->getOperatorType()) {
+                case PHPExcel_Style_Conditional::OPERATOR_NONE:
+                    $operatorType = 0x00;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_EQUAL:
+                    $operatorType = 0x03;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_GREATERTHAN:
+                    $operatorType = 0x05;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_GREATERTHANOREQUAL:
+                    $operatorType = 0x07;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_LESSTHAN:
+                    $operatorType = 0x06;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_LESSTHANOREQUAL:
+                    $operatorType = 0x08;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_NOTEQUAL:
+                    $operatorType = 0x04;
+                    break;
+                case PHPExcel_Style_Conditional::OPERATOR_BETWEEN:
+                    $operatorType = 0x01;
+                    break;
+                    // not OPERATOR_NOTBETWEEN 0x02
+            }
+        }
+
+        // $szValue1 : size of the formula data for first value or formula
+        // $szValue2 : size of the formula data for second value or formula
+        $arrConditions = $conditional->getConditions();
+        $numConditions = sizeof($arrConditions);
+        if ($numConditions == 1) {
+            $szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
+            $szValue2 = 0x0000;
+            $operand1 = pack('Cv', 0x1E, $arrConditions[0]);
+            $operand2 = null;
+        } elseif ($numConditions == 2 && ($conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BETWEEN)) {
+            $szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
+            $szValue2 = ($arrConditions[1] <= 65535 ? 3 : 0x0000);
+            $operand1 = pack('Cv', 0x1E, $arrConditions[0]);
+            $operand2 = pack('Cv', 0x1E, $arrConditions[1]);
+        } else {
+            $szValue1 = 0x0000;
+            $szValue2 = 0x0000;
+            $operand1 = null;
+            $operand2 = null;
+        }
+
+        // $flags : Option flags
+        // Alignment
+        $bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() == null ? 1 : 0);
+        $bAlignVt = ($conditional->getStyle()->getAlignment()->getVertical() == null ? 1 : 0);
+        $bAlignWrapTx = ($conditional->getStyle()->getAlignment()->getWrapText() == false ? 1 : 0);
+        $bTxRotation = ($conditional->getStyle()->getAlignment()->getTextRotation() == null ? 1 : 0);
+        $bIndent = ($conditional->getStyle()->getAlignment()->getIndent() == 0 ? 1 : 0);
+        $bShrinkToFit = ($conditional->getStyle()->getAlignment()->getShrinkToFit() == false ? 1 : 0);
+        if ($bAlignHz == 0 || $bAlignVt == 0 || $bAlignWrapTx == 0 || $bTxRotation == 0 || $bIndent == 0 || $bShrinkToFit == 0) {
+            $bFormatAlign = 1;
+        } else {
+            $bFormatAlign = 0;
+        }
+        // Protection
+        $bProtLocked = ($conditional->getStyle()->getProtection()->getLocked() == null ? 1 : 0);
+        $bProtHidden = ($conditional->getStyle()->getProtection()->getHidden() == null ? 1 : 0);
+        if ($bProtLocked == 0 || $bProtHidden == 0) {
+            $bFormatProt = 1;
+        } else {
+            $bFormatProt = 0;
+        }
+        // Border
+        $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
+                        && $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
+        $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
+                        && $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
+        $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
+                        && $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
+        $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
+                        && $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
+        if ($bBorderLeft == 0 || $bBorderRight == 0 || $bBorderTop == 0 || $bBorderBottom == 0) {
+            $bFormatBorder = 1;
+        } else {
+            $bFormatBorder = 0;
+        }
+        // Pattern
+        $bFillStyle = ($conditional->getStyle()->getFill()->getFillType() == null ? 0 : 1);
+        $bFillColor = ($conditional->getStyle()->getFill()->getStartColor()->getARGB() == null ? 0 : 1);
+        $bFillColorBg = ($conditional->getStyle()->getFill()->getEndColor()->getARGB() == null ? 0 : 1);
+        if ($bFillStyle == 0 || $bFillColor == 0 || $bFillColorBg == 0) {
+            $bFormatFill = 1;
+        } else {
+            $bFormatFill = 0;
+        }
+        // Font
+        if ($conditional->getStyle()->getFont()->getName() != null
+            || $conditional->getStyle()->getFont()->getSize() != null
+            || $conditional->getStyle()->getFont()->getBold() != null
+            || $conditional->getStyle()->getFont()->getItalic() != null
+            || $conditional->getStyle()->getFont()->getSuperScript() != null
+            || $conditional->getStyle()->getFont()->getSubScript() != null
+            || $conditional->getStyle()->getFont()->getUnderline() != null
+            || $conditional->getStyle()->getFont()->getStrikethrough() != null
+            || $conditional->getStyle()->getFont()->getColor()->getARGB() != null) {
+            $bFormatFont = 1;
+        } else {
+            $bFormatFont = 0;
+        }
+        // Alignment
+        $flags = 0;
+        $flags |= (1 == $bAlignHz      ? 0x00000001 : 0);
+        $flags |= (1 == $bAlignVt      ? 0x00000002 : 0);
+        $flags |= (1 == $bAlignWrapTx  ? 0x00000004 : 0);
+        $flags |= (1 == $bTxRotation   ? 0x00000008 : 0);
+        // Justify last line flag
+        $flags |= (1 == 1              ? 0x00000010 : 0);
+        $flags |= (1 == $bIndent       ? 0x00000020 : 0);
+        $flags |= (1 == $bShrinkToFit  ? 0x00000040 : 0);
+        // Default
+        $flags |= (1 == 1              ? 0x00000080 : 0);
+        // Protection
+        $flags |= (1 == $bProtLocked   ? 0x00000100 : 0);
+        $flags |= (1 == $bProtHidden   ? 0x00000200 : 0);
+        // Border
+        $flags |= (1 == $bBorderLeft   ? 0x00000400 : 0);
+        $flags |= (1 == $bBorderRight  ? 0x00000800 : 0);
+        $flags |= (1 == $bBorderTop    ? 0x00001000 : 0);
+        $flags |= (1 == $bBorderBottom ? 0x00002000 : 0);
+        $flags |= (1 == 1              ? 0x00004000 : 0); // Top left to Bottom right border
+        $flags |= (1 == 1              ? 0x00008000 : 0); // Bottom left to Top right border
+        // Pattern
+        $flags |= (1 == $bFillStyle    ? 0x00010000 : 0);
+        $flags |= (1 == $bFillColor    ? 0x00020000 : 0);
+        $flags |= (1 == $bFillColorBg  ? 0x00040000 : 0);
+        $flags |= (1 == 1              ? 0x00380000 : 0);
+        // Font
+        $flags |= (1 == $bFormatFont   ? 0x04000000 : 0);
+        // Alignment:
+        $flags |= (1 == $bFormatAlign  ? 0x08000000 : 0);
+        // Border
+        $flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
+        // Pattern
+        $flags |= (1 == $bFormatFill   ? 0x20000000 : 0);
+        // Protection
+        $flags |= (1 == $bFormatProt   ? 0x40000000 : 0);
+        // Text direction
+        $flags |= (1 == 0              ? 0x80000000 : 0);
+
+        // Data Blocks
+        if ($bFormatFont == 1) {
+            // Font Name
+            if ($conditional->getStyle()->getFont()->getName() == null) {
+                $dataBlockFont =  pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
+                $dataBlockFont .= pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
+            } else {
+                $dataBlockFont = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
+            }
+            // Font Size
+            if ($conditional->getStyle()->getFont()->getSize() == null) {
+                $dataBlockFont .= pack('V', 20 * 11);
+            } else {
+                $dataBlockFont .= pack('V', 20 * $conditional->getStyle()->getFont()->getSize());
+            }
+            // Font Options
+            $dataBlockFont .= pack('V', 0);
+            // Font weight
+            if ($conditional->getStyle()->getFont()->getBold() == true) {
+                $dataBlockFont .= pack('v', 0x02BC);
+            } else {
+                $dataBlockFont .= pack('v', 0x0190);
+            }
+            // Escapement type
+            if ($conditional->getStyle()->getFont()->getSubScript() == true) {
+                $dataBlockFont .= pack('v', 0x02);
+                $fontEscapement = 0;
+            } elseif ($conditional->getStyle()->getFont()->getSuperScript() == true) {
+                $dataBlockFont .= pack('v', 0x01);
+                $fontEscapement = 0;
+            } else {
+                $dataBlockFont .= pack('v', 0x00);
+                $fontEscapement = 1;
+            }
+            // Underline type
+            switch ($conditional->getStyle()->getFont()->getUnderline()) {
+                case PHPExcel_Style_Font::UNDERLINE_NONE:
+                    $dataBlockFont .= pack('C', 0x00);
+                    $fontUnderline = 0;
+                    break;
+                case PHPExcel_Style_Font::UNDERLINE_DOUBLE:
+                    $dataBlockFont .= pack('C', 0x02);
+                    $fontUnderline = 0;
+                    break;
+                case PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING:
+                    $dataBlockFont .= pack('C', 0x22);
+                    $fontUnderline = 0;
+                    break;
+                case PHPExcel_Style_Font::UNDERLINE_SINGLE:
+                    $dataBlockFont .= pack('C', 0x01);
+                    $fontUnderline = 0;
+                    break;
+                case PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING:
+                    $dataBlockFont .= pack('C', 0x21);
+                    $fontUnderline = 0;
+                    break;
+                default: $dataBlockFont .= pack('C', 0x00);
+                    $fontUnderline = 1;
+                    break;
+            }
+            // Not used (3)
+            $dataBlockFont .= pack('vC', 0x0000, 0x00);
+            // Font color index
+            switch ($conditional->getStyle()->getFont()->getColor()->getRGB()) {
+                case '000000':
+                    $colorIdx = 0x08;
+                    break;
+                case 'FFFFFF':
+                    $colorIdx = 0x09;
+                    break;
+                case 'FF0000':
+                    $colorIdx = 0x0A;
+                    break;
+                case '00FF00':
+                    $colorIdx = 0x0B;
+                    break;
+                case '0000FF':
+                    $colorIdx = 0x0C;
+                    break;
+                case 'FFFF00':
+                    $colorIdx = 0x0D;
+                    break;
+                case 'FF00FF':
+                    $colorIdx = 0x0E;
+                    break;
+                case '00FFFF':
+                    $colorIdx = 0x0F;
+                    break;
+                case '800000':
+                    $colorIdx = 0x10;
+                    break;
+                case '008000':
+                    $colorIdx = 0x11;
+                    break;
+                case '000080':
+                    $colorIdx = 0x12;
+                    break;
+                case '808000':
+                    $colorIdx = 0x13;
+                    break;
+                case '800080':
+                    $colorIdx = 0x14;
+                    break;
+                case '008080':
+                    $colorIdx = 0x15;
+                    break;
+                case 'C0C0C0':
+                    $colorIdx = 0x16;
+                    break;
+                case '808080':
+                    $colorIdx = 0x17;
+                    break;
+                case '9999FF':
+                    $colorIdx = 0x18;
+                    break;
+                case '993366':
+                    $colorIdx = 0x19;
+                    break;
+                case 'FFFFCC':
+                    $colorIdx = 0x1A;
+                    break;
+                case 'CCFFFF':
+                    $colorIdx = 0x1B;
+                    break;
+                case '660066':
+                    $colorIdx = 0x1C;
+                    break;
+                case 'FF8080':
+                    $colorIdx = 0x1D;
+                    break;
+                case '0066CC':
+                    $colorIdx = 0x1E;
+                    break;
+                case 'CCCCFF':
+                    $colorIdx = 0x1F;
+                    break;
+                case '000080':
+                    $colorIdx = 0x20;
+                    break;
+                case 'FF00FF':
+                    $colorIdx = 0x21;
+                    break;
+                case 'FFFF00':
+                    $colorIdx = 0x22;
+                    break;
+                case '00FFFF':
+                    $colorIdx = 0x23;
+                    break;
+                case '800080':
+                    $colorIdx = 0x24;
+                    break;
+                case '800000':
+                    $colorIdx = 0x25;
+                    break;
+                case '008080':
+                    $colorIdx = 0x26;
+                    break;
+                case '0000FF':
+                    $colorIdx = 0x27;
+                    break;
+                case '00CCFF':
+                    $colorIdx = 0x28;
+                    break;
+                case 'CCFFFF':
+                    $colorIdx = 0x29;
+                    break;
+                case 'CCFFCC':
+                    $colorIdx = 0x2A;
+                    break;
+                case 'FFFF99':
+                    $colorIdx = 0x2B;
+                    break;
+                case '99CCFF':
+                    $colorIdx = 0x2C;
+                    break;
+                case 'FF99CC':
+                    $colorIdx = 0x2D;
+                    break;
+                case 'CC99FF':
+                    $colorIdx = 0x2E;
+                    break;
+                case 'FFCC99':
+                    $colorIdx = 0x2F;
+                    break;
+                case '3366FF':
+                    $colorIdx = 0x30;
+                    break;
+                case '33CCCC':
+                    $colorIdx = 0x31;
+                    break;
+                case '99CC00':
+                    $colorIdx = 0x32;
+                    break;
+                case 'FFCC00':
+                    $colorIdx = 0x33;
+                    break;
+                case 'FF9900':
+                    $colorIdx = 0x34;
+                    break;
+                case 'FF6600':
+                    $colorIdx = 0x35;
+                    break;
+                case '666699':
+                    $colorIdx = 0x36;
+                    break;
+                case '969696':
+                    $colorIdx = 0x37;
+                    break;
+                case '003366':
+                    $colorIdx = 0x38;
+                    break;
+                case '339966':
+                    $colorIdx = 0x39;
+                    break;
+                case '003300':
+                    $colorIdx = 0x3A;
+                    break;
+                case '333300':
+                    $colorIdx = 0x3B;
+                    break;
+                case '993300':
+                    $colorIdx = 0x3C;
+                    break;
+                case '993366':
+                    $colorIdx = 0x3D;
+                    break;
+                case '333399':
+                    $colorIdx = 0x3E;
+                    break;
+                case '333333':
+                    $colorIdx = 0x3F;
+                    break;
+                default:
+                    $colorIdx = 0x00;
+                    break;
+            }
+            $dataBlockFont .= pack('V', $colorIdx);
+            // Not used (4)
+            $dataBlockFont .= pack('V', 0x00000000);
+            // Options flags for modified font attributes
+            $optionsFlags = 0;
+            $optionsFlagsBold = ($conditional->getStyle()->getFont()->getBold() == null ? 1 : 0);
+            $optionsFlags |= (1 == $optionsFlagsBold  ? 0x00000002 : 0);
+            $optionsFlags |= (1 == 1                  ? 0x00000008 : 0);
+            $optionsFlags |= (1 == 1                  ? 0x00000010 : 0);
+            $optionsFlags |= (1 == 0                  ? 0x00000020 : 0);
+            $optionsFlags |= (1 == 1                  ? 0x00000080 : 0);
+            $dataBlockFont .= pack('V', $optionsFlags);
+            // Escapement type
+            $dataBlockFont .= pack('V', $fontEscapement);
+            // Underline type
+            $dataBlockFont .= pack('V', $fontUnderline);
+            // Always
+            $dataBlockFont .= pack('V', 0x00000000);
+            // Always
+            $dataBlockFont .= pack('V', 0x00000000);
+            // Not used (8)
+            $dataBlockFont .= pack('VV', 0x00000000, 0x00000000);
+            // Always
+            $dataBlockFont .= pack('v', 0x0001);
+        }
+        if ($bFormatAlign == 1) {
+            $blockAlign = 0;
+            // Alignment and text break
+            switch ($conditional->getStyle()->getAlignment()->getHorizontal()) {
+                case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL:
+                    $blockAlign = 0;
+                    break;
+                case PHPExcel_Style_Alignment::HORIZONTAL_LEFT:
+                    $blockAlign = 1;
+                    break;
+                case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT:
+                    $blockAlign = 3;
+                    break;
+                case PHPExcel_Style_Alignment::HORIZONTAL_CENTER:
+                    $blockAlign = 2;
+                    break;
+                case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS:
+                    $blockAlign = 6;
+                    break;
+                case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY:
+                    $blockAlign = 5;
+                    break;
+            }
+            if ($conditional->getStyle()->getAlignment()->getWrapText() == true) {
+                $blockAlign |= 1 << 3;
+            } else {
+                $blockAlign |= 0 << 3;
+            }
+            switch ($conditional->getStyle()->getAlignment()->getVertical()) {
+                case PHPExcel_Style_Alignment::VERTICAL_BOTTOM:
+                    $blockAlign = 2 << 4;
+                    break;
+                case PHPExcel_Style_Alignment::VERTICAL_TOP:
+                    $blockAlign = 0 << 4;
+                    break;
+                case PHPExcel_Style_Alignment::VERTICAL_CENTER:
+                    $blockAlign = 1 << 4;
+                    break;
+                case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY:
+                    $blockAlign = 3 << 4;
+                    break;
+            }
+            $blockAlign |= 0 << 7;
+
+            // Text rotation angle
+            $blockRotation = $conditional->getStyle()->getAlignment()->getTextRotation();
+
+            // Indentation
+            $blockIndent = $conditional->getStyle()->getAlignment()->getIndent();
+            if ($conditional->getStyle()->getAlignment()->getShrinkToFit() == true) {
+                $blockIndent |= 1 << 4;
+            } else {
+                $blockIndent |= 0 << 4;
+            }
+            $blockIndent |= 0 << 6;
+
+            // Relative indentation
+            $blockIndentRelative = 255;
+
+            $dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000);
+        }
+        if ($bFormatBorder == 1) {
+            $blockLineStyle = 0;
+            switch ($conditional->getStyle()->getBorders()->getLeft()->getBorderStyle()) {
+                case PHPExcel_Style_Border::BORDER_NONE:
+                    $blockLineStyle |= 0x00;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THIN:
+                    $blockLineStyle |= 0x01;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUM:
+                    $blockLineStyle |= 0x02;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHED:
+                    $blockLineStyle |= 0x03;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOTTED:
+                    $blockLineStyle |= 0x04;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THICK:
+                    $blockLineStyle |= 0x05;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOUBLE:
+                    $blockLineStyle |= 0x06;
+                    break;
+                case PHPExcel_Style_Border::BORDER_HAIR:
+                    $blockLineStyle |= 0x07;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:
+                    $blockLineStyle |= 0x08;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOT:
+                    $blockLineStyle |= 0x09;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:
+                    $blockLineStyle |= 0x0A;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOTDOT:
+                    $blockLineStyle |= 0x0B;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:
+                    $blockLineStyle |= 0x0C;
+                    break;
+                case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:
+                    $blockLineStyle |= 0x0D;
+                    break;
+            }
+            switch ($conditional->getStyle()->getBorders()->getRight()->getBorderStyle()) {
+                case PHPExcel_Style_Border::BORDER_NONE:
+                    $blockLineStyle |= 0x00 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THIN:
+                    $blockLineStyle |= 0x01 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUM:
+                    $blockLineStyle |= 0x02 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHED:
+                    $blockLineStyle |= 0x03 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOTTED:
+                    $blockLineStyle |= 0x04 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THICK:
+                    $blockLineStyle |= 0x05 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOUBLE:
+                    $blockLineStyle |= 0x06 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_HAIR:
+                    $blockLineStyle |= 0x07 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:
+                    $blockLineStyle |= 0x08 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOT:
+                    $blockLineStyle |= 0x09 << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:
+                    $blockLineStyle |= 0x0A << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOTDOT:
+                    $blockLineStyle |= 0x0B << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:
+                    $blockLineStyle |= 0x0C << 4;
+                    break;
+                case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:
+                    $blockLineStyle |= 0x0D << 4;
+                    break;
+            }
+            switch ($conditional->getStyle()->getBorders()->getTop()->getBorderStyle()) {
+                case PHPExcel_Style_Border::BORDER_NONE:
+                    $blockLineStyle |= 0x00 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THIN:
+                    $blockLineStyle |= 0x01 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUM:
+                    $blockLineStyle |= 0x02 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHED:
+                    $blockLineStyle |= 0x03 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOTTED:
+                    $blockLineStyle |= 0x04 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THICK:
+                    $blockLineStyle |= 0x05 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOUBLE:
+                    $blockLineStyle |= 0x06 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_HAIR:
+                    $blockLineStyle |= 0x07 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:
+                    $blockLineStyle |= 0x08 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOT:
+                    $blockLineStyle |= 0x09 << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:
+                    $blockLineStyle |= 0x0A << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOTDOT:
+                    $blockLineStyle |= 0x0B << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:
+                    $blockLineStyle |= 0x0C << 8;
+                    break;
+                case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:
+                    $blockLineStyle |= 0x0D << 8;
+                    break;
+            }
+            switch ($conditional->getStyle()->getBorders()->getBottom()->getBorderStyle()) {
+                case PHPExcel_Style_Border::BORDER_NONE:
+                    $blockLineStyle |= 0x00 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THIN:
+                    $blockLineStyle |= 0x01 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUM:
+                    $blockLineStyle |= 0x02 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHED:
+                    $blockLineStyle |= 0x03 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOTTED:
+                    $blockLineStyle |= 0x04 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THICK:
+                    $blockLineStyle |= 0x05 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOUBLE:
+                    $blockLineStyle |= 0x06 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_HAIR:
+                    $blockLineStyle |= 0x07 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:
+                    $blockLineStyle |= 0x08 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOT:
+                    $blockLineStyle |= 0x09 << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:
+                    $blockLineStyle |= 0x0A << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOTDOT:
+                    $blockLineStyle |= 0x0B << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:
+                    $blockLineStyle |= 0x0C << 12;
+                    break;
+                case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:
+                    $blockLineStyle |= 0x0D << 12;
+                    break;
+            }
+            //@todo writeCFRule() => $blockLineStyle => Index Color for left line
+            //@todo writeCFRule() => $blockLineStyle => Index Color for right line
+            //@todo writeCFRule() => $blockLineStyle => Top-left to bottom-right on/off
+            //@todo writeCFRule() => $blockLineStyle => Bottom-left to top-right on/off
+            $blockColor = 0;
+            //@todo writeCFRule() => $blockColor => Index Color for top line
+            //@todo writeCFRule() => $blockColor => Index Color for bottom line
+            //@todo writeCFRule() => $blockColor => Index Color for diagonal line
+            switch ($conditional->getStyle()->getBorders()->getDiagonal()->getBorderStyle()) {
+                case PHPExcel_Style_Border::BORDER_NONE:
+                    $blockColor |= 0x00 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THIN:
+                    $blockColor |= 0x01 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUM:
+                    $blockColor |= 0x02 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHED:
+                    $blockColor |= 0x03 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOTTED:
+                    $blockColor |= 0x04 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_THICK:
+                    $blockColor |= 0x05 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DOUBLE:
+                    $blockColor |= 0x06 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_HAIR:
+                    $blockColor |= 0x07 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:
+                    $blockColor |= 0x08 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOT:
+                    $blockColor |= 0x09 << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:
+                    $blockColor |= 0x0A << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_DASHDOTDOT:
+                    $blockColor |= 0x0B << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:
+                    $blockColor |= 0x0C << 21;
+                    break;
+                case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:
+                    $blockColor |= 0x0D << 21;
+                    break;
+            }
+            $dataBlockBorder = pack('vv', $blockLineStyle, $blockColor);
+        }
+        if ($bFormatFill == 1) {
+            // Fill Patern Style
+            $blockFillPatternStyle = 0;
+            switch ($conditional->getStyle()->getFill()->getFillType()) {
+                case PHPExcel_Style_Fill::FILL_NONE:
+                    $blockFillPatternStyle = 0x00;
+                    break;
+                case PHPExcel_Style_Fill::FILL_SOLID:
+                    $blockFillPatternStyle = 0x01;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY:
+                    $blockFillPatternStyle = 0x02;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY:
+                    $blockFillPatternStyle = 0x03;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY:
+                    $blockFillPatternStyle = 0x04;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL:
+                    $blockFillPatternStyle = 0x05;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL:
+                    $blockFillPatternStyle = 0x06;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN:
+                    $blockFillPatternStyle = 0x07;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKUP:
+                    $blockFillPatternStyle = 0x08;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID:
+                    $blockFillPatternStyle = 0x09;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS:
+                    $blockFillPatternStyle = 0x0A;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL:
+                    $blockFillPatternStyle = 0x0B;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL:
+                    $blockFillPatternStyle = 0x0C;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN:
+                    $blockFillPatternStyle = 0x0D;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP:
+                    $blockFillPatternStyle = 0x0E;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID:
+                    $blockFillPatternStyle = 0x0F;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS:
+                    $blockFillPatternStyle = 0x10;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_GRAY125:
+                    $blockFillPatternStyle = 0x11;
+                    break;
+                case PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625:
+                    $blockFillPatternStyle = 0x12;
+                    break;
+                case PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR:
+                    $blockFillPatternStyle = 0x00;
+                    break;    // does not exist in BIFF8
+                case PHPExcel_Style_Fill::FILL_GRADIENT_PATH:
+                    $blockFillPatternStyle = 0x00;
+                    break;    // does not exist in BIFF8
+                default:
+                    $blockFillPatternStyle = 0x00;
+                    break;
+            }
+            // Color
+            switch ($conditional->getStyle()->getFill()->getStartColor()->getRGB()) {
+                case '000000':
+                    $colorIdxBg = 0x08;
+                    break;
+                case 'FFFFFF':
+                    $colorIdxBg = 0x09;
+                    break;
+                case 'FF0000':
+                    $colorIdxBg = 0x0A;
+                    break;
+                case '00FF00':
+                    $colorIdxBg = 0x0B;
+                    break;
+                case '0000FF':
+                    $colorIdxBg = 0x0C;
+                    break;
+                case 'FFFF00':
+                    $colorIdxBg = 0x0D;
+                    break;
+                case 'FF00FF':
+                    $colorIdxBg = 0x0E;
+                    break;
+                case '00FFFF':
+                    $colorIdxBg = 0x0F;
+                    break;
+                case '800000':
+                    $colorIdxBg = 0x10;
+                    break;
+                case '008000':
+                    $colorIdxBg = 0x11;
+                    break;
+                case '000080':
+                    $colorIdxBg = 0x12;
+                    break;
+                case '808000':
+                    $colorIdxBg = 0x13;
+                    break;
+                case '800080':
+                    $colorIdxBg = 0x14;
+                    break;
+                case '008080':
+                    $colorIdxBg = 0x15;
+                    break;
+                case 'C0C0C0':
+                    $colorIdxBg = 0x16;
+                    break;
+                case '808080':
+                    $colorIdxBg = 0x17;
+                    break;
+                case '9999FF':
+                    $colorIdxBg = 0x18;
+                    break;
+                case '993366':
+                    $colorIdxBg = 0x19;
+                    break;
+                case 'FFFFCC':
+                    $colorIdxBg = 0x1A;
+                    break;
+                case 'CCFFFF':
+                    $colorIdxBg = 0x1B;
+                    break;
+                case '660066':
+                    $colorIdxBg = 0x1C;
+                    break;
+                case 'FF8080':
+                    $colorIdxBg = 0x1D;
+                    break;
+                case '0066CC':
+                    $colorIdxBg = 0x1E;
+                    break;
+                case 'CCCCFF':
+                    $colorIdxBg = 0x1F;
+                    break;
+                case '000080':
+                    $colorIdxBg = 0x20;
+                    break;
+                case 'FF00FF':
+                    $colorIdxBg = 0x21;
+                    break;
+                case 'FFFF00':
+                    $colorIdxBg = 0x22;
+                    break;
+                case '00FFFF':
+                    $colorIdxBg = 0x23;
+                    break;
+                case '800080':
+                    $colorIdxBg = 0x24;
+                    break;
+                case '800000':
+                    $colorIdxBg = 0x25;
+                    break;
+                case '008080':
+                    $colorIdxBg = 0x26;
+                    break;
+                case '0000FF':
+                    $colorIdxBg = 0x27;
+                    break;
+                case '00CCFF':
+                    $colorIdxBg = 0x28;
+                    break;
+                case 'CCFFFF':
+                    $colorIdxBg = 0x29;
+                    break;
+                case 'CCFFCC':
+                    $colorIdxBg = 0x2A;
+                    break;
+                case 'FFFF99':
+                    $colorIdxBg = 0x2B;
+                    break;
+                case '99CCFF':
+                    $colorIdxBg = 0x2C;
+                    break;
+                case 'FF99CC':
+                    $colorIdxBg = 0x2D;
+                    break;
+                case 'CC99FF':
+                    $colorIdxBg = 0x2E;
+                    break;
+                case 'FFCC99':
+                    $colorIdxBg = 0x2F;
+                    break;
+                case '3366FF':
+                    $colorIdxBg = 0x30;
+                    break;
+                case '33CCCC':
+                    $colorIdxBg = 0x31;
+                    break;
+                case '99CC00':
+                    $colorIdxBg = 0x32;
+                    break;
+                case 'FFCC00':
+                    $colorIdxBg = 0x33;
+                    break;
+                case 'FF9900':
+                    $colorIdxBg = 0x34;
+                    break;
+                case 'FF6600':
+                    $colorIdxBg = 0x35;
+                    break;
+                case '666699':
+                    $colorIdxBg = 0x36;
+                    break;
+                case '969696':
+                    $colorIdxBg = 0x37;
+                    break;
+                case '003366':
+                    $colorIdxBg = 0x38;
+                    break;
+                case '339966':
+                    $colorIdxBg = 0x39;
+                    break;
+                case '003300':
+                    $colorIdxBg = 0x3A;
+                    break;
+                case '333300':
+                    $colorIdxBg = 0x3B;
+                    break;
+                case '993300':
+                    $colorIdxBg = 0x3C;
+                    break;
+                case '993366':
+                    $colorIdxBg = 0x3D;
+                    break;
+                case '333399':
+                    $colorIdxBg = 0x3E;
+                    break;
+                case '333333':
+                    $colorIdxBg = 0x3F;
+                    break;
+                default:
+                          $colorIdxBg = 0x41;
+                    break;
+            }
+            // Fg Color
+            switch ($conditional->getStyle()->getFill()->getEndColor()->getRGB()) {
+                case '000000':
+                    $colorIdxFg = 0x08;
+                    break;
+                case 'FFFFFF':
+                    $colorIdxFg = 0x09;
+                    break;
+                case 'FF0000':
+                    $colorIdxFg = 0x0A;
+                    break;
+                case '00FF00':
+                    $colorIdxFg = 0x0B;
+                    break;
+                case '0000FF':
+                    $colorIdxFg = 0x0C;
+                    break;
+                case 'FFFF00':
+                    $colorIdxFg = 0x0D;
+                    break;
+                case 'FF00FF':
+                    $colorIdxFg = 0x0E;
+                    break;
+                case '00FFFF':
+                    $colorIdxFg = 0x0F;
+                    break;
+                case '800000':
+                    $colorIdxFg = 0x10;
+                    break;
+                case '008000':
+                    $colorIdxFg = 0x11;
+                    break;
+                case '000080':
+                    $colorIdxFg = 0x12;
+                    break;
+                case '808000':
+                    $colorIdxFg = 0x13;
+                    break;
+                case '800080':
+                    $colorIdxFg = 0x14;
+                    break;
+                case '008080':
+                    $colorIdxFg = 0x15;
+                    break;
+                case 'C0C0C0':
+                    $colorIdxFg = 0x16;
+                    break;
+                case '808080':
+                    $colorIdxFg = 0x17;
+                    break;
+                case '9999FF':
+                    $colorIdxFg = 0x18;
+                    break;
+                case '993366':
+                    $colorIdxFg = 0x19;
+                    break;
+                case 'FFFFCC':
+                    $colorIdxFg = 0x1A;
+                    break;
+                case 'CCFFFF':
+                    $colorIdxFg = 0x1B;
+                    break;
+                case '660066':
+                    $colorIdxFg = 0x1C;
+                    break;
+                case 'FF8080':
+                    $colorIdxFg = 0x1D;
+                    break;
+                case '0066CC':
+                    $colorIdxFg = 0x1E;
+                    break;
+                case 'CCCCFF':
+                    $colorIdxFg = 0x1F;
+                    break;
+                case '000080':
+                    $colorIdxFg = 0x20;
+                    break;
+                case 'FF00FF':
+                    $colorIdxFg = 0x21;
+                    break;
+                case 'FFFF00':
+                    $colorIdxFg = 0x22;
+                    break;
+                case '00FFFF':
+                    $colorIdxFg = 0x23;
+                    break;
+                case '800080':
+                    $colorIdxFg = 0x24;
+                    break;
+                case '800000':
+                    $colorIdxFg = 0x25;
+                    break;
+                case '008080':
+                    $colorIdxFg = 0x26;
+                    break;
+                case '0000FF':
+                    $colorIdxFg = 0x27;
+                    break;
+                case '00CCFF':
+                    $colorIdxFg = 0x28;
+                    break;
+                case 'CCFFFF':
+                    $colorIdxFg = 0x29;
+                    break;
+                case 'CCFFCC':
+                    $colorIdxFg = 0x2A;
+                    break;
+                case 'FFFF99':
+                    $colorIdxFg = 0x2B;
+                    break;
+                case '99CCFF':
+                    $colorIdxFg = 0x2C;
+                    break;
+                case 'FF99CC':
+                    $colorIdxFg = 0x2D;
+                    break;
+                case 'CC99FF':
+                    $colorIdxFg = 0x2E;
+                    break;
+                case 'FFCC99':
+                    $colorIdxFg = 0x2F;
+                    break;
+                case '3366FF':
+                    $colorIdxFg = 0x30;
+                    break;
+                case '33CCCC':
+                    $colorIdxFg = 0x31;
+                    break;
+                case '99CC00':
+                    $colorIdxFg = 0x32;
+                    break;
+                case 'FFCC00':
+                    $colorIdxFg = 0x33;
+                    break;
+                case 'FF9900':
+                    $colorIdxFg = 0x34;
+                    break;
+                case 'FF6600':
+                    $colorIdxFg = 0x35;
+                    break;
+                case '666699':
+                    $colorIdxFg = 0x36;
+                    break;
+                case '969696':
+                    $colorIdxFg = 0x37;
+                    break;
+                case '003366':
+                    $colorIdxFg = 0x38;
+                    break;
+                case '339966':
+                    $colorIdxFg = 0x39;
+                    break;
+                case '003300':
+                    $colorIdxFg = 0x3A;
+                    break;
+                case '333300':
+                    $colorIdxFg = 0x3B;
+                    break;
+                case '993300':
+                    $colorIdxFg = 0x3C;
+                    break;
+                case '993366':
+                    $colorIdxFg = 0x3D;
+                    break;
+                case '333399':
+                    $colorIdxFg = 0x3E;
+                    break;
+                case '333333':
+                    $colorIdxFg = 0x3F;
+                    break;
+                default:
+                          $colorIdxFg = 0x40;
+                    break;
+            }
+            $dataBlockFill = pack('v', $blockFillPatternStyle);
+            $dataBlockFill .= pack('v', $colorIdxFg | ($colorIdxBg << 7));
+        }
+        if ($bFormatProt == 1) {
+            $dataBlockProtection = 0;
+            if ($conditional->getStyle()->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED) {
+                $dataBlockProtection = 1;
+            }
+            if ($conditional->getStyle()->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED) {
+                $dataBlockProtection = 1 << 1;
+            }
+        }
+
+        $data      = pack('CCvvVv', $type, $operatorType, $szValue1, $szValue2, $flags, 0x0000);
+        if ($bFormatFont == 1) { // Block Formatting : OK
+            $data .= $dataBlockFont;
+        }
+        if ($bFormatAlign == 1) {
+            $data .= $dataBlockAlign;
+        }
+        if ($bFormatBorder == 1) {
+            $data .= $dataBlockBorder;
+        }
+        if ($bFormatFill == 1) { // Block Formatting : OK
+            $data .= $dataBlockFill;
+        }
+        if ($bFormatProt == 1) {
+            $data .= $dataBlockProtection;
+        }
+        if (!is_null($operand1)) {
+            $data .= $operand1;
+        }
+        if (!is_null($operand2)) {
+            $data .= $operand2;
+        }
+        $header      = pack('vv', $record, strlen($data));
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write CFHeader record
+     */
+    private function writeCFHeader()
+    {
+        $record      = 0x01B0;               // Record identifier
+        $length      = 0x0016;               // Bytes to follow
+
+        $numColumnMin = null;
+        $numColumnMax = null;
+        $numRowMin = null;
+        $numRowMax = null;
+        $arrConditional = array();
+        foreach ($this->phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            foreach ($conditionalStyles as $conditional) {
+                if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
+                        || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS) {
+                    if (!in_array($conditional->getHashCode(), $arrConditional)) {
+                        $arrConditional[] = $conditional->getHashCode();
+                    }
+                    // Cells
+                    $arrCoord = PHPExcel_Cell::coordinateFromString($cellCoordinate);
+                    if (!is_numeric($arrCoord[0])) {
+                        $arrCoord[0] = PHPExcel_Cell::columnIndexFromString($arrCoord[0]);
+                    }
+                    if (is_null($numColumnMin) || ($numColumnMin > $arrCoord[0])) {
+                        $numColumnMin = $arrCoord[0];
+                    }
+                    if (is_null($numColumnMax) || ($numColumnMax < $arrCoord[0])) {
+                        $numColumnMax = $arrCoord[0];
+                    }
+                    if (is_null($numRowMin) || ($numRowMin > $arrCoord[1])) {
+                        $numRowMin = $arrCoord[1];
+                    }
+                    if (is_null($numRowMax) || ($numRowMax < $arrCoord[1])) {
+                        $numRowMax = $arrCoord[1];
+                    }
+                }
+            }
+        }
+        $needRedraw = 1;
+        $cellRange = pack('vvvv', $numRowMin-1, $numRowMax-1, $numColumnMin-1, $numColumnMax-1);
+
+        $header      = pack('vv', $record, $length);
+        $data      = pack('vv', count($arrConditional), $needRedraw);
+        $data     .= $cellRange;
+        $data     .= pack('v', 0x0001);
+        $data     .= $cellRange;
+        $this->append($header . $data);
+    }
+}
diff --git a/lib/PHPExcel/Writer/Excel5/Xf.php b/lib/PHPExcel/Writer/Excel5/Xf.php
new file mode 100644
index 000000000..e41589a84
--- /dev/null
+++ b/lib/PHPExcel/Writer/Excel5/Xf.php
@@ -0,0 +1,557 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Excel5_Xf
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel5
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// /*
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class PHPExcel_Writer_Excel5_Xf
+{
+    /**
+     * Style XF or a cell XF ?
+     *
+     * @var boolean
+     */
+    private $isStyleXf;
+
+    /**
+     * Index to the FONT record. Index 4 does not exist
+     * @var integer
+     */
+    private $fontIndex;
+
+    /**
+     * An index (2 bytes) to a FORMAT record (number format).
+     * @var integer
+     */
+    private $numberFormatIndex;
+
+    /**
+     * 1 bit, apparently not used.
+     * @var integer
+     */
+    private $textJustLast;
+
+    /**
+     * The cell's foreground color.
+     * @var integer
+     */
+    private $foregroundColor;
+
+    /**
+     * The cell's background color.
+     * @var integer
+     */
+    private $backgroundColor;
+
+    /**
+     * Color of the bottom border of the cell.
+     * @var integer
+     */
+    private $bottomBorderColor;
+
+    /**
+     * Color of the top border of the cell.
+     * @var integer
+     */
+    private $topBorderColor;
+
+    /**
+    * Color of the left border of the cell.
+    * @var integer
+    */
+    private $leftBorderColor;
+
+    /**
+     * Color of the right border of the cell.
+     * @var integer
+     */
+    private $rightBorderColor;
+
+    /**
+     * Constructor
+     *
+     * @access public
+     * @param PHPExcel_Style    The XF format
+     */
+    public function __construct(PHPExcel_Style $style = null)
+    {
+        $this->isStyleXf =     false;
+        $this->fontIndex = 0;
+
+        $this->numberFormatIndex     = 0;
+
+        $this->textJustLast  = 0;
+
+        $this->foregroundColor       = 0x40;
+        $this->backgroundColor       = 0x41;
+
+        $this->_diag           = 0;
+
+        $this->bottomBorderColor   = 0x40;
+        $this->topBorderColor      = 0x40;
+        $this->leftBorderColor     = 0x40;
+        $this->rightBorderColor    = 0x40;
+        $this->_diag_color     = 0x40;
+        $this->_style = $style;
+
+    }
+
+
+    /**
+     * Generate an Excel BIFF XF record (style or cell).
+     *
+     * @return string The XF record
+     */
+    public function writeXf()
+    {
+        // Set the type of the XF record and some of the attributes.
+        if ($this->isStyleXf) {
+            $style = 0xFFF5;
+        } else {
+            $style   = self::mapLocked($this->_style->getProtection()->getLocked());
+            $style  |= self::mapHidden($this->_style->getProtection()->getHidden()) << 1;
+        }
+
+        // Flags to indicate if attributes have been set.
+        $atr_num     = ($this->numberFormatIndex != 0)?1:0;
+        $atr_fnt     = ($this->fontIndex != 0)?1:0;
+        $atr_alc     = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
+        $atr_bdr     = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
+                        self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
+                        self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
+                        self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
+        $atr_pat     = (($this->foregroundColor != 0x40) ||
+                        ($this->backgroundColor != 0x41) ||
+                        self::mapFillType($this->_style->getFill()->getFillType()))?1:0;
+        $atr_prot    = self::mapLocked($this->_style->getProtection()->getLocked())
+                        | self::mapHidden($this->_style->getProtection()->getHidden());
+
+        // Zero the default border colour if the border has not been set.
+        if (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
+            $this->bottomBorderColor = 0;
+        }
+        if (self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
+            $this->topBorderColor = 0;
+        }
+        if (self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
+            $this->rightBorderColor = 0;
+        }
+        if (self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) == 0) {
+            $this->leftBorderColor = 0;
+        }
+        if (self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) == 0) {
+            $this->_diag_color = 0;
+        }
+
+        $record = 0x00E0;              // Record identifier
+        $length = 0x0014;              // Number of bytes to follow
+
+        $ifnt = $this->fontIndex;   // Index to FONT record
+        $ifmt = $this->numberFormatIndex;  // Index to FORMAT record
+
+        $align  = $this->mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
+        $align |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
+        $align |= self::mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
+        $align |= $this->textJustLast << 7;
+
+        $used_attrib  = $atr_num  << 2;
+        $used_attrib |= $atr_fnt  << 3;
+        $used_attrib |= $atr_alc  << 4;
+        $used_attrib |= $atr_bdr  << 5;
+        $used_attrib |= $atr_pat  << 6;
+        $used_attrib |= $atr_prot << 7;
+
+        $icv  = $this->foregroundColor;      // fg and bg pattern colors
+        $icv |= $this->backgroundColor      << 7;
+
+        $border1  = self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
+        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
+        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
+        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
+        $border1 |= $this->leftBorderColor    << 16;
+        $border1 |= $this->rightBorderColor   << 23;
+
+        $diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
+        $diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
+                            || $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
+        $diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
+                            || $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
+        $border1 |= $diag_tl_to_rb        << 30;
+        $border1 |= $diag_tr_to_lb        << 31;
+
+        $border2  = $this->topBorderColor;    // Border color
+        $border2 |= $this->bottomBorderColor   << 7;
+        $border2 |= $this->_diag_color     << 14;
+        $border2 |= self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
+        $border2 |= self::mapFillType($this->_style->getFill()->getFillType())        << 26;
+
+        $header = pack("vv", $record, $length);
+
+        //BIFF8 options: identation, shrinkToFit and  text direction
+        $biff8_options  = $this->_style->getAlignment()->getIndent();
+        $biff8_options |= (int) $this->_style->getAlignment()->getShrinkToFit() << 4;
+
+        $data  = pack("vvvC", $ifnt, $ifmt, $style, $align);
+        $data .= pack("CCC", self::mapTextRotation($this->_style->getAlignment()->getTextRotation()), $biff8_options, $used_attrib);
+        $data .= pack("VVv", $border1, $border2, $icv);
+
+        return($header . $data);
+    }
+
+    /**
+     * Is this a style XF ?
+     *
+     * @param boolean $value
+     */
+    public function setIsStyleXf($value)
+    {
+        $this->isStyleXf = $value;
+    }
+
+    /**
+     * Sets the cell's bottom border color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setBottomColor($colorIndex)
+    {
+        $this->bottomBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's top border color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setTopColor($colorIndex)
+    {
+        $this->topBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's left border color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setLeftColor($colorIndex)
+    {
+        $this->leftBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's right border color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setRightColor($colorIndex)
+    {
+        $this->rightBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's diagonal border color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setDiagColor($colorIndex)
+    {
+        $this->_diag_color = $colorIndex;
+    }
+
+
+    /**
+     * Sets the cell's foreground color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setFgColor($colorIndex)
+    {
+        $this->foregroundColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's background color
+     *
+     * @access public
+     * @param int $colorIndex Color index
+     */
+    public function setBgColor($colorIndex)
+    {
+        $this->backgroundColor = $colorIndex;
+    }
+
+    /**
+     * Sets the index to the number format record
+     * It can be date, time, currency, etc...
+     *
+     * @access public
+     * @param integer $numberFormatIndex Index to format record
+     */
+    public function setNumberFormatIndex($numberFormatIndex)
+    {
+        $this->numberFormatIndex = $numberFormatIndex;
+    }
+
+    /**
+     * Set the font index.
+     *
+     * @param int $value Font index, note that value 4 does not exist
+     */
+    public function setFontIndex($value)
+    {
+        $this->fontIndex = $value;
+    }
+
+    /**
+     * Map of BIFF2-BIFF8 codes for border styles
+     * @static    array of int
+     *
+     */
+    private static $mapBorderStyles = array(
+        PHPExcel_Style_Border::BORDER_NONE             => 0x00,
+        PHPExcel_Style_Border::BORDER_THIN             => 0x01,
+        PHPExcel_Style_Border::BORDER_MEDIUM           => 0x02,
+        PHPExcel_Style_Border::BORDER_DASHED           => 0x03,
+        PHPExcel_Style_Border::BORDER_DOTTED           => 0x04,
+        PHPExcel_Style_Border::BORDER_THICK            => 0x05,
+        PHPExcel_Style_Border::BORDER_DOUBLE           => 0x06,
+        PHPExcel_Style_Border::BORDER_HAIR             => 0x07,
+        PHPExcel_Style_Border::BORDER_MEDIUMDASHED     => 0x08,
+        PHPExcel_Style_Border::BORDER_DASHDOT          => 0x09,
+        PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT    => 0x0A,
+        PHPExcel_Style_Border::BORDER_DASHDOTDOT       => 0x0B,
+        PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT => 0x0C,
+        PHPExcel_Style_Border::BORDER_SLANTDASHDOT     => 0x0D,
+    );
+
+    /**
+     * Map border style
+     *
+     * @param string $borderStyle
+     * @return int
+     */
+    private static function mapBorderStyle($borderStyle)
+    {
+        if (isset(self::$mapBorderStyles[$borderStyle])) {
+            return self::$mapBorderStyles[$borderStyle];
+        }
+        return 0x00;
+    }
+
+    /**
+     * Map of BIFF2-BIFF8 codes for fill types
+     * @static    array of int
+     *
+     */
+    private static $mapFillTypes = array(
+        PHPExcel_Style_Fill::FILL_NONE                    => 0x00,
+        PHPExcel_Style_Fill::FILL_SOLID                   => 0x01,
+        PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY      => 0x02,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY        => 0x03,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY       => 0x04,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL  => 0x05,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL    => 0x06,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN        => 0x07,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKUP          => 0x08,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID        => 0x09,
+        PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS     => 0x0A,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL => 0x0B,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL   => 0x0C,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN       => 0x0D,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP         => 0x0E,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID       => 0x0F,
+        PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS    => 0x10,
+        PHPExcel_Style_Fill::FILL_PATTERN_GRAY125         => 0x11,
+        PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625        => 0x12,
+        PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR         => 0x00,    // does not exist in BIFF8
+        PHPExcel_Style_Fill::FILL_GRADIENT_PATH           => 0x00,    // does not exist in BIFF8
+    );
+
+    /**
+     * Map fill type
+     *
+     * @param string $fillType
+     * @return int
+     */
+    private static function mapFillType($fillType)
+    {
+        if (isset(self::$mapFillTypes[$fillType])) {
+            return self::$mapFillTypes[$fillType];
+        }
+        return 0x00;
+    }
+
+    /**
+     * Map of BIFF2-BIFF8 codes for horizontal alignment
+     * @static    array of int
+     *
+     */
+    private static $mapHAlignments = array(
+        PHPExcel_Style_Alignment::HORIZONTAL_GENERAL           => 0,
+        PHPExcel_Style_Alignment::HORIZONTAL_LEFT              => 1,
+        PHPExcel_Style_Alignment::HORIZONTAL_CENTER            => 2,
+        PHPExcel_Style_Alignment::HORIZONTAL_RIGHT             => 3,
+        PHPExcel_Style_Alignment::HORIZONTAL_FILL              => 4,
+        PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY           => 5,
+        PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS => 6,
+    );
+
+    /**
+     * Map to BIFF2-BIFF8 codes for horizontal alignment
+     *
+     * @param string $hAlign
+     * @return int
+     */
+    private function mapHAlign($hAlign)
+    {
+        if (isset(self::$mapHAlignments[$hAlign])) {
+            return self::$mapHAlignments[$hAlign];
+        }
+        return 0;
+    }
+
+    /**
+     * Map of BIFF2-BIFF8 codes for vertical alignment
+     * @static    array of int
+     *
+     */
+    private static $mapVAlignments = array(
+        PHPExcel_Style_Alignment::VERTICAL_TOP     => 0,
+        PHPExcel_Style_Alignment::VERTICAL_CENTER  => 1,
+        PHPExcel_Style_Alignment::VERTICAL_BOTTOM  => 2,
+        PHPExcel_Style_Alignment::VERTICAL_JUSTIFY => 3,
+    );
+
+    /**
+     * Map to BIFF2-BIFF8 codes for vertical alignment
+     *
+     * @param string $vAlign
+     * @return int
+     */
+    private static function mapVAlign($vAlign)
+    {
+        if (isset(self::$mapVAlignments[$vAlign])) {
+            return self::$mapVAlignments[$vAlign];
+        }
+        return 2;
+    }
+
+    /**
+     * Map to BIFF8 codes for text rotation angle
+     *
+     * @param int $textRotation
+     * @return int
+     */
+    private static function mapTextRotation($textRotation)
+    {
+        if ($textRotation >= 0) {
+            return $textRotation;
+        } elseif ($textRotation == -165) {
+            return 255;
+        } elseif ($textRotation < 0) {
+            return 90 - $textRotation;
+        }
+    }
+
+    /**
+     * Map locked
+     *
+     * @param string
+     * @return int
+     */
+    private static function mapLocked($locked)
+    {
+        switch ($locked) {
+            case PHPExcel_Style_Protection::PROTECTION_INHERIT:
+                return 1;
+            case PHPExcel_Style_Protection::PROTECTION_PROTECTED:
+                return 1;
+            case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED:
+                return 0;
+            default:
+                return 1;
+        }
+    }
+
+    /**
+     * Map hidden
+     *
+     * @param string
+     * @return int
+     */
+    private static function mapHidden($hidden)
+    {
+        switch ($hidden) {
+            case PHPExcel_Style_Protection::PROTECTION_INHERIT:
+                return 0;
+            case PHPExcel_Style_Protection::PROTECTION_PROTECTED:
+                return 1;
+            case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED:
+                return 0;
+            default:
+                return 0;
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/Exception.php b/lib/PHPExcel/Writer/Exception.php
new file mode 100644
index 000000000..bfa005681
--- /dev/null
+++ b/lib/PHPExcel/Writer/Exception.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * PHPExcel_Writer_Exception
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_Exception extends PHPExcel_Exception
+{
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
+}
diff --git a/lib/PHPExcel/Writer/HTML.php b/lib/PHPExcel/Writer/HTML.php
new file mode 100644
index 000000000..31d7c63ac
--- /dev/null
+++ b/lib/PHPExcel/Writer/HTML.php
@@ -0,0 +1,1612 @@
+<?php
+
+/**
+ * PHPExcel_Writer_HTML
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_HTML
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+{
+    /**
+     * PHPExcel object
+     *
+     * @var PHPExcel
+     */
+    protected $phpExcel;
+
+    /**
+     * Sheet index to write
+     *
+     * @var int
+     */
+    private $sheetIndex = 0;
+
+    /**
+     * Images root
+     *
+     * @var string
+     */
+    private $imagesRoot = '.';
+
+    /**
+     * embed images, or link to images
+     *
+     * @var boolean
+     */
+    private $embedImages = false;
+
+    /**
+     * Use inline CSS?
+     *
+     * @var boolean
+     */
+    private $useInlineCss = false;
+
+    /**
+     * Array of CSS styles
+     *
+     * @var array
+     */
+    private $cssStyles;
+
+    /**
+     * Array of column widths in points
+     *
+     * @var array
+     */
+    private $columnWidths;
+
+    /**
+     * Default font
+     *
+     * @var PHPExcel_Style_Font
+     */
+    private $defaultFont;
+
+    /**
+     * Flag whether spans have been calculated
+     *
+     * @var boolean
+     */
+    private $spansAreCalculated = false;
+
+    /**
+     * Excel cells that should not be written as HTML cells
+     *
+     * @var array
+     */
+    private $isSpannedCell = array();
+
+    /**
+     * Excel cells that are upper-left corner in a cell merge
+     *
+     * @var array
+     */
+    private $isBaseCell = array();
+
+    /**
+     * Excel rows that should not be written as HTML rows
+     *
+     * @var array
+     */
+    private $isSpannedRow = array();
+
+    /**
+     * Is the current writer creating PDF?
+     *
+     * @var boolean
+     */
+    protected $isPdf = false;
+
+    /**
+     * Generate the Navigation block
+     *
+     * @var boolean
+     */
+    private $generateSheetNavigationBlock = true;
+
+    /**
+     * Create a new PHPExcel_Writer_HTML
+     *
+     * @param    PHPExcel    $phpExcel    PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        $this->phpExcel = $phpExcel;
+        $this->defaultFont = $this->phpExcel->getDefaultStyle()->getFont();
+    }
+
+    /**
+     * Save PHPExcel to file
+     *
+     * @param    string        $pFilename
+     * @throws    PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        // garbage collect
+        $this->phpExcel->garbageCollect();
+
+        $saveDebugLog = PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->getWriteDebugLog();
+        PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog(false);
+        $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
+        PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+
+        // Build CSS
+        $this->buildCSS(!$this->useInlineCss);
+
+        // Open file
+        $fileHandle = fopen($pFilename, 'wb+');
+        if ($fileHandle === false) {
+            throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
+        }
+
+        // Write headers
+        fwrite($fileHandle, $this->generateHTMLHeader(!$this->useInlineCss));
+
+        // Write navigation (tabs)
+        if ((!$this->isPdf) && ($this->generateSheetNavigationBlock)) {
+            fwrite($fileHandle, $this->generateNavigation());
+        }
+
+        // Write data
+        fwrite($fileHandle, $this->generateSheetData());
+
+        // Write footer
+        fwrite($fileHandle, $this->generateHTMLFooter());
+
+        // Close file
+        fclose($fileHandle);
+
+        PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
+        PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+    }
+
+    /**
+     * Map VAlign
+     *
+     * @param    string        $vAlign        Vertical alignment
+     * @return string
+     */
+    private function mapVAlign($vAlign)
+    {
+        switch ($vAlign) {
+            case PHPExcel_Style_Alignment::VERTICAL_BOTTOM:
+                return 'bottom';
+            case PHPExcel_Style_Alignment::VERTICAL_TOP:
+                return 'top';
+            case PHPExcel_Style_Alignment::VERTICAL_CENTER:
+            case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY:
+                return 'middle';
+            default:
+                return 'baseline';
+        }
+    }
+
+    /**
+     * Map HAlign
+     *
+     * @param    string        $hAlign        Horizontal alignment
+     * @return string|false
+     */
+    private function mapHAlign($hAlign)
+    {
+        switch ($hAlign) {
+            case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL:
+                return false;
+            case PHPExcel_Style_Alignment::HORIZONTAL_LEFT:
+                return 'left';
+            case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT:
+                return 'right';
+            case PHPExcel_Style_Alignment::HORIZONTAL_CENTER:
+            case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS:
+                return 'center';
+            case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY:
+                return 'justify';
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Map border style
+     *
+     * @param    int        $borderStyle        Sheet index
+     * @return    string
+     */
+    private function mapBorderStyle($borderStyle)
+    {
+        switch ($borderStyle) {
+            case PHPExcel_Style_Border::BORDER_NONE:
+                return 'none';
+            case PHPExcel_Style_Border::BORDER_DASHDOT:
+                return '1px dashed';
+            case PHPExcel_Style_Border::BORDER_DASHDOTDOT:
+                return '1px dotted';
+            case PHPExcel_Style_Border::BORDER_DASHED:
+                return '1px dashed';
+            case PHPExcel_Style_Border::BORDER_DOTTED:
+                return '1px dotted';
+            case PHPExcel_Style_Border::BORDER_DOUBLE:
+                return '3px double';
+            case PHPExcel_Style_Border::BORDER_HAIR:
+                return '1px solid';
+            case PHPExcel_Style_Border::BORDER_MEDIUM:
+                return '2px solid';
+            case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:
+                return '2px dashed';
+            case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:
+                return '2px dotted';
+            case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:
+                return '2px dashed';
+            case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:
+                return '2px dashed';
+            case PHPExcel_Style_Border::BORDER_THICK:
+                return '3px solid';
+            case PHPExcel_Style_Border::BORDER_THIN:
+                return '1px solid';
+            default:
+                // map others to thin
+                return '1px solid';
+        }
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return int
+     */
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param    int        $pValue        Sheet index
+     * @return PHPExcel_Writer_HTML
+     */
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return boolean
+     */
+    public function getGenerateSheetNavigationBlock()
+    {
+        return $this->generateSheetNavigationBlock;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param    boolean        $pValue        Flag indicating whether the sheet navigation block should be generated or not
+     * @return PHPExcel_Writer_HTML
+     */
+    public function setGenerateSheetNavigationBlock($pValue = true)
+    {
+        $this->generateSheetNavigationBlock = (bool) $pValue;
+        return $this;
+    }
+
+    /**
+     * Write all sheets (resets sheetIndex to NULL)
+     */
+    public function writeAllSheets()
+    {
+        $this->sheetIndex = null;
+        return $this;
+    }
+
+    /**
+     * Generate HTML header
+     *
+     * @param    boolean        $pIncludeStyles        Include styles?
+     * @return    string
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function generateHTMLHeader($pIncludeStyles = false)
+    {
+        // PHPExcel object known?
+        if (is_null($this->phpExcel)) {
+            throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+        }
+
+        // Construct HTML
+        $properties = $this->phpExcel->getProperties();
+        $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
+        $html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
+        $html .= '<html>' . PHP_EOL;
+        $html .= '  <head>' . PHP_EOL;
+        $html .= '      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
+        if ($properties->getTitle() > '') {
+            $html .= '      <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
+        }
+        if ($properties->getCreator() > '') {
+            $html .= '      <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getTitle() > '') {
+            $html .= '      <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getDescription() > '') {
+            $html .= '      <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getSubject() > '') {
+            $html .= '      <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getKeywords() > '') {
+            $html .= '      <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getCategory() > '') {
+            $html .= '      <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getCompany() > '') {
+            $html .= '      <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getManager() > '') {
+            $html .= '      <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+        }
+
+        if ($pIncludeStyles) {
+            $html .= $this->generateStyles(true);
+        }
+
+        $html .= '  </head>' . PHP_EOL;
+        $html .= '' . PHP_EOL;
+        $html .= '  <body>' . PHP_EOL;
+
+        return $html;
+    }
+
+    /**
+     * Generate sheet data
+     *
+     * @return    string
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function generateSheetData()
+    {
+        // PHPExcel object known?
+        if (is_null($this->phpExcel)) {
+            throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+        }
+
+        // Ensure that Spans have been calculated?
+        if ($this->sheetIndex !== null || !$this->spansAreCalculated) {
+            $this->calculateSpans();
+        }
+
+        // Fetch sheets
+        $sheets = array();
+        if (is_null($this->sheetIndex)) {
+            $sheets = $this->phpExcel->getAllSheets();
+        } else {
+            $sheets[] = $this->phpExcel->getSheet($this->sheetIndex);
+        }
+
+        // Construct HTML
+        $html = '';
+
+        // Loop all sheets
+        $sheetId = 0;
+        foreach ($sheets as $sheet) {
+            // Write table header
+            $html .= $this->generateTableHeader($sheet);
+
+            // Get worksheet dimension
+            $dimension = explode(':', $sheet->calculateWorksheetDimension());
+            $dimension[0] = PHPExcel_Cell::coordinateFromString($dimension[0]);
+            $dimension[0][0] = PHPExcel_Cell::columnIndexFromString($dimension[0][0]) - 1;
+            $dimension[1] = PHPExcel_Cell::coordinateFromString($dimension[1]);
+            $dimension[1][0] = PHPExcel_Cell::columnIndexFromString($dimension[1][0]) - 1;
+
+            // row min,max
+            $rowMin = $dimension[0][1];
+            $rowMax = $dimension[1][1];
+
+            // calculate start of <tbody>, <thead>
+            $tbodyStart = $rowMin;
+            $theadStart = $theadEnd   = 0; // default: no <thead>    no </thead>
+            if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+                $rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
+
+                // we can only support repeating rows that start at top row
+                if ($rowsToRepeatAtTop[0] == 1) {
+                    $theadStart = $rowsToRepeatAtTop[0];
+                    $theadEnd   = $rowsToRepeatAtTop[1];
+                    $tbodyStart = $rowsToRepeatAtTop[1] + 1;
+                }
+            }
+
+            // Loop through cells
+            $row = $rowMin-1;
+            while ($row++ < $rowMax) {
+                // <thead> ?
+                if ($row == $theadStart) {
+                    $html .= '        <thead>' . PHP_EOL;
+                    $cellType = 'th';
+                }
+
+                // <tbody> ?
+                if ($row == $tbodyStart) {
+                    $html .= '        <tbody>' . PHP_EOL;
+                    $cellType = 'td';
+                }
+
+                // Write row if there are HTML table cells in it
+                if (!isset($this->isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row])) {
+                    // Start a new rowData
+                    $rowData = array();
+                    // Loop through columns
+                    $column = $dimension[0][0] - 1;
+                    while ($column++ < $dimension[1][0]) {
+                        // Cell exists?
+                        if ($sheet->cellExistsByColumnAndRow($column, $row)) {
+                            $rowData[$column] = PHPExcel_Cell::stringFromColumnIndex($column) . $row;
+                        } else {
+                            $rowData[$column] = '';
+                        }
+                    }
+                    $html .= $this->generateRow($sheet, $rowData, $row - 1, $cellType);
+                }
+
+                // </thead> ?
+                if ($row == $theadEnd) {
+                    $html .= '        </thead>' . PHP_EOL;
+                }
+            }
+            $html .= $this->extendRowsForChartsAndImages($sheet, $row);
+
+            // Close table body.
+            $html .= '        </tbody>' . PHP_EOL;
+
+            // Write table footer
+            $html .= $this->generateTableFooter();
+
+            // Writing PDF?
+            if ($this->isPdf) {
+                if (is_null($this->sheetIndex) && $sheetId + 1 < $this->phpExcel->getSheetCount()) {
+                    $html .= '<div style="page-break-before:always" />';
+                }
+            }
+
+            // Next sheet
+            ++$sheetId;
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate sheet tabs
+     *
+     * @return    string
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function generateNavigation()
+    {
+        // PHPExcel object known?
+        if (is_null($this->phpExcel)) {
+            throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+        }
+
+        // Fetch sheets
+        $sheets = array();
+        if (is_null($this->sheetIndex)) {
+            $sheets = $this->phpExcel->getAllSheets();
+        } else {
+            $sheets[] = $this->phpExcel->getSheet($this->sheetIndex);
+        }
+
+        // Construct HTML
+        $html = '';
+
+        // Only if there are more than 1 sheets
+        if (count($sheets) > 1) {
+            // Loop all sheets
+            $sheetId = 0;
+
+            $html .= '<ul class="navigation">' . PHP_EOL;
+
+            foreach ($sheets as $sheet) {
+                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+                ++$sheetId;
+            }
+
+            $html .= '</ul>' . PHP_EOL;
+        }
+
+        return $html;
+    }
+
+    private function extendRowsForChartsAndImages(PHPExcel_Worksheet $pSheet, $row)
+    {
+        $rowMax = $row;
+        $colMax = 'A';
+        if ($this->includeCharts) {
+            foreach ($pSheet->getChartCollection() as $chart) {
+                if ($chart instanceof PHPExcel_Chart) {
+                    $chartCoordinates = $chart->getTopLeftPosition();
+                    $chartTL = PHPExcel_Cell::coordinateFromString($chartCoordinates['cell']);
+                    $chartCol = PHPExcel_Cell::columnIndexFromString($chartTL[0]);
+                    if ($chartTL[1] > $rowMax) {
+                        $rowMax = $chartTL[1];
+                        if ($chartCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
+                            $colMax = $chartTL[0];
+                        }
+                    }
+                }
+            }
+        }
+
+        foreach ($pSheet->getDrawingCollection() as $drawing) {
+            if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
+                $imageTL = PHPExcel_Cell::coordinateFromString($drawing->getCoordinates());
+                $imageCol = PHPExcel_Cell::columnIndexFromString($imageTL[0]);
+                if ($imageTL[1] > $rowMax) {
+                    $rowMax = $imageTL[1];
+                    if ($imageCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
+                        $colMax = $imageTL[0];
+                    }
+                }
+            }
+        }
+
+        $html = '';
+        $colMax++;
+        while ($row <= $rowMax) {
+            $html .= '<tr>';
+            for ($col = 'A'; $col != $colMax; ++$col) {
+                $html .= '<td>';
+                $html .= $this->writeImageInCell($pSheet, $col.$row);
+                if ($this->includeCharts) {
+                    $html .= $this->writeChartInCell($pSheet, $col.$row);
+                }
+                $html .= '</td>';
+            }
+            ++$row;
+            $html .= '</tr>';
+        }
+        return $html;
+    }
+
+
+    /**
+     * Generate image tag in cell
+     *
+     * @param    PHPExcel_Worksheet    $pSheet            PHPExcel_Worksheet
+     * @param    string                $coordinates    Cell coordinates
+     * @return    string
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeImageInCell(PHPExcel_Worksheet $pSheet, $coordinates)
+    {
+        // Construct HTML
+        $html = '';
+
+        // Write images
+        foreach ($pSheet->getDrawingCollection() as $drawing) {
+            if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
+                if ($drawing->getCoordinates() == $coordinates) {
+                    $filename = $drawing->getPath();
+
+                    // Strip off eventual '.'
+                    if (substr($filename, 0, 1) == '.') {
+                        $filename = substr($filename, 1);
+                    }
+
+                    // Prepend images root
+                    $filename = $this->getImagesRoot() . $filename;
+
+                    // Strip off eventual '.'
+                    if (substr($filename, 0, 1) == '.' && substr($filename, 0, 2) != './') {
+                        $filename = substr($filename, 1);
+                    }
+
+                    // Convert UTF8 data to PCDATA
+                    $filename = htmlspecialchars($filename);
+
+                    $html .= PHP_EOL;
+                    if ((!$this->embedImages) || ($this->isPdf)) {
+                        $imageData = $filename;
+                    } else {
+                        $imageDetails = getimagesize($filename);
+                        if ($fp = fopen($filename, "rb", 0)) {
+                            $picture = fread($fp, filesize($filename));
+                            fclose($fp);
+                            // base64 encode the binary data, then break it
+                            // into chunks according to RFC 2045 semantics
+                            $base64 = chunk_split(base64_encode($picture));
+                            $imageData = 'data:'.$imageDetails['mime'].';base64,' . $base64;
+                        } else {
+                            $imageData = $filename;
+                        }
+                    }
+
+                    $html .= '<div style="position: relative;">';
+                    $html .= '<img style="position: absolute; z-index: 1; left: ' .
+                        $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' .
+                        $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' .
+                        $imageData . '" border="0" />';
+                    $html .= '</div>';
+                }
+            } elseif ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) {
+                if ($drawing->getCoordinates() != $coordinates) {
+                    continue;
+                }
+                ob_start();                                //  Let's start output buffering.
+                imagepng($drawing->getImageResource());    //  This will normally output the image, but because of ob_start(), it won't.
+                $contents = ob_get_contents();             //  Instead, output above is saved to $contents
+                ob_end_clean();                            //  End the output buffer.
+
+                $dataUri = "data:image/jpeg;base64," . base64_encode($contents);
+
+                //  Because of the nature of tables, width is more important than height.
+                //  max-width: 100% ensures that image doesnt overflow containing cell
+                //  width: X sets width of supplied image.
+                //  As a result, images bigger than cell will be contained and images smaller will not get stretched
+                $html .= '<img src="'.$dataUri.'" style="max-width:100%;width:'.$drawing->getWidth().'px;" />';
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate chart tag in cell
+     *
+     * @param    PHPExcel_Worksheet    $pSheet            PHPExcel_Worksheet
+     * @param    string                $coordinates    Cell coordinates
+     * @return    string
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function writeChartInCell(PHPExcel_Worksheet $pSheet, $coordinates)
+    {
+        // Construct HTML
+        $html = '';
+
+        // Write charts
+        foreach ($pSheet->getChartCollection() as $chart) {
+            if ($chart instanceof PHPExcel_Chart) {
+                $chartCoordinates = $chart->getTopLeftPosition();
+                if ($chartCoordinates['cell'] == $coordinates) {
+                    $chartFileName = PHPExcel_Shared_File::sys_get_temp_dir().'/'.uniqid().'.png';
+                    if (!$chart->render($chartFileName)) {
+                        return;
+                    }
+
+                    $html .= PHP_EOL;
+                    $imageDetails = getimagesize($chartFileName);
+                    if ($fp = fopen($chartFileName, "rb", 0)) {
+                        $picture = fread($fp, filesize($chartFileName));
+                        fclose($fp);
+                        // base64 encode the binary data, then break it
+                        // into chunks according to RFC 2045 semantics
+                        $base64 = chunk_split(base64_encode($picture));
+                        $imageData = 'data:'.$imageDetails['mime'].';base64,' . $base64;
+
+                        $html .= '<div style="position: relative;">';
+                        $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" border="0" />' . PHP_EOL;
+                        $html .= '</div>';
+
+                        unlink($chartFileName);
+                    }
+                }
+            }
+        }
+
+        // Return
+        return $html;
+    }
+
+    /**
+     * Generate CSS styles
+     *
+     * @param    boolean    $generateSurroundingHTML    Generate surrounding HTML tags? (&lt;style&gt; and &lt;/style&gt;)
+     * @return    string
+     * @throws    PHPExcel_Writer_Exception
+     */
+    public function generateStyles($generateSurroundingHTML = true)
+    {
+        // PHPExcel object known?
+        if (is_null($this->phpExcel)) {
+            throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+        }
+
+        // Build CSS
+        $css = $this->buildCSS($generateSurroundingHTML);
+
+        // Construct HTML
+        $html = '';
+
+        // Start styles
+        if ($generateSurroundingHTML) {
+            $html .= '    <style type="text/css">' . PHP_EOL;
+            $html .= '      html { ' . $this->assembleCSS($css['html']) . ' }' . PHP_EOL;
+        }
+
+        // Write all other styles
+        foreach ($css as $styleName => $styleDefinition) {
+            if ($styleName != 'html') {
+                $html .= '      ' . $styleName . ' { ' . $this->assembleCSS($styleDefinition) . ' }' . PHP_EOL;
+            }
+        }
+
+        // End styles
+        if ($generateSurroundingHTML) {
+            $html .= '    </style>' . PHP_EOL;
+        }
+
+        // Return
+        return $html;
+    }
+
+    /**
+     * Build CSS styles
+     *
+     * @param    boolean    $generateSurroundingHTML    Generate surrounding HTML style? (html { })
+     * @return    array
+     * @throws    PHPExcel_Writer_Exception
+     */
+    public function buildCSS($generateSurroundingHTML = true)
+    {
+        // PHPExcel object known?
+        if (is_null($this->phpExcel)) {
+            throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+        }
+
+        // Cached?
+        if (!is_null($this->cssStyles)) {
+            return $this->cssStyles;
+        }
+
+        // Ensure that spans have been calculated
+        if (!$this->spansAreCalculated) {
+            $this->calculateSpans();
+        }
+
+        // Construct CSS
+        $css = array();
+
+        // Start styles
+        if ($generateSurroundingHTML) {
+            // html { }
+            $css['html']['font-family']      = 'Calibri, Arial, Helvetica, sans-serif';
+            $css['html']['font-size']        = '11pt';
+            $css['html']['background-color'] = 'white';
+        }
+
+
+        // table { }
+        $css['table']['border-collapse']  = 'collapse';
+        if (!$this->isPdf) {
+            $css['table']['page-break-after'] = 'always';
+        }
+
+        // .gridlines td { }
+        $css['.gridlines td']['border'] = '1px dotted black';
+        $css['.gridlines th']['border'] = '1px dotted black';
+
+        // .b {}
+        $css['.b']['text-align'] = 'center'; // BOOL
+
+        // .e {}
+        $css['.e']['text-align'] = 'center'; // ERROR
+
+        // .f {}
+        $css['.f']['text-align'] = 'right'; // FORMULA
+
+        // .inlineStr {}
+        $css['.inlineStr']['text-align'] = 'left'; // INLINE
+
+        // .n {}
+        $css['.n']['text-align'] = 'right'; // NUMERIC
+
+        // .s {}
+        $css['.s']['text-align'] = 'left'; // STRING
+
+        // Calculate cell style hashes
+        foreach ($this->phpExcel->getCellXfCollection() as $index => $style) {
+            $css['td.style' . $index] = $this->createCSSStyle($style);
+            $css['th.style' . $index] = $this->createCSSStyle($style);
+        }
+
+        // Fetch sheets
+        $sheets = array();
+        if (is_null($this->sheetIndex)) {
+            $sheets = $this->phpExcel->getAllSheets();
+        } else {
+            $sheets[] = $this->phpExcel->getSheet($this->sheetIndex);
+        }
+
+        // Build styles per sheet
+        foreach ($sheets as $sheet) {
+            // Calculate hash code
+            $sheetIndex = $sheet->getParent()->getIndex($sheet);
+
+            // Build styles
+            // Calculate column widths
+            $sheet->calculateColumnWidths();
+
+            // col elements, initialize
+            $highestColumnIndex = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
+            $column = -1;
+            while ($column++ < $highestColumnIndex) {
+                $this->columnWidths[$sheetIndex][$column] = 42; // approximation
+                $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
+            }
+
+            // col elements, loop through columnDimensions and set width
+            foreach ($sheet->getColumnDimensions() as $columnDimension) {
+                if (($width = PHPExcel_Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->defaultFont)) >= 0) {
+                    $width = PHPExcel_Shared_Drawing::pixelsToPoints($width);
+                    $column = PHPExcel_Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
+                    $this->columnWidths[$sheetIndex][$column] = $width;
+                    $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
+
+                    if ($columnDimension->getVisible() === false) {
+                        $css['table.sheet' . $sheetIndex . ' col.col' . $column]['visibility'] = 'collapse';
+                        $css['table.sheet' . $sheetIndex . ' col.col' . $column]['*display'] = 'none'; // target IE6+7
+                    }
+                }
+            }
+
+            // Default row height
+            $rowDimension = $sheet->getDefaultRowDimension();
+
+            // table.sheetN tr { }
+            $css['table.sheet' . $sheetIndex . ' tr'] = array();
+
+            if ($rowDimension->getRowHeight() == -1) {
+                $pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->phpExcel->getDefaultStyle()->getFont());
+            } else {
+                $pt_height = $rowDimension->getRowHeight();
+            }
+            $css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
+            if ($rowDimension->getVisible() === false) {
+                $css['table.sheet' . $sheetIndex . ' tr']['display']    = 'none';
+                $css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
+            }
+
+            // Calculate row heights
+            foreach ($sheet->getRowDimensions() as $rowDimension) {
+                $row = $rowDimension->getRowIndex() - 1;
+
+                // table.sheetN tr.rowYYYYYY { }
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
+
+                if ($rowDimension->getRowHeight() == -1) {
+                    $pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->phpExcel->getDefaultStyle()->getFont());
+                } else {
+                    $pt_height = $rowDimension->getRowHeight();
+                }
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
+                if ($rowDimension->getVisible() === false) {
+                    $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
+                    $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
+                }
+            }
+        }
+
+        // Cache
+        if (is_null($this->cssStyles)) {
+            $this->cssStyles = $css;
+        }
+
+        // Return
+        return $css;
+    }
+
+    /**
+     * Create CSS style
+     *
+     * @param    PHPExcel_Style        $pStyle            PHPExcel_Style
+     * @return    array
+     */
+    private function createCSSStyle(PHPExcel_Style $pStyle)
+    {
+        // Construct CSS
+        $css = '';
+
+        // Create CSS
+        $css = array_merge(
+            $this->createCSSStyleAlignment($pStyle->getAlignment()),
+            $this->createCSSStyleBorders($pStyle->getBorders()),
+            $this->createCSSStyleFont($pStyle->getFont()),
+            $this->createCSSStyleFill($pStyle->getFill())
+        );
+
+        // Return
+        return $css;
+    }
+
+    /**
+     * Create CSS style (PHPExcel_Style_Alignment)
+     *
+     * @param    PHPExcel_Style_Alignment        $pStyle            PHPExcel_Style_Alignment
+     * @return    array
+     */
+    private function createCSSStyleAlignment(PHPExcel_Style_Alignment $pStyle)
+    {
+        // Construct CSS
+        $css = array();
+
+        // Create CSS
+        $css['vertical-align'] = $this->mapVAlign($pStyle->getVertical());
+        if ($textAlign = $this->mapHAlign($pStyle->getHorizontal())) {
+            $css['text-align'] = $textAlign;
+            if (in_array($textAlign, array('left', 'right'))) {
+                $css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
+            }
+        }
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style (PHPExcel_Style_Font)
+     *
+     * @param    PHPExcel_Style_Font        $pStyle            PHPExcel_Style_Font
+     * @return    array
+     */
+    private function createCSSStyleFont(PHPExcel_Style_Font $pStyle)
+    {
+        // Construct CSS
+        $css = array();
+
+        // Create CSS
+        if ($pStyle->getBold()) {
+            $css['font-weight'] = 'bold';
+        }
+        if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
+            $css['text-decoration'] = 'underline line-through';
+        } elseif ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE) {
+            $css['text-decoration'] = 'underline';
+        } elseif ($pStyle->getStrikethrough()) {
+            $css['text-decoration'] = 'line-through';
+        }
+        if ($pStyle->getItalic()) {
+            $css['font-style'] = 'italic';
+        }
+
+        $css['color']       = '#' . $pStyle->getColor()->getRGB();
+        $css['font-family'] = '\'' . $pStyle->getName() . '\'';
+        $css['font-size']   = $pStyle->getSize() . 'pt';
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style (PHPExcel_Style_Borders)
+     *
+     * @param    PHPExcel_Style_Borders        $pStyle            PHPExcel_Style_Borders
+     * @return    array
+     */
+    private function createCSSStyleBorders(PHPExcel_Style_Borders $pStyle)
+    {
+        // Construct CSS
+        $css = array();
+
+        // Create CSS
+        $css['border-bottom'] = $this->createCSSStyleBorder($pStyle->getBottom());
+        $css['border-top']    = $this->createCSSStyleBorder($pStyle->getTop());
+        $css['border-left']   = $this->createCSSStyleBorder($pStyle->getLeft());
+        $css['border-right']  = $this->createCSSStyleBorder($pStyle->getRight());
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style (PHPExcel_Style_Border)
+     *
+     * @param    PHPExcel_Style_Border        $pStyle            PHPExcel_Style_Border
+     * @return    string
+     */
+    private function createCSSStyleBorder(PHPExcel_Style_Border $pStyle)
+    {
+        // Create CSS
+//        $css = $this->mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
+        //    Create CSS - add !important to non-none border styles for merged cells
+        $borderStyle = $this->mapBorderStyle($pStyle->getBorderStyle());
+        $css = $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important');
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style (PHPExcel_Style_Fill)
+     *
+     * @param    PHPExcel_Style_Fill        $pStyle            PHPExcel_Style_Fill
+     * @return    array
+     */
+    private function createCSSStyleFill(PHPExcel_Style_Fill $pStyle)
+    {
+        // Construct HTML
+        $css = array();
+
+        // Create CSS
+        $value = $pStyle->getFillType() == PHPExcel_Style_Fill::FILL_NONE ?
+            'white' : '#' . $pStyle->getStartColor()->getRGB();
+        $css['background-color'] = $value;
+
+        return $css;
+    }
+
+    /**
+     * Generate HTML footer
+     */
+    public function generateHTMLFooter()
+    {
+        // Construct HTML
+        $html = '';
+        $html .= '  </body>' . PHP_EOL;
+        $html .= '</html>' . PHP_EOL;
+
+        return $html;
+    }
+
+    /**
+     * Generate table header
+     *
+     * @param    PHPExcel_Worksheet    $pSheet        The worksheet for the table we are writing
+     * @return    string
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function generateTableHeader($pSheet)
+    {
+        $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
+
+        // Construct HTML
+        $html = '';
+        $html .= $this->setMargins($pSheet);
+            
+        if (!$this->useInlineCss) {
+            $gridlines = $pSheet->getShowGridlines() ? ' gridlines' : '';
+            $html .= '    <table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
+        } else {
+            $style = isset($this->cssStyles['table']) ?
+                $this->assembleCSS($this->cssStyles['table']) : '';
+
+            if ($this->isPdf && $pSheet->getShowGridlines()) {
+                $html .= '    <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="1" style="' . $style . '">' . PHP_EOL;
+            } else {
+                $html .= '    <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
+            }
+        }
+
+        // Write <col> elements
+        $highestColumnIndex = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
+        $i = -1;
+        while ($i++ < $highestColumnIndex) {
+            if (!$this->isPdf) {
+                if (!$this->useInlineCss) {
+                    $html .= '        <col class="col' . $i . '">' . PHP_EOL;
+                } else {
+                    $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
+                        $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
+                    $html .= '        <col style="' . $style . '">' . PHP_EOL;
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate table footer
+     *
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function generateTableFooter()
+    {
+        $html = '    </table>' . PHP_EOL;
+
+        return $html;
+    }
+
+    /**
+     * Generate row
+     *
+     * @param    PHPExcel_Worksheet    $pSheet            PHPExcel_Worksheet
+     * @param    array                $pValues        Array containing cells in a row
+     * @param    int                    $pRow            Row number (0-based)
+     * @return    string
+     * @throws    PHPExcel_Writer_Exception
+     */
+    private function generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0, $cellType = 'td')
+    {
+        if (is_array($pValues)) {
+            // Construct HTML
+            $html = '';
+
+            // Sheet index
+            $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
+
+            // DomPDF and breaks
+            if ($this->isPdf && count($pSheet->getBreaks()) > 0) {
+                $breaks = $pSheet->getBreaks();
+
+                // check if a break is needed before this row
+                if (isset($breaks['A' . $pRow])) {
+                    // close table: </table>
+                    $html .= $this->generateTableFooter();
+
+                    // insert page break
+                    $html .= '<div style="page-break-before:always" />';
+
+                    // open table again: <table> + <col> etc.
+                    $html .= $this->generateTableHeader($pSheet);
+                }
+            }
+
+            // Write row start
+            if (!$this->useInlineCss) {
+                $html .= '          <tr class="row' . $pRow . '">' . PHP_EOL;
+            } else {
+                $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
+                    ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
+
+                $html .= '          <tr style="' . $style . '">' . PHP_EOL;
+            }
+
+            // Write cells
+            $colNum = 0;
+            foreach ($pValues as $cellAddress) {
+                $cell = ($cellAddress > '') ? $pSheet->getCell($cellAddress) : '';
+                $coordinate = PHPExcel_Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
+                if (!$this->useInlineCss) {
+                    $cssClass = '';
+                    $cssClass = 'column' . $colNum;
+                } else {
+                    $cssClass = array();
+                    if ($cellType == 'th') {
+                        if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) {
+                            $this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum];
+                        }
+                    } else {
+                        if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
+                            $this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
+                        }
+                    }
+                }
+                $colSpan = 1;
+                $rowSpan = 1;
+
+                // initialize
+                $cellData = '&nbsp;';
+
+                // PHPExcel_Cell
+                if ($cell instanceof PHPExcel_Cell) {
+                    $cellData = '';
+                    if (is_null($cell->getParent())) {
+                        $cell->attach($pSheet);
+                    }
+                    // Value
+                    if ($cell->getValue() instanceof PHPExcel_RichText) {
+                        // Loop through rich text elements
+                        $elements = $cell->getValue()->getRichTextElements();
+                        foreach ($elements as $element) {
+                            // Rich text start?
+                            if ($element instanceof PHPExcel_RichText_Run) {
+                                $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
+
+                                if ($element->getFont()->getSuperScript()) {
+                                    $cellData .= '<sup>';
+                                } elseif ($element->getFont()->getSubScript()) {
+                                    $cellData .= '<sub>';
+                                }
+                            }
+
+                            // Convert UTF8 data to PCDATA
+                            $cellText = $element->getText();
+                            $cellData .= htmlspecialchars($cellText);
+
+                            if ($element instanceof PHPExcel_RichText_Run) {
+                                if ($element->getFont()->getSuperScript()) {
+                                    $cellData .= '</sup>';
+                                } elseif ($element->getFont()->getSubScript()) {
+                                    $cellData .= '</sub>';
+                                }
+
+                                $cellData .= '</span>';
+                            }
+                        }
+                    } else {
+                        if ($this->preCalculateFormulas) {
+                            $cellData = PHPExcel_Style_NumberFormat::toFormattedString(
+                                $cell->getCalculatedValue(),
+                                $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
+                                array($this, 'formatColor')
+                            );
+                        } else {
+                            $cellData = PHPExcel_Style_NumberFormat::toFormattedString(
+                                $cell->getValue(),
+                                $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
+                                array($this, 'formatColor')
+                            );
+                        }
+                        $cellData = htmlspecialchars($cellData);
+                        if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperScript()) {
+                            $cellData = '<sup>'.$cellData.'</sup>';
+                        } elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubScript()) {
+                            $cellData = '<sub>'.$cellData.'</sub>';
+                        }
+                    }
+
+                    // Converts the cell content so that spaces occuring at beginning of each new line are replaced by &nbsp;
+                    // Example: "  Hello\n to the world" is converted to "&nbsp;&nbsp;Hello\n&nbsp;to the world"
+                    $cellData = preg_replace("/(?m)(?:^|\\G) /", '&nbsp;', $cellData);
+
+                    // convert newline "\n" to '<br>'
+                    $cellData = nl2br($cellData);
+
+                    // Extend CSS class?
+                    if (!$this->useInlineCss) {
+                        $cssClass .= ' style' . $cell->getXfIndex();
+                        $cssClass .= ' ' . $cell->getDataType();
+                    } else {
+                        if ($cellType == 'th') {
+                            if (isset($this->cssStyles['th.style' . $cell->getXfIndex()])) {
+                                $cssClass = array_merge($cssClass, $this->cssStyles['th.style' . $cell->getXfIndex()]);
+                            }
+                        } else {
+                            if (isset($this->cssStyles['td.style' . $cell->getXfIndex()])) {
+                                $cssClass = array_merge($cssClass, $this->cssStyles['td.style' . $cell->getXfIndex()]);
+                            }
+                        }
+
+                        // General horizontal alignment: Actual horizontal alignment depends on dataType
+                        $sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex());
+                        if ($sharedStyle->getAlignment()->getHorizontal() == PHPExcel_Style_Alignment::HORIZONTAL_GENERAL
+                            && isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])) {
+                            $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align'];
+                        }
+                    }
+                }
+
+                // Hyperlink?
+                if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
+                    $cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>';
+                }
+
+                // Should the cell be written or is it swallowed by a rowspan or colspan?
+                $writeCell = !(isset($this->isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
+                            && $this->isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum]);
+
+                // Colspan and Rowspan
+                $colspan = 1;
+                $rowspan = 1;
+                if (isset($this->isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])) {
+                    $spans = $this->isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum];
+                    $rowSpan = $spans['rowspan'];
+                    $colSpan = $spans['colspan'];
+
+                    //    Also apply style from last cell in merge to fix borders -
+                    //        relies on !important for non-none border declarations in createCSSStyleBorder
+                    $endCellCoord = PHPExcel_Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan);
+                    if (!$this->useInlineCss) {
+                        $cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
+                    }
+                }
+
+                // Write
+                if ($writeCell) {
+                    // Column start
+                    $html .= '            <' . $cellType;
+                    if (!$this->useInlineCss) {
+                        $html .= ' class="' . $cssClass . '"';
+                    } else {
+                        //** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
+                        // We must explicitly write the width of the <td> element because TCPDF
+                        // does not recognize e.g. <col style="width:42pt">
+                        $width = 0;
+                        $i = $colNum - 1;
+                        $e = $colNum + $colSpan - 1;
+                        while ($i++ < $e) {
+                            if (isset($this->columnWidths[$sheetIndex][$i])) {
+                                $width += $this->columnWidths[$sheetIndex][$i];
+                            }
+                        }
+                        $cssClass['width'] = $width . 'pt';
+
+                        // We must also explicitly write the height of the <td> element because TCPDF
+                        // does not recognize e.g. <tr style="height:50pt">
+                        if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
+                            $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
+                            $cssClass['height'] = $height;
+                        }
+                        //** end of redundant code **
+
+                        $html .= ' style="' . $this->assembleCSS($cssClass) . '"';
+                    }
+                    if ($colSpan > 1) {
+                        $html .= ' colspan="' . $colSpan . '"';
+                    }
+                    if ($rowSpan > 1) {
+                        $html .= ' rowspan="' . $rowSpan . '"';
+                    }
+                    $html .= '>';
+
+                    // Image?
+                    $html .= $this->writeImageInCell($pSheet, $coordinate);
+
+                    // Chart?
+                    if ($this->includeCharts) {
+                        $html .= $this->writeChartInCell($pSheet, $coordinate);
+                    }
+
+                    // Cell data
+                    $html .= $cellData;
+
+                    // Column end
+                    $html .= '</'.$cellType.'>' . PHP_EOL;
+                }
+
+                // Next column
+                ++$colNum;
+            }
+
+            // Write row end
+            $html .= '          </tr>' . PHP_EOL;
+
+            // Return
+            return $html;
+        } else {
+            throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+        }
+    }
+
+    /**
+     * Takes array where of CSS properties / values and converts to CSS string
+     *
+     * @param array
+     * @return string
+     */
+    private function assembleCSS($pValue = array())
+    {
+        $pairs = array();
+        foreach ($pValue as $property => $value) {
+            $pairs[] = $property . ':' . $value;
+        }
+        $string = implode('; ', $pairs);
+
+        return $string;
+    }
+
+    /**
+     * Get images root
+     *
+     * @return string
+     */
+    public function getImagesRoot()
+    {
+        return $this->imagesRoot;
+    }
+
+    /**
+     * Set images root
+     *
+     * @param string $pValue
+     * @return PHPExcel_Writer_HTML
+     */
+    public function setImagesRoot($pValue = '.')
+    {
+        $this->imagesRoot = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get embed images
+     *
+     * @return boolean
+     */
+    public function getEmbedImages()
+    {
+        return $this->embedImages;
+    }
+
+    /**
+     * Set embed images
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Writer_HTML
+     */
+    public function setEmbedImages($pValue = '.')
+    {
+        $this->embedImages = $pValue;
+        return $this;
+    }
+
+    /**
+     * Get use inline CSS?
+     *
+     * @return boolean
+     */
+    public function getUseInlineCss()
+    {
+        return $this->useInlineCss;
+    }
+
+    /**
+     * Set use inline CSS?
+     *
+     * @param boolean $pValue
+     * @return PHPExcel_Writer_HTML
+     */
+    public function setUseInlineCss($pValue = false)
+    {
+        $this->useInlineCss = $pValue;
+        return $this;
+    }
+
+    /**
+     * Add color to formatted string as inline style
+     *
+     * @param string $pValue Plain formatted value without color
+     * @param string $pFormat Format code
+     * @return string
+     */
+    public function formatColor($pValue, $pFormat)
+    {
+        // Color information, e.g. [Red] is always at the beginning
+        $color = null; // initialize
+        $matches = array();
+
+        $color_regex = '/^\\[[a-zA-Z]+\\]/';
+        if (preg_match($color_regex, $pFormat, $matches)) {
+            $color = str_replace('[', '', $matches[0]);
+            $color = str_replace(']', '', $color);
+            $color = strtolower($color);
+        }
+
+        // convert to PCDATA
+        $value = htmlspecialchars($pValue);
+
+        // color span tag
+        if ($color !== null) {
+            $value = '<span style="color:' . $color . '">' . $value . '</span>';
+        }
+
+        return $value;
+    }
+
+    /**
+     * Calculate information about HTML colspan and rowspan which is not always the same as Excel's
+     */
+    private function calculateSpans()
+    {
+        // Identify all cells that should be omitted in HTML due to cell merge.
+        // In HTML only the upper-left cell should be written and it should have
+        //   appropriate rowspan / colspan attribute
+        $sheetIndexes = $this->sheetIndex !== null ?
+            array($this->sheetIndex) : range(0, $this->phpExcel->getSheetCount() - 1);
+
+        foreach ($sheetIndexes as $sheetIndex) {
+            $sheet = $this->phpExcel->getSheet($sheetIndex);
+
+            $candidateSpannedRow  = array();
+
+            // loop through all Excel merged cells
+            foreach ($sheet->getMergeCells() as $cells) {
+                list($cells,) = PHPExcel_Cell::splitRange($cells);
+                $first = $cells[0];
+                $last  = $cells[1];
+
+                list($fc, $fr) = PHPExcel_Cell::coordinateFromString($first);
+                $fc = PHPExcel_Cell::columnIndexFromString($fc) - 1;
+
+                list($lc, $lr) = PHPExcel_Cell::coordinateFromString($last);
+                $lc = PHPExcel_Cell::columnIndexFromString($lc) - 1;
+
+                // loop through the individual cells in the individual merge
+                $r = $fr - 1;
+                while ($r++ < $lr) {
+                    // also, flag this row as a HTML row that is candidate to be omitted
+                    $candidateSpannedRow[$r] = $r;
+
+                    $c = $fc - 1;
+                    while ($c++ < $lc) {
+                        if (!($c == $fc && $r == $fr)) {
+                            // not the upper-left cell (should not be written in HTML)
+                            $this->isSpannedCell[$sheetIndex][$r][$c] = array(
+                                'baseCell' => array($fr, $fc),
+                            );
+                        } else {
+                            // upper-left is the base cell that should hold the colspan/rowspan attribute
+                            $this->isBaseCell[$sheetIndex][$r][$c] = array(
+                                'xlrowspan' => $lr - $fr + 1, // Excel rowspan
+                                'rowspan'   => $lr - $fr + 1, // HTML rowspan, value may change
+                                'xlcolspan' => $lc - $fc + 1, // Excel colspan
+                                'colspan'   => $lc - $fc + 1, // HTML colspan, value may change
+                            );
+                        }
+                    }
+                }
+            }
+
+            // Identify which rows should be omitted in HTML. These are the rows where all the cells
+            //   participate in a merge and the where base cells are somewhere above.
+            $countColumns = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn());
+            foreach ($candidateSpannedRow as $rowIndex) {
+                if (isset($this->isSpannedCell[$sheetIndex][$rowIndex])) {
+                    if (count($this->isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
+                        $this->isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
+                    };
+                }
+            }
+
+            // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
+            if (isset($this->isSpannedRow[$sheetIndex])) {
+                foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) {
+                    $adjustedBaseCells = array();
+                    $c = -1;
+                    $e = $countColumns - 1;
+                    while ($c++ < $e) {
+                        $baseCell = $this->isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
+
+                        if (!in_array($baseCell, $adjustedBaseCells)) {
+                            // subtract rowspan by 1
+                            --$this->isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan'];
+                            $adjustedBaseCells[] = $baseCell;
+                        }
+                    }
+                }
+            }
+
+            // TODO: Same for columns
+        }
+
+        // We have calculated the spans
+        $this->spansAreCalculated = true;
+    }
+
+    private function setMargins(PHPExcel_Worksheet $pSheet)
+    {
+        $htmlPage = '@page { ';
+        $htmlBody = 'body { ';
+
+        $left = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()) . 'in; ';
+        $htmlPage .= 'margin-left: ' . $left;
+        $htmlBody .= 'margin-left: ' . $left;
+        $right = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()) . 'in; ';
+        $htmlPage .= 'margin-right: ' . $right;
+        $htmlBody .= 'margin-right: ' . $right;
+        $top = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()) . 'in; ';
+        $htmlPage .= 'margin-top: ' . $top;
+        $htmlBody .= 'margin-top: ' . $top;
+        $bottom = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()) . 'in; ';
+        $htmlPage .= 'margin-bottom: ' . $bottom;
+        $htmlBody .= 'margin-bottom: ' . $bottom;
+
+        $htmlPage .= "}\n";
+        $htmlBody .= "}\n";
+
+        return "<style>\n" . $htmlPage . $htmlBody . "</style>\n";
+    }
+}
diff --git a/lib/PHPExcel/Writer/IWriter.php b/lib/PHPExcel/Writer/IWriter.php
new file mode 100644
index 000000000..c7cfe7405
--- /dev/null
+++ b/lib/PHPExcel/Writer/IWriter.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ *  PHPExcel_Writer_IWriter
+ *
+ *  Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  @category   PHPExcel
+ *  @package    PHPExcel_Writer
+ *  @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *  @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *  @version    ##VERSION##, ##DATE##
+ */
+interface PHPExcel_Writer_IWriter
+{
+    /**
+     *  Save PHPExcel to file
+     *
+     *  @param   string       $pFilename  Name of the file to save
+     *  @throws  PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null);
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument.php b/lib/PHPExcel/Writer/OpenDocument.php
new file mode 100644
index 000000000..912ba9df7
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument.php
@@ -0,0 +1,190 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+{
+    /**
+     * Private writer parts
+     *
+     * @var PHPExcel_Writer_OpenDocument_WriterPart[]
+     */
+    private $writerParts = array();
+
+    /**
+     * Private PHPExcel
+     *
+     * @var PHPExcel
+     */
+    private $spreadSheet;
+
+    /**
+     * Create a new PHPExcel_Writer_OpenDocument
+     *
+     * @param PHPExcel $pPHPExcel
+     */
+    public function __construct(PHPExcel $pPHPExcel = null)
+    {
+        $this->setPHPExcel($pPHPExcel);
+
+        $writerPartsArray = array(
+            'content'    => 'PHPExcel_Writer_OpenDocument_Content',
+            'meta'       => 'PHPExcel_Writer_OpenDocument_Meta',
+            'meta_inf'   => 'PHPExcel_Writer_OpenDocument_MetaInf',
+            'mimetype'   => 'PHPExcel_Writer_OpenDocument_Mimetype',
+            'settings'   => 'PHPExcel_Writer_OpenDocument_Settings',
+            'styles'     => 'PHPExcel_Writer_OpenDocument_Styles',
+            'thumbnails' => 'PHPExcel_Writer_OpenDocument_Thumbnails'
+        );
+
+        foreach ($writerPartsArray as $writer => $class) {
+            $this->writerParts[$writer] = new $class($this);
+        }
+    }
+
+    /**
+     * Get writer part
+     *
+     * @param  string  $pPartName  Writer part name
+     * @return PHPExcel_Writer_Excel2007_WriterPart
+     */
+    public function getWriterPart($pPartName = '')
+    {
+        if ($pPartName != '' && isset($this->writerParts[strtolower($pPartName)])) {
+            return $this->writerParts[strtolower($pPartName)];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Save PHPExcel to file
+     *
+     * @param  string  $pFilename
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        if (!$this->spreadSheet) {
+            throw new PHPExcel_Writer_Exception('PHPExcel object unassigned.');
+        }
+
+        // garbage collect
+        $this->spreadSheet->garbageCollect();
+
+        // If $pFilename is php://output or php://stdout, make it a temporary file...
+        $originalFilename = $pFilename;
+        if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
+            $pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
+            if ($pFilename == '') {
+                $pFilename = $originalFilename;
+            }
+        }
+
+        $objZip = $this->createZip($pFilename);
+
+        $objZip->addFromString('META-INF/manifest.xml', $this->getWriterPart('meta_inf')->writeManifest());
+        $objZip->addFromString('Thumbnails/thumbnail.png', $this->getWriterPart('thumbnails')->writeThumbnail());
+        $objZip->addFromString('content.xml', $this->getWriterPart('content')->write());
+        $objZip->addFromString('meta.xml', $this->getWriterPart('meta')->write());
+        $objZip->addFromString('mimetype', $this->getWriterPart('mimetype')->write());
+        $objZip->addFromString('settings.xml', $this->getWriterPart('settings')->write());
+        $objZip->addFromString('styles.xml', $this->getWriterPart('styles')->write());
+
+        // Close file
+        if ($objZip->close() === false) {
+            throw new PHPExcel_Writer_Exception("Could not close zip file $pFilename.");
+        }
+
+        // If a temporary file was used, copy it to the correct file stream
+        if ($originalFilename != $pFilename) {
+            if (copy($pFilename, $originalFilename) === false) {
+                throw new PHPExcel_Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
+            }
+            @unlink($pFilename);
+        }
+    }
+
+    /**
+     * Create zip object
+     *
+     * @param string $pFilename
+     * @throws PHPExcel_Writer_Exception
+     * @return ZipArchive
+     */
+    private function createZip($pFilename)
+    {
+        // Create new ZIP file and open it for writing
+        $zipClass = PHPExcel_Settings::getZipClass();
+        $objZip = new $zipClass();
+
+        // Retrieve OVERWRITE and CREATE constants from the instantiated zip class
+        // This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
+        $ro = new ReflectionObject($objZip);
+        $zipOverWrite = $ro->getConstant('OVERWRITE');
+        $zipCreate = $ro->getConstant('CREATE');
+
+        if (file_exists($pFilename)) {
+            unlink($pFilename);
+        }
+        // Try opening the ZIP file
+        if ($objZip->open($pFilename, $zipOverWrite) !== true) {
+            if ($objZip->open($pFilename, $zipCreate) !== true) {
+                throw new PHPExcel_Writer_Exception("Could not open $pFilename for writing.");
+            }
+        }
+
+        return $objZip;
+    }
+
+    /**
+     * Get PHPExcel object
+     *
+     * @return PHPExcel
+     * @throws PHPExcel_Writer_Exception
+     */
+    public function getPHPExcel()
+    {
+        if ($this->spreadSheet !== null) {
+            return $this->spreadSheet;
+        } else {
+            throw new PHPExcel_Writer_Exception('No PHPExcel assigned.');
+        }
+    }
+
+    /**
+     * Set PHPExcel object
+     *
+     * @param  PHPExcel  $pPHPExcel  PHPExcel object
+     * @throws PHPExcel_Writer_Exception
+     * @return PHPExcel_Writer_Excel2007
+     */
+    public function setPHPExcel(PHPExcel $pPHPExcel = null)
+    {
+        $this->spreadSheet = $pPHPExcel;
+        return $this;
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Cell/Comment.php b/lib/PHPExcel/Writer/OpenDocument/Cell/Comment.php
new file mode 100644
index 000000000..f1e98a16e
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Cell/Comment.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Writer_OpenDocument_Cell_Comment
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
+ */
+class PHPExcel_Writer_OpenDocument_Cell_Comment
+{
+    public static function write(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Cell $cell)
+    {
+        $comments = $cell->getWorksheet()->getComments();
+        if (!isset($comments[$cell->getCoordinate()])) {
+            return;
+        }
+        $comment = $comments[$cell->getCoordinate()];
+
+        $objWriter->startElement('office:annotation');
+            //$objWriter->writeAttribute('draw:style-name', 'gr1');
+            //$objWriter->writeAttribute('draw:text-style-name', 'P1');
+            $objWriter->writeAttribute('svg:width', $comment->getWidth());
+            $objWriter->writeAttribute('svg:height', $comment->getHeight());
+            $objWriter->writeAttribute('svg:x', $comment->getMarginLeft());
+            $objWriter->writeAttribute('svg:y', $comment->getMarginTop());
+            //$objWriter->writeAttribute('draw:caption-point-x', $comment->getMarginLeft());
+            //$objWriter->writeAttribute('draw:caption-point-y', $comment->getMarginTop());
+                $objWriter->writeElement('dc:creator', $comment->getAuthor());
+                // TODO: Not realized in PHPExcel_Comment yet.
+                //$objWriter->writeElement('dc:date', $comment->getDate());
+                $objWriter->writeElement('text:p', $comment->getText()->getPlainText());
+                    //$objWriter->writeAttribute('draw:text-style-name', 'P1');
+        $objWriter->endElement();
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Content.php b/lib/PHPExcel/Writer/OpenDocument/Content.php
new file mode 100644
index 000000000..a34b1670c
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Content.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPExcel_Writer_OpenDocument_Content
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
+ */
+class PHPExcel_Writer_OpenDocument_Content extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    const NUMBER_COLS_REPEATED_MAX = 1024;
+    const NUMBER_ROWS_REPEATED_MAX = 1048576;
+
+    /**
+     * Write content.xml to XML format
+     *
+     * @param   PHPExcel                   $pPHPExcel
+     * @return  string                     XML Output
+     * @throws  PHPExcel_Writer_Exception
+     */
+    public function write(PHPExcel $pPHPExcel = null)
+    {
+        if (!$pPHPExcel) {
+            $pPHPExcel = $this->getParentWriter()->getPHPExcel(); /* @var $pPHPExcel PHPExcel */
+        }
+
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Content
+        $objWriter->startElement('office:document-content');
+            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+            $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0');
+            $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0');
+            $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
+            $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
+            $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
+            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+            $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+            $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
+            $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
+            $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
+            $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
+            $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
+            $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
+            $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
+            $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
+            $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
+            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+            $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
+            $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
+            $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
+            $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms');
+            $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema');
+            $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+            $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
+            $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
+            $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
+            $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
+            $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
+            $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0');
+            $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0');
+            $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
+            $objWriter->writeAttribute('office:version', '1.2');
+
+            $objWriter->writeElement('office:scripts');
+            $objWriter->writeElement('office:font-face-decls');
+            $objWriter->writeElement('office:automatic-styles');
+
+            $objWriter->startElement('office:body');
+                $objWriter->startElement('office:spreadsheet');
+                    $objWriter->writeElement('table:calculation-settings');
+                    $this->writeSheets($objWriter);
+                    $objWriter->writeElement('table:named-expressions');
+                $objWriter->endElement();
+            $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write sheets
+     *
+     * @param PHPExcel_Shared_XMLWriter $objWriter
+     */
+    private function writeSheets(PHPExcel_Shared_XMLWriter $objWriter)
+    {
+        $pPHPExcel = $this->getParentWriter()->getPHPExcel(); /* @var $pPHPExcel PHPExcel */
+
+        $sheet_count = $pPHPExcel->getSheetCount();
+        for ($i = 0; $i < $sheet_count; $i++) {
+            //$this->getWriterPart('Worksheet')->writeWorksheet());
+            $objWriter->startElement('table:table');
+                $objWriter->writeAttribute('table:name', $pPHPExcel->getSheet($i)->getTitle());
+                $objWriter->writeElement('office:forms');
+                $objWriter->startElement('table:table-column');
+                    $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
+                $objWriter->endElement();
+                $this->writeRows($objWriter, $pPHPExcel->getSheet($i));
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write rows of the specified sheet
+     *
+     * @param PHPExcel_Shared_XMLWriter $objWriter
+     * @param PHPExcel_Worksheet $sheet
+     */
+    private function writeRows(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Worksheet $sheet)
+    {
+        $number_rows_repeated = self::NUMBER_ROWS_REPEATED_MAX;
+        $span_row = 0;
+        $rows = $sheet->getRowIterator();
+        while ($rows->valid()) {
+            $number_rows_repeated--;
+            $row = $rows->current();
+            if ($row->getCellIterator()->valid()) {
+                if ($span_row) {
+                    $objWriter->startElement('table:table-row');
+                    if ($span_row > 1) {
+                        $objWriter->writeAttribute('table:number-rows-repeated', $span_row);
+                    }
+                    $objWriter->startElement('table:table-cell');
+                        $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
+                    $objWriter->endElement();
+                    $objWriter->endElement();
+                    $span_row = 0;
+                }
+                $objWriter->startElement('table:table-row');
+                $this->writeCells($objWriter, $row);
+                $objWriter->endElement();
+            } else {
+                $span_row++;
+            }
+            $rows->next();
+        }
+    }
+
+    /**
+     * Write cells of the specified row
+     *
+     * @param PHPExcel_Shared_XMLWriter $objWriter
+     * @param PHPExcel_Worksheet_Row $row
+     * @throws PHPExcel_Writer_Exception
+     */
+    private function writeCells(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Worksheet_Row $row)
+    {
+        $number_cols_repeated = self::NUMBER_COLS_REPEATED_MAX;
+        $prev_column = -1;
+        $cells = $row->getCellIterator();
+        while ($cells->valid()) {
+            $cell = $cells->current();
+            $column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
+
+            $this->writeCellSpan($objWriter, $column, $prev_column);
+            $objWriter->startElement('table:table-cell');
+
+            switch ($cell->getDataType()) {
+                case PHPExcel_Cell_DataType::TYPE_BOOL:
+                    $objWriter->writeAttribute('office:value-type', 'boolean');
+                    $objWriter->writeAttribute('office:value', $cell->getValue());
+                    $objWriter->writeElement('text:p', $cell->getValue());
+                    break;
+
+                case PHPExcel_Cell_DataType::TYPE_ERROR:
+                    throw new PHPExcel_Writer_Exception('Writing of error not implemented yet.');
+                    break;
+
+                case PHPExcel_Cell_DataType::TYPE_FORMULA:
+                    try {
+                        $formula_value = $cell->getCalculatedValue();
+                    } catch (Exception $e) {
+                        $formula_value = $cell->getValue();
+                    }
+                    $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue());
+                    if (is_numeric($formula_value)) {
+                        $objWriter->writeAttribute('office:value-type', 'float');
+                    } else {
+                        $objWriter->writeAttribute('office:value-type', 'string');
+                    }
+                    $objWriter->writeAttribute('office:value', $formula_value);
+                    $objWriter->writeElement('text:p', $formula_value);
+                    break;
+
+                case PHPExcel_Cell_DataType::TYPE_INLINE:
+                    throw new PHPExcel_Writer_Exception('Writing of inline not implemented yet.');
+                    break;
+
+                case PHPExcel_Cell_DataType::TYPE_NUMERIC:
+                    $objWriter->writeAttribute('office:value-type', 'float');
+                    $objWriter->writeAttribute('office:value', $cell->getValue());
+                    $objWriter->writeElement('text:p', $cell->getValue());
+                    break;
+
+                case PHPExcel_Cell_DataType::TYPE_STRING:
+                    $objWriter->writeAttribute('office:value-type', 'string');
+                    $objWriter->writeElement('text:p', $cell->getValue());
+                    break;
+            }
+            PHPExcel_Writer_OpenDocument_Cell_Comment::write($objWriter, $cell);
+            $objWriter->endElement();
+            $prev_column = $column;
+            $cells->next();
+        }
+        $number_cols_repeated = $number_cols_repeated - $prev_column - 1;
+        if ($number_cols_repeated > 0) {
+            if ($number_cols_repeated > 1) {
+                $objWriter->startElement('table:table-cell');
+                $objWriter->writeAttribute('table:number-columns-repeated', $number_cols_repeated);
+                $objWriter->endElement();
+            } else {
+                $objWriter->writeElement('table:table-cell');
+            }
+        }
+    }
+
+    /**
+     * Write span
+     *
+     * @param PHPExcel_Shared_XMLWriter $objWriter
+     * @param integer $curColumn
+     * @param integer $prevColumn
+     */
+    private function writeCellSpan(PHPExcel_Shared_XMLWriter $objWriter, $curColumn, $prevColumn)
+    {
+        $diff = $curColumn - $prevColumn - 1;
+        if (1 === $diff) {
+            $objWriter->writeElement('table:table-cell');
+        } elseif ($diff > 1) {
+            $objWriter->startElement('table:table-cell');
+                $objWriter->writeAttribute('table:number-columns-repeated', $diff);
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Meta.php b/lib/PHPExcel/Writer/OpenDocument/Meta.php
new file mode 100644
index 000000000..1a5c5fd0b
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Meta.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument_Meta
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument_Meta extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    /**
+     * Write meta.xml to XML format
+     *
+     * @param   PHPExcel                   $pPHPExcel
+     * @return  string                     XML Output
+     * @throws  PHPExcel_Writer_Exception
+     */
+    public function write(PHPExcel $pPHPExcel = null)
+    {
+        if (!$pPHPExcel) {
+            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
+        }
+
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Meta
+        $objWriter->startElement('office:document-meta');
+
+        $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+        $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+        $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
+        $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+        $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
+        $objWriter->writeAttribute('office:version', '1.2');
+
+        $objWriter->startElement('office:meta');
+
+        $objWriter->writeElement('meta:initial-creator', $pPHPExcel->getProperties()->getCreator());
+        $objWriter->writeElement('dc:creator', $pPHPExcel->getProperties()->getCreator());
+        $objWriter->writeElement('meta:creation-date', date(DATE_W3C, $pPHPExcel->getProperties()->getCreated()));
+        $objWriter->writeElement('dc:date', date(DATE_W3C, $pPHPExcel->getProperties()->getCreated()));
+        $objWriter->writeElement('dc:title', $pPHPExcel->getProperties()->getTitle());
+        $objWriter->writeElement('dc:description', $pPHPExcel->getProperties()->getDescription());
+        $objWriter->writeElement('dc:subject', $pPHPExcel->getProperties()->getSubject());
+        $keywords = explode(' ', $pPHPExcel->getProperties()->getKeywords());
+        foreach ($keywords as $keyword) {
+            $objWriter->writeElement('meta:keyword', $keyword);
+        }
+
+        //<meta:document-statistic meta:table-count="XXX" meta:cell-count="XXX" meta:object-count="XXX"/>
+        $objWriter->startElement('meta:user-defined');
+        $objWriter->writeAttribute('meta:name', 'Company');
+        $objWriter->writeRaw($pPHPExcel->getProperties()->getCompany());
+        $objWriter->endElement();
+ 
+        $objWriter->startElement('meta:user-defined');
+        $objWriter->writeAttribute('meta:name', 'category');
+        $objWriter->writeRaw($pPHPExcel->getProperties()->getCategory());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/MetaInf.php b/lib/PHPExcel/Writer/OpenDocument/MetaInf.php
new file mode 100644
index 000000000..c43b72334
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/MetaInf.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument_MetaInf
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument_MetaInf extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    /**
+     * Write META-INF/manifest.xml to XML format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function writeManifest(PHPExcel $pPHPExcel = null)
+    {
+        if (!$pPHPExcel) {
+            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
+        }
+
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Manifest
+        $objWriter->startElement('manifest:manifest');
+            $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0');
+            $objWriter->writeAttribute('manifest:version', '1.2');
+
+            $objWriter->startElement('manifest:file-entry');
+                $objWriter->writeAttribute('manifest:full-path', '/');
+                $objWriter->writeAttribute('manifest:version', '1.2');
+                $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet');
+            $objWriter->endElement();
+            $objWriter->startElement('manifest:file-entry');
+                $objWriter->writeAttribute('manifest:full-path', 'meta.xml');
+                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+            $objWriter->endElement();
+            $objWriter->startElement('manifest:file-entry');
+                $objWriter->writeAttribute('manifest:full-path', 'settings.xml');
+                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+            $objWriter->endElement();
+            $objWriter->startElement('manifest:file-entry');
+                $objWriter->writeAttribute('manifest:full-path', 'content.xml');
+                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+            $objWriter->endElement();
+            $objWriter->startElement('manifest:file-entry');
+                $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png');
+                $objWriter->writeAttribute('manifest:media-type', 'image/png');
+            $objWriter->endElement();
+            $objWriter->startElement('manifest:file-entry');
+                $objWriter->writeAttribute('manifest:full-path', 'styles.xml');
+                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+            $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Mimetype.php b/lib/PHPExcel/Writer/OpenDocument/Mimetype.php
new file mode 100644
index 000000000..d51a8b970
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Mimetype.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * PHPExcel
+ *
+ * PHPExcel_Writer_OpenDocument_Mimetype
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument_Mimetype extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    /**
+     * Write mimetype to plain text format
+     *
+     * @param     PHPExcel    $pPHPExcel
+     * @return     string         XML Output
+     * @throws     PHPExcel_Writer_Exception
+     */
+    public function write(PHPExcel $pPHPExcel = null)
+    {
+        return 'application/vnd.oasis.opendocument.spreadsheet';
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Settings.php b/lib/PHPExcel/Writer/OpenDocument/Settings.php
new file mode 100644
index 000000000..84161b6d7
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Settings.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument_Settings
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument_Settings extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    /**
+     * Write settings.xml to XML format
+     *
+     * @param   PHPExcel                   $pPHPExcel
+     * @return  string                     XML Output
+     * @throws  PHPExcel_Writer_Exception
+     */
+    public function write(PHPExcel $pPHPExcel = null)
+    {
+        if (!$pPHPExcel) {
+            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
+        }
+
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Settings
+        $objWriter->startElement('office:document-settings');
+            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+            $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0');
+            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+            $objWriter->writeAttribute('office:version', '1.2');
+
+            $objWriter->startElement('office:settings');
+                $objWriter->startElement('config:config-item-set');
+                    $objWriter->writeAttribute('config:name', 'ooo:view-settings');
+                    $objWriter->startElement('config:config-item-map-indexed');
+                        $objWriter->writeAttribute('config:name', 'Views');
+                    $objWriter->endElement();
+                $objWriter->endElement();
+                $objWriter->startElement('config:config-item-set');
+                    $objWriter->writeAttribute('config:name', 'ooo:configuration-settings');
+                $objWriter->endElement();
+            $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Styles.php b/lib/PHPExcel/Writer/OpenDocument/Styles.php
new file mode 100644
index 000000000..cc6e25b48
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Styles.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument_Styles
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument_Styles extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    /**
+     * Write styles.xml to XML format
+     *
+     * @param   PHPExcel                   $pPHPExcel
+     * @return  string                     XML Output
+     * @throws  PHPExcel_Writer_Exception
+     */
+    public function write(PHPExcel $pPHPExcel = null)
+    {
+        if (!$pPHPExcel) {
+            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
+        }
+
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Content
+        $objWriter->startElement('office:document-styles');
+            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+            $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0');
+            $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0');
+            $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
+            $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
+            $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
+            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+            $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+            $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
+            $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
+            $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
+            $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
+            $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
+            $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
+            $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
+            $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
+            $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
+            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+            $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
+            $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
+            $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
+            $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
+            $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
+            $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
+            $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
+            $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
+            $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
+            $objWriter->writeAttribute('office:version', '1.2');
+
+            $objWriter->writeElement('office:font-face-decls');
+            $objWriter->writeElement('office:styles');
+            $objWriter->writeElement('office:automatic-styles');
+            $objWriter->writeElement('office:master-styles');
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/Thumbnails.php b/lib/PHPExcel/Writer/OpenDocument/Thumbnails.php
new file mode 100644
index 000000000..54247ae2a
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/Thumbnails.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument_Thumbnails
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_OpenDocument_Thumbnails extends PHPExcel_Writer_OpenDocument_WriterPart
+{
+    /**
+     * Write Thumbnails/thumbnail.png to PNG format
+     *
+     * @param   PHPExcel                   $pPHPExcel
+     * @return  string                     XML Output
+     * @throws  PHPExcel_Writer_Exception
+     */
+    public function writeThumbnail(PHPExcel $pPHPExcel = null)
+    {
+        return '';
+    }
+}
diff --git a/lib/PHPExcel/Writer/OpenDocument/WriterPart.php b/lib/PHPExcel/Writer/OpenDocument/WriterPart.php
new file mode 100644
index 000000000..562787a33
--- /dev/null
+++ b/lib/PHPExcel/Writer/OpenDocument/WriterPart.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * PHPExcel_Writer_OpenDocument_WriterPart
+ *
+ * Copyright (c) 2006 - 2015 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_OpenDocument
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Writer_OpenDocument_WriterPart extends PHPExcel_Writer_Excel2007_WriterPart
+{
+}
diff --git a/lib/PHPExcel/Writer/PDF.php b/lib/PHPExcel/Writer/PDF.php
new file mode 100644
index 000000000..579edfa53
--- /dev/null
+++ b/lib/PHPExcel/Writer/PDF.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ *  PHPExcel_Writer_PDF
+ *
+ *  Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  @category    PHPExcel
+ *  @package     PHPExcel_Writer_PDF
+ *  @copyright   Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *  @version     ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_PDF implements PHPExcel_Writer_IWriter
+{
+
+    /**
+     * The wrapper for the requested PDF rendering engine
+     *
+     * @var PHPExcel_Writer_PDF_Core
+     */
+    private $renderer = null;
+
+    /**
+     *  Instantiate a new renderer of the configured type within this container class
+     *
+     *  @param  PHPExcel   $phpExcel         PHPExcel object
+     *  @throws PHPExcel_Writer_Exception    when PDF library is not configured
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        $pdfLibraryName = PHPExcel_Settings::getPdfRendererName();
+        if (is_null($pdfLibraryName)) {
+            throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined.");
+        }
+
+        $pdfLibraryPath = PHPExcel_Settings::getPdfRendererPath();
+        if (is_null($pdfLibraryName)) {
+            throw new PHPExcel_Writer_Exception("PDF Rendering library path has not been defined.");
+        }
+        $includePath = str_replace('\\', '/', get_include_path());
+        $rendererPath = str_replace('\\', '/', $pdfLibraryPath);
+        if (strpos($rendererPath, $includePath) === false) {
+            set_include_path(get_include_path() . PATH_SEPARATOR . $pdfLibraryPath);
+        }
+
+        $rendererName = 'PHPExcel_Writer_PDF_' . $pdfLibraryName;
+        $this->renderer = new $rendererName($phpExcel);
+    }
+
+
+    /**
+     *  Magic method to handle direct calls to the configured PDF renderer wrapper class.
+     *
+     *  @param   string   $name        Renderer library method name
+     *  @param   mixed[]  $arguments   Array of arguments to pass to the renderer method
+     *  @return  mixed    Returned data from the PDF renderer wrapper method
+     */
+    public function __call($name, $arguments)
+    {
+        if ($this->renderer === null) {
+            throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined.");
+        }
+
+        return call_user_func_array(array($this->renderer, $name), $arguments);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save($pFilename = null)
+    {
+        $this->renderer->save($pFilename);
+    }
+}
diff --git a/lib/PHPExcel/Writer/PDF/Core.php b/lib/PHPExcel/Writer/PDF/Core.php
new file mode 100644
index 000000000..4fed84a71
--- /dev/null
+++ b/lib/PHPExcel/Writer/PDF/Core.php
@@ -0,0 +1,355 @@
+<?php
+
+/**
+ *  PHPExcel_Writer_PDF_Core
+ *
+ *  Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  @category    PHPExcel
+ *  @package     PHPExcel_Writer_PDF
+ *  @copyright   Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *  @version     ##VERSION##, ##DATE##
+ */
+abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
+{
+    /**
+     * Temporary storage directory
+     *
+     * @var string
+     */
+    protected $tempDir = '';
+
+    /**
+     * Font
+     *
+     * @var string
+     */
+    protected $font = 'freesans';
+
+    /**
+     * Orientation (Over-ride)
+     *
+     * @var string
+     */
+    protected $orientation;
+
+    /**
+     * Paper size (Over-ride)
+     *
+     * @var int
+     */
+    protected $paperSize;
+
+
+    /**
+     * Temporary storage for Save Array Return type
+     *
+     * @var string
+     */
+    private $saveArrayReturnType;
+
+    /**
+     * Paper Sizes xRef List
+     *
+     * @var array
+     */
+    protected static $paperSizes = array(
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER
+            => 'LETTER',                 //    (8.5 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL
+            => 'LETTER',                 //    (8.5 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID
+            => array(792.00, 1224.00),   //    (11 in. by 17 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEDGER
+            => array(1224.00, 792.00),   //    (17 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL
+            => 'LEGAL',                  //    (8.5 in. by 14 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STATEMENT
+            => array(396.00, 612.00),    //    (5.5 in. by 8.5 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_EXECUTIVE
+            => 'EXECUTIVE',              //    (7.25 in. by 10.5 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3
+            => 'A3',                     //    (297 mm by 420 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4
+            => 'A4',                     //    (210 mm by 297 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_SMALL
+            => 'A4',                     //    (210 mm by 297 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5
+            => 'A5',                     //    (148 mm by 210 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4
+            => 'B4',                     //    (250 mm by 353 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5
+            => 'B5',                     //    (176 mm by 250 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_FOLIO
+            => 'FOLIO',                  //    (8.5 in. by 13 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_QUARTO
+            => array(609.45, 779.53),    //    (215 mm by 275 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_1
+            => array(720.00, 1008.00),   //    (10 in. by 14 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_2
+            => array(792.00, 1224.00),   //    (11 in. by 17 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NOTE
+            => 'LETTER',                 //    (8.5 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE
+            => array(279.00, 639.00),    //    (3.875 in. by 8.875 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE
+            => array(297.00, 684.00),    //    (4.125 in. by 9.5 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE
+            => array(324.00, 747.00),    //    (4.5 in. by 10.375 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE
+            => array(342.00, 792.00),    //    (4.75 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE
+            => array(360.00, 828.00),    //    (5 in. by 11.5 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C
+            => array(1224.00, 1584.00),  //    (17 in. by 22 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_D
+            => array(1584.00, 2448.00),  //    (22 in. by 34 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_E
+            => array(2448.00, 3168.00),  //    (34 in. by 44 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE
+            => array(311.81, 623.62),    //    (110 mm by 220 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE
+            => 'C5',                     //    (162 mm by 229 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE
+            => 'C3',                     //    (324 mm by 458 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE
+            => 'C4',                     //    (229 mm by 324 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE
+            => 'C6',                     //    (114 mm by 162 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE
+            => array(323.15, 649.13),    //    (114 mm by 229 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE
+            => 'B4',                     //    (250 mm by 353 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE
+            => 'B5',                     //    (176 mm by 250 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE
+            => array(498.90, 354.33),    //    (176 mm by 125 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE
+            => array(311.81, 651.97),    //    (110 mm by 230 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE
+            => array(279.00, 540.00),    //    (3.875 in. by 7.5 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE
+            => array(261.00, 468.00),    //    (3.625 in. by 6.5 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD
+            => array(1071.00, 792.00),   //    (14.875 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD
+            => array(612.00, 864.00),    //    (8.5 in. by 12 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD
+            => 'FOLIO',                  //    (8.5 in. by 13 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B4
+            => 'B4',                     //    (250 mm by 353 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD
+            => array(566.93, 419.53),    //    (200 mm by 148 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1
+            => array(648.00, 792.00),    //    (9 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2
+            => array(720.00, 792.00),    //    (10 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3
+            => array(1080.00, 792.00),   //    (15 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE
+            => array(623.62, 623.62),    //    (220 mm by 220 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER
+            => array(667.80, 864.00),    //    (9.275 in. by 12 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER
+            => array(667.80, 1080.00),   //    (9.275 in. by 15 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER
+            => array(841.68, 1296.00),   //    (11.69 in. by 18 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER
+            => array(668.98, 912.76),    //    (236 mm by 322 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER
+            => array(595.80, 792.00),    //    (8.275 in. by 11 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER
+            => 'A4',                     //    (210 mm by 297 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER
+            => array(667.80, 864.00),    //    (9.275 in. by 12 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER
+            => array(643.46, 1009.13),   //    (227 mm by 356 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER
+            => array(864.57, 1380.47),   //    (305 mm by 487 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER
+            => array(612.00, 913.68),    //    (8.5 in. by 12.69 in.)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER
+            => array(595.28, 935.43),    //    (210 mm by 330 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER
+            => 'A5',                     //    (148 mm by 210 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER
+            => array(515.91, 728.50),    //    (182 mm by 257 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER
+            => array(912.76, 1261.42),   //    (322 mm by 445 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER
+            => array(493.23, 666.14),    //    (174 mm by 235 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER
+            => array(569.76, 782.36),    //    (201 mm by 276 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A2_PAPER
+            => 'A2',                     //    (420 mm by 594 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER
+            => 'A3',                     //    (297 mm by 420 mm)
+        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER
+            => array(912.76, 1261.42)    //    (322 mm by 445 mm)
+    );
+
+    /**
+     *  Create a new PHPExcel_Writer_PDF
+     *
+     *  @param     PHPExcel    $phpExcel    PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        parent::__construct($phpExcel);
+        $this->setUseInlineCss(true);
+        $this->tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+    }
+
+    /**
+     *  Get Font
+     *
+     *  @return string
+     */
+    public function getFont()
+    {
+        return $this->font;
+    }
+
+    /**
+     *  Set font. Examples:
+     *      'arialunicid0-chinese-simplified'
+     *      'arialunicid0-chinese-traditional'
+     *      'arialunicid0-korean'
+     *      'arialunicid0-japanese'
+     *
+     *  @param    string    $fontName
+     */
+    public function setFont($fontName)
+    {
+        $this->font = $fontName;
+        return $this;
+    }
+
+    /**
+     *  Get Paper Size
+     *
+     *  @return int
+     */
+    public function getPaperSize()
+    {
+        return $this->paperSize;
+    }
+
+    /**
+     *  Set Paper Size
+     *
+     *  @param  string  $pValue Paper size
+     *  @return PHPExcel_Writer_PDF
+     */
+    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER)
+    {
+        $this->paperSize = $pValue;
+        return $this;
+    }
+
+    /**
+     *  Get Orientation
+     *
+     *  @return string
+     */
+    public function getOrientation()
+    {
+        return $this->orientation;
+    }
+
+    /**
+     *  Set Orientation
+     *
+     *  @param string $pValue  Page orientation
+     *  @return PHPExcel_Writer_PDF
+     */
+    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
+    {
+        $this->orientation = $pValue;
+        return $this;
+    }
+
+    /**
+     *  Get temporary storage directory
+     *
+     *  @return string
+     */
+    public function getTempDir()
+    {
+        return $this->tempDir;
+    }
+
+    /**
+     *  Set temporary storage directory
+     *
+     *  @param     string        $pValue        Temporary storage directory
+     *  @throws    PHPExcel_Writer_Exception    when directory does not exist
+     *  @return    PHPExcel_Writer_PDF
+     */
+    public function setTempDir($pValue = '')
+    {
+        if (is_dir($pValue)) {
+            $this->tempDir = $pValue;
+        } else {
+            throw new PHPExcel_Writer_Exception("Directory does not exist: $pValue");
+        }
+        return $this;
+    }
+
+    /**
+     *  Save PHPExcel to PDF file, pre-save
+     *
+     *  @param     string     $pFilename   Name of the file to save as
+     *  @throws    PHPExcel_Writer_Exception
+     */
+    protected function prepareForSave($pFilename = null)
+    {
+        //  garbage collect
+        $this->phpExcel->garbageCollect();
+
+        $this->saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
+        PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+
+        //  Open file
+        $fileHandle = fopen($pFilename, 'w');
+        if ($fileHandle === false) {
+            throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
+        }
+
+        //  Set PDF
+        $this->isPdf = true;
+        //  Build CSS
+        $this->buildCSS(true);
+
+        return $fileHandle;
+    }
+
+    /**
+     *  Save PHPExcel to PDF file, post-save
+     *
+     *  @param     resource      $fileHandle
+     *  @throws    PHPExcel_Writer_Exception
+     */
+    protected function restoreStateAfterSave($fileHandle)
+    {
+        //  Close file
+        fclose($fileHandle);
+
+        PHPExcel_Calculation::setArrayReturnType($this->saveArrayReturnType);
+    }
+}
diff --git a/lib/PHPExcel/Writer/PDF/DomPDF.php b/lib/PHPExcel/Writer/PDF/DomPDF.php
new file mode 100644
index 000000000..83761acb3
--- /dev/null
+++ b/lib/PHPExcel/Writer/PDF/DomPDF.php
@@ -0,0 +1,108 @@
+<?php
+
+/**  Require DomPDF library */
+$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/dompdf_config.inc.php';
+if (file_exists($pdfRendererClassFile)) {
+    require_once $pdfRendererClassFile;
+} else {
+    throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
+}
+
+/**
+ *  PHPExcel_Writer_PDF_DomPDF
+ *
+ *  Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  @category    PHPExcel
+ *  @package     PHPExcel_Writer_PDF
+ *  @copyright   Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *  @version     ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
+{
+    /**
+     *  Create a new PHPExcel_Writer_PDF
+     *
+     *  @param   PHPExcel    $phpExcel    PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        parent::__construct($phpExcel);
+    }
+
+    /**
+     *  Save PHPExcel to file
+     *
+     *  @param   string     $pFilename   Name of the file to save as
+     *  @throws  PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        $fileHandle = parent::prepareForSave($pFilename);
+
+        //  Default PDF paper size
+        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
+
+        //  Check for paper size and page orientation
+        if (is_null($this->getSheetIndex())) {
+            $orientation = ($this->phpExcel->getSheet(0)->getPageSetup()->getOrientation()
+                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+            $printPaperSize = $this->phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
+            $printMargins = $this->phpExcel->getSheet(0)->getPageMargins();
+        } else {
+            $orientation = ($this->phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
+                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+            $printPaperSize = $this->phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+            $printMargins = $this->phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
+        }
+        
+        $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
+
+        //  Override Page Orientation
+        if (!is_null($this->getOrientation())) {
+            $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
+                ? PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT
+                : $this->getOrientation();
+        }
+        //  Override Paper Size
+        if (!is_null($this->getPaperSize())) {
+            $printPaperSize = $this->getPaperSize();
+        }
+
+        if (isset(self::$paperSizes[$printPaperSize])) {
+            $paperSize = self::$paperSizes[$printPaperSize];
+        }
+
+
+        //  Create PDF
+        $pdf = new DOMPDF();
+        $pdf->set_paper(strtolower($paperSize), $orientation);
+
+        $pdf->load_html(
+            $this->generateHTMLHeader(false) .
+            $this->generateSheetData() .
+            $this->generateHTMLFooter()
+        );
+        $pdf->render();
+
+        //  Write to file
+        fwrite($fileHandle, $pdf->output());
+
+        parent::restoreStateAfterSave($fileHandle);
+    }
+}
diff --git a/lib/PHPExcel/Writer/PDF/mPDF.php b/lib/PHPExcel/Writer/PDF/mPDF.php
new file mode 100644
index 000000000..e4e6057d7
--- /dev/null
+++ b/lib/PHPExcel/Writer/PDF/mPDF.php
@@ -0,0 +1,118 @@
+<?php
+
+/**  Require mPDF library */
+$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/mpdf.php';
+if (file_exists($pdfRendererClassFile)) {
+    require_once $pdfRendererClassFile;
+} else {
+    throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
+}
+
+/**
+ *  PHPExcel_Writer_PDF_mPDF
+ *
+ *  Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  @category    PHPExcel
+ *  @package     PHPExcel_Writer_PDF
+ *  @copyright   Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *  @version     ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
+{
+    /**
+     *  Create a new PHPExcel_Writer_PDF
+     *
+     *  @param  PHPExcel  $phpExcel  PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        parent::__construct($phpExcel);
+    }
+
+    /**
+     *  Save PHPExcel to file
+     *
+     *  @param     string     $pFilename   Name of the file to save as
+     *  @throws    PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        $fileHandle = parent::prepareForSave($pFilename);
+
+        //  Default PDF paper size
+        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
+
+        //  Check for paper size and page orientation
+        if (is_null($this->getSheetIndex())) {
+            $orientation = ($this->phpExcel->getSheet(0)->getPageSetup()->getOrientation()
+                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+            $printPaperSize = $this->phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
+            $printMargins = $this->phpExcel->getSheet(0)->getPageMargins();
+        } else {
+            $orientation = ($this->phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
+                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+            $printPaperSize = $this->phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+            $printMargins = $this->phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
+        }
+        $this->setOrientation($orientation);
+
+        //  Override Page Orientation
+        if (!is_null($this->getOrientation())) {
+            $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
+                ? PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT
+                : $this->getOrientation();
+        }
+        $orientation = strtoupper($orientation);
+
+        //  Override Paper Size
+        if (!is_null($this->getPaperSize())) {
+            $printPaperSize = $this->getPaperSize();
+        }
+
+        if (isset(self::$paperSizes[$printPaperSize])) {
+            $paperSize = self::$paperSizes[$printPaperSize];
+        }
+
+
+        //  Create PDF
+        $pdf = new mpdf();
+        $ortmp = $orientation;
+        $pdf->_setPageSize(strtoupper($paperSize), $ortmp);
+        $pdf->DefOrientation = $orientation;
+        $pdf->AddPage($orientation);
+
+        //  Document info
+        $pdf->SetTitle($this->phpExcel->getProperties()->getTitle());
+        $pdf->SetAuthor($this->phpExcel->getProperties()->getCreator());
+        $pdf->SetSubject($this->phpExcel->getProperties()->getSubject());
+        $pdf->SetKeywords($this->phpExcel->getProperties()->getKeywords());
+        $pdf->SetCreator($this->phpExcel->getProperties()->getCreator());
+
+        $pdf->WriteHTML(
+            $this->generateHTMLHeader(false) .
+            $this->generateSheetData() .
+            $this->generateHTMLFooter()
+        );
+
+        //  Write to file
+        fwrite($fileHandle, $pdf->Output('', 'S'));
+
+        parent::restoreStateAfterSave($fileHandle);
+    }
+}
diff --git a/lib/PHPExcel/Writer/PDF/tcPDF.php b/lib/PHPExcel/Writer/PDF/tcPDF.php
new file mode 100644
index 000000000..dea33a352
--- /dev/null
+++ b/lib/PHPExcel/Writer/PDF/tcPDF.php
@@ -0,0 +1,123 @@
+<?php
+
+/**  Require tcPDF library */
+$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/tcpdf.php';
+if (file_exists($pdfRendererClassFile)) {
+    $k_path_url = PHPExcel_Settings::getPdfRendererPath();
+    require_once $pdfRendererClassFile;
+} else {
+    throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
+}
+
+/**
+ *  PHPExcel_Writer_PDF_tcPDF
+ *
+ *  Copyright (c) 2006 - 2015 PHPExcel
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  @category    PHPExcel
+ *  @package     PHPExcel_Writer_PDF
+ *  @copyright   Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ *  @version     ##VERSION##, ##DATE##
+ */
+class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
+{
+    /**
+     *  Create a new PHPExcel_Writer_PDF
+     *
+     *  @param  PHPExcel  $phpExcel  PHPExcel object
+     */
+    public function __construct(PHPExcel $phpExcel)
+    {
+        parent::__construct($phpExcel);
+    }
+
+    /**
+     *  Save PHPExcel to file
+     *
+     *  @param     string     $pFilename   Name of the file to save as
+     *  @throws    PHPExcel_Writer_Exception
+     */
+    public function save($pFilename = null)
+    {
+        $fileHandle = parent::prepareForSave($pFilename);
+
+        //  Default PDF paper size
+        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
+
+        //  Check for paper size and page orientation
+        if (is_null($this->getSheetIndex())) {
+            $orientation = ($this->phpExcel->getSheet(0)->getPageSetup()->getOrientation()
+                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+            $printPaperSize = $this->phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
+            $printMargins = $this->phpExcel->getSheet(0)->getPageMargins();
+        } else {
+            $orientation = ($this->phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
+                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+            $printPaperSize = $this->phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+            $printMargins = $this->phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
+        }
+
+        //  Override Page Orientation
+        if (!is_null($this->getOrientation())) {
+            $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+                ? 'L'
+                : 'P';
+        }
+        //  Override Paper Size
+        if (!is_null($this->getPaperSize())) {
+            $printPaperSize = $this->getPaperSize();
+        }
+
+        if (isset(self::$paperSizes[$printPaperSize])) {
+            $paperSize = self::$paperSizes[$printPaperSize];
+        }
+
+
+        //  Create PDF
+        $pdf = new TCPDF($orientation, 'pt', $paperSize);
+        $pdf->setFontSubsetting(false);
+        //    Set margins, converting inches to points (using 72 dpi)
+        $pdf->SetMargins($printMargins->getLeft() * 72, $printMargins->getTop() * 72, $printMargins->getRight() * 72);
+        $pdf->SetAutoPageBreak(true, $printMargins->getBottom() * 72);
+
+        $pdf->setPrintHeader(false);
+        $pdf->setPrintFooter(false);
+
+        $pdf->AddPage();
+
+        //  Set the appropriate font
+        $pdf->SetFont($this->getFont());
+        $pdf->writeHTML(
+            $this->generateHTMLHeader(false) .
+            $this->generateSheetData() .
+            $this->generateHTMLFooter()
+        );
+
+        //  Document info
+        $pdf->SetTitle($this->phpExcel->getProperties()->getTitle());
+        $pdf->SetAuthor($this->phpExcel->getProperties()->getCreator());
+        $pdf->SetSubject($this->phpExcel->getProperties()->getSubject());
+        $pdf->SetKeywords($this->phpExcel->getProperties()->getKeywords());
+        $pdf->SetCreator($this->phpExcel->getProperties()->getCreator());
+
+        //  Write to file
+        fwrite($fileHandle, $pdf->output($pFilename, 'S'));
+
+        parent::restoreStateAfterSave($fileHandle);
+    }
+}
diff --git a/lib/PHPExcel/locale/bg/config b/lib/PHPExcel/locale/bg/config
new file mode 100644
index 000000000..4cecddb3c
--- /dev/null
+++ b/lib/PHPExcel/locale/bg/config
@@ -0,0 +1,49 @@
+##
+## PHPExcel
+##
+
+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt  LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= лв
+
+
+##
+##	Excel Error Codes	(For future use)
+
+##
+NULL	= #ПРАЗНО!
+DIV0	= #ДЕЛ/0!
+VALUE	= #СТОЙНОСТ!
+REF	= #РЕФ!
+NAME	= #ИМЕ?
+NUM	= #ЧИСЛО!
+NA	= #Н/Д
diff --git a/lib/PHPExcel/locale/cs/config b/lib/PHPExcel/locale/cs/config
new file mode 100644
index 000000000..42cdf3267
--- /dev/null
+++ b/lib/PHPExcel/locale/cs/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= Kč
+
+
+##
+##	Excel Error Codes	(For future use)
+##
+NULL	= #NULL!
+DIV0	= #DIV/0!
+VALUE	= #HODNOTA!
+REF	= #REF!
+NAME	= #NÁZEV?
+NUM	= #NUM!
+NA	= #N/A
diff --git a/lib/PHPExcel/locale/cs/functions b/lib/PHPExcel/locale/cs/functions
new file mode 100644
index 000000000..c0a3cbbf9
--- /dev/null
+++ b/lib/PHPExcel/locale/cs/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions		Funkce doplňků a automatizace
+##
+GETPIVOTDATA		= ZÍSKATKONTDATA	##	Vrátí data uložená v kontingenční tabulce. Pomocí funkce ZÍSKATKONTDATA můžete načíst souhrnná data z kontingenční tabulky, pokud jsou tato data v kontingenční sestavě zobrazena.
+
+
+##
+##	Cube functions				Funkce pro práci s krychlemi
+##
+CUBEKPIMEMBER		= CUBEKPIMEMBER		##	Vrátí název, vlastnost a velikost klíčového ukazatele výkonu (KUV) a zobrazí v buňce název a vlastnost. Klíčový ukazatel výkonu je kvantifikovatelná veličina, například hrubý měsíční zisk nebo čtvrtletní obrat na zaměstnance, která se používá pro sledování výkonnosti organizace.
+CUBEMEMBER		= CUBEMEMBER		##	Vrátí člen nebo n-tici v hierarchii krychle. Slouží k ověření, zda v krychli existuje člen nebo n-tice.
+CUBEMEMBERPROPERTY	= CUBEMEMBERPROPERTY	##	Vrátí hodnotu vlastnosti člena v krychli. Slouží k ověření, zda v krychli existuje člen s daným názvem, a k vrácení konkrétní vlastnosti tohoto člena.
+CUBERANKEDMEMBER	= CUBERANKEDMEMBER	##	Vrátí n-tý nebo pořadový člen sady. Použijte ji pro vrácení jednoho nebo více prvků sady, například obchodníka s nejvyšším obratem nebo deseti nejlepších studentů.
+CUBESET			= CUBESET		##	Definuje vypočtenou sadu členů nebo n-tic odesláním výrazu sady do krychle na serveru, který vytvoří sadu a potom ji vrátí do aplikace Microsoft Office Excel.
+CUBESETCOUNT		= CUBESETCOUNT		##	Vrátí počet položek v množině
+CUBEVALUE		= CUBEVALUE		##	Vrátí úhrnnou hodnotu z krychle.
+
+
+##
+##	Database functions			Funkce databáze
+##
+DAVERAGE		= DPRŮMĚR		##	Vrátí průměr vybraných položek databáze.
+DCOUNT			= DPOČET		##	Spočítá buňky databáze obsahující čísla.
+DCOUNTA			= DPOČET2		##	Spočítá buňky databáze, které nejsou prázdné.
+DGET			= DZÍSKAT		##	Extrahuje z databáze jeden záznam splňující zadaná kritéria.
+DMAX			= DMAX			##	Vrátí maximální hodnotu z vybraných položek databáze.
+DMIN			= DMIN			##	Vrátí minimální hodnotu z vybraných položek databáze.
+DPRODUCT		= DSOUČIN		##	Vynásobí hodnoty určitého pole záznamů v databázi, které splňují daná kritéria.
+DSTDEV			= DSMODCH.VÝBĚR		##	Odhadne směrodatnou odchylku výběru vybraných položek databáze.
+DSTDEVP			= DSMODCH		##	Vypočte směrodatnou odchylku základního souboru vybraných položek databáze.
+DSUM			= DSUMA			##	Sečte čísla ve sloupcovém poli záznamů databáze, která splňují daná kritéria.
+DVAR			= DVAR.VÝBĚR		##	Odhadne rozptyl výběru vybraných položek databáze.
+DVARP			= DVAR			##	Vypočte rozptyl základního souboru vybraných položek databáze.
+
+
+##
+##	Date and time functions			Funkce data a času
+##
+DATE			= DATUM			##	Vrátí pořadové číslo určitého data.
+DATEVALUE		= DATUMHODN		##	Převede datum ve formě textu na pořadové číslo.
+DAY			= DEN			##	Převede pořadové číslo na den v měsíci.
+DAYS360			= ROK360		##	Vrátí počet dní mezi dvěma daty na základě roku s 360 dny.
+EDATE			= EDATE			##	Vrátí pořadové číslo data, které označuje určený počet měsíců před nebo po počátečním datu.
+EOMONTH			= EOMONTH		##	Vrátí pořadové číslo posledního dne měsíce před nebo po zadaném počtu měsíců.
+HOUR			= HODINA		##	Převede pořadové číslo na hodinu.
+MINUTE			= MINUTA		##	Převede pořadové číslo na minutu.
+MONTH			= MĚSÍC			##	Převede pořadové číslo na měsíc.
+NETWORKDAYS		= NETWORKDAYS		##	Vrátí počet celých pracovních dní mezi dvěma daty.
+NOW			= NYNÍ			##	Vrátí pořadové číslo aktuálního data a času.
+SECOND			= SEKUNDA		##	Převede pořadové číslo na sekundu.
+TIME			= ČAS			##	Vrátí pořadové číslo určitého času.
+TIMEVALUE		= ČASHODN		##	Převede čas ve formě textu na pořadové číslo.
+TODAY			= DNES			##	Vrátí pořadové číslo dnešního data.
+WEEKDAY			= DENTÝDNE		##	Převede pořadové číslo na den v týdnu.
+WEEKNUM			= WEEKNUM		##	Převede pořadové číslo na číslo představující číselnou pozici týdne v roce.
+WORKDAY			= WORKDAY		##	Vrátí pořadové číslo data před nebo po zadaném počtu pracovních dní.
+YEAR			= ROK			##	Převede pořadové číslo na rok.
+YEARFRAC		= YEARFRAC		##	Vrátí část roku vyjádřenou zlomkem a představující počet celých dní mezi počátečním a koncovým datem.
+
+
+##
+##	Engineering functions			Inženýrské funkce (Technické funkce)
+##
+BESSELI			= BESSELI		##	Vrátí modifikovanou Besselovu funkci In(x).
+BESSELJ			= BESSELJ		##	Vrátí modifikovanou Besselovu funkci Jn(x).
+BESSELK			= BESSELK		##	Vrátí modifikovanou Besselovu funkci Kn(x).
+BESSELY			= BESSELY		##	Vrátí Besselovu funkci Yn(x).
+BIN2DEC			= BIN2DEC		##	Převede binární číslo na desítkové.
+BIN2HEX			= BIN2HEX		##	Převede binární číslo na šestnáctkové.
+BIN2OCT			= BIN2OCT		##	Převede binární číslo na osmičkové.
+COMPLEX			= COMPLEX		##	Převede reálnou a imaginární část na komplexní číslo.
+CONVERT			= CONVERT		##	Převede číslo do jiného jednotkového měrného systému.
+DEC2BIN			= DEC2BIN		##	Převede desítkového čísla na dvojkové
+DEC2HEX			= DEC2HEX		##	Převede desítkové číslo na šestnáctkové.
+DEC2OCT			= DEC2OCT		##	Převede desítkové číslo na osmičkové.
+DELTA			= DELTA			##	Testuje rovnost dvou hodnot.
+ERF			= ERF			##	Vrátí chybovou funkci.
+ERFC			= ERFC			##	Vrátí doplňkovou chybovou funkci.
+GESTEP			= GESTEP		##	Testuje, zda je číslo větší než mezní hodnota.
+HEX2BIN			= HEX2BIN		##	Převede šestnáctkové číslo na binární.
+HEX2DEC			= HEX2DEC		##	Převede šestnáctkové číslo na desítkové.
+HEX2OCT			= HEX2OCT		##	Převede šestnáctkové číslo na osmičkové.
+IMABS			= IMABS			##	Vrátí absolutní hodnotu (modul) komplexního čísla.
+IMAGINARY		= IMAGINARY		##	Vrátí imaginární část komplexního čísla.
+IMARGUMENT		= IMARGUMENT		##	Vrátí argument théta, úhel vyjádřený v radiánech.
+IMCONJUGATE		= IMCONJUGATE		##	Vrátí komplexně sdružené číslo ke komplexnímu číslu.
+IMCOS			= IMCOS			##	Vrátí kosinus komplexního čísla.
+IMDIV			= IMDIV			##	Vrátí podíl dvou komplexních čísel.
+IMEXP			= IMEXP			##	Vrátí exponenciální tvar komplexního čísla.
+IMLN			= IMLN			##	Vrátí přirozený logaritmus komplexního čísla.
+IMLOG10			= IMLOG10		##	Vrátí dekadický logaritmus komplexního čísla.
+IMLOG2			= IMLOG2		##	Vrátí logaritmus komplexního čísla při základu 2.
+IMPOWER			= IMPOWER		##	Vrátí komplexní číslo umocněné na celé číslo.
+IMPRODUCT		= IMPRODUCT		##	Vrátí součin komplexních čísel.
+IMREAL			= IMREAL		##	Vrátí reálnou část komplexního čísla.
+IMSIN			= IMSIN			##	Vrátí sinus komplexního čísla.
+IMSQRT			= IMSQRT		##	Vrátí druhou odmocninu komplexního čísla.
+IMSUB			= IMSUB			##	Vrátí rozdíl mezi dvěma komplexními čísly.
+IMSUM			= IMSUM			##	Vrátí součet dvou komplexních čísel.
+OCT2BIN			= OCT2BIN		##	Převede osmičkové číslo na binární.
+OCT2DEC			= OCT2DEC		##	Převede osmičkové číslo na desítkové.
+OCT2HEX			= OCT2HEX		##	Převede osmičkové číslo na šestnáctkové.
+
+
+##
+##	Financial functions			Finanční funkce
+##
+ACCRINT			= ACCRINT		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen v pravidelných termínech.
+ACCRINTM		= ACCRINTM		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen k datu splatnosti.
+AMORDEGRC		= AMORDEGRC		##	Vrátí lineární amortizaci v každém účetním období pomocí koeficientu amortizace.
+AMORLINC		= AMORLINC		##	Vrátí lineární amortizaci v každém účetním období.
+COUPDAYBS		= COUPDAYBS		##	Vrátí počet dnů od začátku období placení kupónů do data splatnosti.
+COUPDAYS		= COUPDAYS		##	Vrátí počet dnů v období placení kupónů, které obsahuje den zúčtování.
+COUPDAYSNC		= COUPDAYSNC		##	Vrátí počet dnů od data zúčtování do následujícího data placení kupónu.
+COUPNCD			= COUPNCD		##	Vrátí následující datum placení kupónu po datu zúčtování.
+COUPNUM			= COUPNUM		##	Vrátí počet kupónů splatných mezi datem zúčtování a datem splatnosti.
+COUPPCD			= COUPPCD		##	Vrátí předchozí datum placení kupónu před datem zúčtování.
+CUMIPMT			= CUMIPMT		##	Vrátí kumulativní úrok splacený mezi dvěma obdobími.
+CUMPRINC		= CUMPRINC		##	Vrátí kumulativní jistinu splacenou mezi dvěma obdobími půjčky.
+DB			= ODPIS.ZRYCH		##	Vrátí odpis aktiva za určité období pomocí degresivní metody odpisu s pevným zůstatkem.
+DDB			= ODPIS.ZRYCH2		##	Vrátí odpis aktiva za určité období pomocí dvojité degresivní metody odpisu nebo jiné metody, kterou zadáte.
+DISC			= DISC			##	Vrátí diskontní sazbu cenného papíru.
+DOLLARDE		= DOLLARDE		##	Převede částku v korunách vyjádřenou zlomkem na částku v korunách vyjádřenou desetinným číslem.
+DOLLARFR		= DOLLARFR		##	Převede částku v korunách vyjádřenou desetinným číslem na částku v korunách vyjádřenou zlomkem.
+DURATION		= DURATION		##	Vrátí roční dobu cenného papíru s pravidelnými úrokovými sazbami.
+EFFECT			= EFFECT		##	Vrátí efektivní roční úrokovou sazbu.
+FV			= BUDHODNOTA		##	Vrátí budoucí hodnotu investice.
+FVSCHEDULE		= FVSCHEDULE		##	Vrátí budoucí hodnotu počáteční jistiny po použití série sazeb složitého úroku.
+INTRATE			= INTRATE		##	Vrátí úrokovou sazbu plně investovaného cenného papíru.
+IPMT			= PLATBA.ÚROK		##	Vrátí výšku úroku investice za dané období.
+IRR			= MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní výnosové procento série peněžních toků.
+ISPMT			= ISPMT			##	Vypočte výši úroku z investice zaplaceného během určitého období.
+MDURATION		= MDURATION		##	Vrátí Macauleyho modifikovanou dobu cenného papíru o nominální hodnotě 100 Kč.
+MIRR			= MOD.MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní sazbu výnosu, přičemž kladné a záporné hodnoty peněžních prostředků jsou financovány podle různých sazeb.
+NOMINAL			= NOMINAL		##	Vrátí nominální roční úrokovou sazbu.
+NPER			= POČET.OBDOBÍ		##	Vrátí počet období pro investici.
+NPV			= ČISTÁ.SOUČHODNOTA	##	Vrátí čistou současnou hodnotu investice vypočítanou na základě série pravidelných peněžních toků a diskontní sazby.
+ODDFPRICE		= ODDFPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným prvním obdobím.
+ODDFYIELD		= ODDFYIELD		##	Vrátí výnos cenného papíru s odlišným prvním obdobím.
+ODDLPRICE		= ODDLPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným posledním obdobím.
+ODDLYIELD		= ODDLYIELD		##	Vrátí výnos cenného papíru s odlišným posledním obdobím.
+PMT			= PLATBA		##	Vrátí hodnotu pravidelné splátky anuity.
+PPMT			= PLATBA.ZÁKLAD		##	Vrátí hodnotu splátky jistiny pro zadanou investici za dané období.
+PRICE			= PRICE			##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen v pravidelných termínech.
+PRICEDISC		= PRICEDISC		##	Vrátí cenu diskontního cenného papíru o nominální hodnotě 100 Kč.
+PRICEMAT		= PRICEMAT		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen k datu splatnosti.
+PV			= SOUČHODNOTA		##	Vrátí současnou hodnotu investice.
+RATE			= ÚROKOVÁ.MÍRA		##	Vrátí úrokovou sazbu vztaženou na období anuity.
+RECEIVED		= RECEIVED		##	Vrátí částku obdrženou k datu splatnosti plně investovaného cenného papíru.
+SLN			= ODPIS.LIN		##	Vrátí přímé odpisy aktiva pro jedno období.
+SYD			= ODPIS.NELIN		##	Vrátí směrné číslo ročních odpisů aktiva pro zadané období.
+TBILLEQ			= TBILLEQ		##	Vrátí výnos směnky státní pokladny ekvivalentní výnosu obligace.
+TBILLPRICE		= TBILLPRICE		##	Vrátí cenu směnky státní pokladny o nominální hodnotě 100 Kč.
+TBILLYIELD		= TBILLYIELD		##	Vrátí výnos směnky státní pokladny.
+VDB			= ODPIS.ZA.INT		##	Vrátí odpis aktiva pro určité období nebo část období pomocí degresivní metody odpisu.
+XIRR			= XIRR			##	Vrátí vnitřní výnosnost pro harmonogram peněžních toků, který nemusí být nutně periodický.
+XNPV			= XNPV			##	Vrátí čistou současnou hodnotu pro harmonogram peněžních toků, který nemusí být nutně periodický.
+YIELD			= YIELD			##	Vrátí výnos cenného papíru, ze kterého je úrok placen v pravidelných termínech.
+YIELDDISC		= YIELDDISC		##	Vrátí roční výnos diskontního cenného papíru, například směnky státní pokladny.
+YIELDMAT		= YIELDMAT		##	Vrátí roční výnos cenného papíru, ze kterého je úrok placen k datu splatnosti.
+
+
+##
+##	Information functions			Informační funkce
+##
+CELL			= POLÍČKO		##	Vrátí informace o formátování, umístění nebo obsahu buňky.
+ERROR.TYPE		= CHYBA.TYP		##	Vrátí číslo odpovídající typu chyby.
+INFO			= O.PROSTŘEDÍ		##	Vrátí informace o aktuálním pracovním prostředí.
+ISBLANK			= JE.PRÁZDNÉ		##	Vrátí hodnotu PRAVDA, pokud se argument hodnota odkazuje na prázdnou buňku.
+ISERR			= JE.CHYBA		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota (kromě #N/A).
+ISERROR			= JE.CHYBHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota.
+ISEVEN			= ISEVEN		##	Vrátí hodnotu PRAVDA, pokud je číslo sudé.
+ISLOGICAL		= JE.LOGHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota logická hodnota.
+ISNA			= JE.NEDEF		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota chybová hodnota #N/A.
+ISNONTEXT		= JE.NETEXT		##	Vrátí hodnotu PRAVDA, pokud argument hodnota není text.
+ISNUMBER		= JE.ČÍSLO		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota číslo.
+ISODD			= ISODD			##	Vrátí hodnotu PRAVDA, pokud je číslo liché.
+ISREF			= JE.ODKAZ		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota odkaz.
+ISTEXT			= JE.TEXT		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota text.
+N			= N			##	Vrátí hodnotu převedenou na číslo.
+NA			= NEDEF			##	Vrátí chybovou hodnotu #N/A.
+TYPE			= TYP			##	Vrátí číslo označující datový typ hodnoty.
+
+
+##
+##	Logical functions			Logické funkce
+##
+AND			= A			##	Vrátí hodnotu PRAVDA, mají-li všechny argumenty hodnotu PRAVDA.
+FALSE			= NEPRAVDA		##	Vrátí logickou hodnotu NEPRAVDA.
+IF			= KDYŽ			##	Určí, který logický test má proběhnout.
+IFERROR			= IFERROR		##	Pokud je vzorec vyhodnocen jako chyba, vrátí zadanou hodnotu. V opačném případě vrátí výsledek vzorce.
+NOT			= NE			##	Provede logickou negaci argumentu funkce.
+OR			= NEBO			##	Vrátí hodnotu PRAVDA, je-li alespoň jeden argument roven hodnotě PRAVDA.
+TRUE			= PRAVDA		##	Vrátí logickou hodnotu PRAVDA.
+
+
+##
+##	Lookup and reference functions		Vyhledávací funkce
+##
+ADDRESS			= ODKAZ			##	Vrátí textový odkaz na jednu buňku listu.
+AREAS			= POČET.BLOKŮ		##	Vrátí počet oblastí v odkazu.
+CHOOSE			= ZVOLIT		##	Zvolí hodnotu ze seznamu hodnot.
+COLUMN			= SLOUPEC		##	Vrátí číslo sloupce odkazu.
+COLUMNS			= SLOUPCE		##	Vrátí počet sloupců v odkazu.
+HLOOKUP			= VVYHLEDAT		##	Prohledá horní řádek matice a vrátí hodnotu určené buňky.
+HYPERLINK		= HYPERTEXTOVÝ.ODKAZ	##	Vytvoří zástupce nebo odkaz, který otevře dokument uložený na síťovém serveru, v síti intranet nebo Internet.
+INDEX			= INDEX			##	Pomocí rejstříku zvolí hodnotu z odkazu nebo matice.
+INDIRECT		= NEPŘÍMÝ.ODKAZ		##	Vrátí odkaz určený textovou hodnotou.
+LOOKUP			= VYHLEDAT		##	Vyhledá hodnoty ve vektoru nebo matici.
+MATCH			= POZVYHLEDAT		##	Vyhledá hodnoty v odkazu nebo matici.
+OFFSET			= POSUN			##	Vrátí posun odkazu od zadaného odkazu.
+ROW			= ŘÁDEK			##	Vrátí číslo řádku odkazu.
+ROWS			= ŘÁDKY			##	Vrátí počet řádků v odkazu.
+RTD			= RTD			##	Načte data reálného času z programu, který podporuje automatizaci modelu COM (Automatizace: Způsob práce s objekty určité aplikace z jiné aplikace nebo nástroje pro vývoj. Automatizace (dříve nazývaná automatizace OLE) je počítačovým standardem a je funkcí modelu COM (Component Object Model).).
+TRANSPOSE		= TRANSPOZICE		##	Vrátí transponovanou matici.
+VLOOKUP			= SVYHLEDAT		##	Prohledá první sloupec matice, přesune kurzor v řádku a vrátí hodnotu buňky.
+
+
+##
+##	Math and trigonometry functions		Matematické a trigonometrické funkce
+##
+ABS			= ABS			##	Vrátí absolutní hodnotu čísla.
+ACOS			= ARCCOS		##	Vrátí arkuskosinus čísla.
+ACOSH			= ARCCOSH		##	Vrátí hyperbolický arkuskosinus čísla.
+ASIN			= ARCSIN		##	Vrátí arkussinus čísla.
+ASINH			= ARCSINH		##	Vrátí hyperbolický arkussinus čísla.
+ATAN			= ARCTG			##	Vrátí arkustangens čísla.
+ATAN2			= ARCTG2		##	Vrátí arkustangens x-ové a y-ové souřadnice.
+ATANH			= ARCTGH		##	Vrátí hyperbolický arkustangens čísla.
+CEILING			= ZAOKR.NAHORU		##	Zaokrouhlí číslo na nejbližší celé číslo nebo na nejbližší násobek zadané hodnoty.
+COMBIN			= KOMBINACE		##	Vrátí počet kombinací pro daný počet položek.
+COS			= COS			##	Vrátí kosinus čísla.
+COSH			= COSH			##	Vrátí hyperbolický kosinus čísla.
+DEGREES			= DEGREES		##	Převede radiány na stupně.
+EVEN			= ZAOKROUHLIT.NA.SUDÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé sudé číslo.
+EXP			= EXP			##	Vrátí základ přirozeného logaritmu e umocněný na zadané číslo.
+FACT			= FAKTORIÁL		##	Vrátí faktoriál čísla.
+FACTDOUBLE		= FACTDOUBLE		##	Vrátí dvojitý faktoriál čísla.
+FLOOR			= ZAOKR.DOLŮ		##	Zaokrouhlí číslo dolů, směrem k nule.
+GCD			= GCD			##	Vrátí největší společný dělitel.
+INT			= CELÁ.ČÁST		##	Zaokrouhlí číslo dolů na nejbližší celé číslo.
+LCM			= LCM			##	Vrátí nejmenší společný násobek.
+LN			= LN			##	Vrátí přirozený logaritmus čísla.
+LOG			= LOGZ			##	Vrátí logaritmus čísla při zadaném základu.
+LOG10			= LOG			##	Vrátí dekadický logaritmus čísla.
+MDETERM			= DETERMINANT		##	Vrátí determinant matice.
+MINVERSE		= INVERZE		##	Vrátí inverzní matici.
+MMULT			= SOUČIN.MATIC		##	Vrátí součin dvou matic.
+MOD			= MOD			##	Vrátí zbytek po dělení.
+MROUND			= MROUND		##	Vrátí číslo zaokrouhlené na požadovaný násobek.
+MULTINOMIAL		= MULTINOMIAL		##	Vrátí mnohočlen z množiny čísel.
+ODD			= ZAOKROUHLIT.NA.LICHÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé liché číslo.
+PI			= PI			##	Vrátí hodnotu čísla pí.
+POWER			= POWER			##	Umocní číslo na zadanou mocninu.
+PRODUCT			= SOUČIN		##	Vynásobí argumenty funkce.
+QUOTIENT		= QUOTIENT		##	Vrátí celou část dělení.
+RADIANS			= RADIANS		##	Převede stupně na radiány.
+RAND			= NÁHČÍSLO		##	Vrátí náhodné číslo mezi 0 a 1.
+RANDBETWEEN		= RANDBETWEEN		##	Vrátí náhodné číslo mezi zadanými čísly.
+ROMAN			= ROMAN			##	Převede arabskou číslici na římskou ve formátu textu.
+ROUND			= ZAOKROUHLIT		##	Zaokrouhlí číslo na zadaný počet číslic.
+ROUNDDOWN		= ROUNDDOWN		##	Zaokrouhlí číslo dolů, směrem k nule.
+ROUNDUP			= ROUNDUP		##	Zaokrouhlí číslo nahoru, směrem od nuly.
+SERIESSUM		= SERIESSUM		##	Vrátí součet mocninné řady určené podle vzorce.
+SIGN			= SIGN			##	Vrátí znaménko čísla.
+SIN			= SIN			##	Vrátí sinus daného úhlu.
+SINH			= SINH			##	Vrátí hyperbolický sinus čísla.
+SQRT			= ODMOCNINA		##	Vrátí kladnou druhou odmocninu.
+SQRTPI			= SQRTPI		##	Vrátí druhou odmocninu výrazu (číslo * pí).
+SUBTOTAL		= SUBTOTAL		##	Vrátí souhrn v seznamu nebo databázi.
+SUM			= SUMA			##	Sečte argumenty funkce.
+SUMIF			= SUMIF			##	Sečte buňky vybrané podle zadaných kritérií.
+SUMIFS			= SUMIFS		##	Sečte buňky určené více zadanými podmínkami.
+SUMPRODUCT		= SOUČIN.SKALÁRNÍ	##	Vrátí součet součinů odpovídajících prvků matic.
+SUMSQ			= SUMA.ČTVERCŮ		##	Vrátí součet čtverců argumentů.
+SUMX2MY2		= SUMX2MY2		##	Vrátí součet rozdílu čtverců odpovídajících hodnot ve dvou maticích.
+SUMX2PY2		= SUMX2PY2		##	Vrátí součet součtu čtverců odpovídajících hodnot ve dvou maticích.
+SUMXMY2			= SUMXMY2		##	Vrátí součet čtverců rozdílů odpovídajících hodnot ve dvou maticích.
+TAN			= TGTG			##	Vrátí tangens čísla.
+TANH			= TGH			##	Vrátí hyperbolický tangens čísla.
+TRUNC			= USEKNOUT		##	Zkrátí číslo na celé číslo.
+
+
+##
+##	Statistical functions			Statistické funkce
+##
+AVEDEV			= PRŮMODCHYLKA		##	Vrátí průměrnou hodnotu absolutních odchylek datových bodů od jejich střední hodnoty.
+AVERAGE			= PRŮMĚR		##	Vrátí průměrnou hodnotu argumentů.
+AVERAGEA		= AVERAGEA		##	Vrátí průměrnou hodnotu argumentů včetně čísel, textu a logických hodnot.
+AVERAGEIF		= AVERAGEIF		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk v oblasti, které vyhovují příslušné podmínce.
+AVERAGEIFS		= AVERAGEIFS		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk vyhovujících několika podmínkám.
+BETADIST		= BETADIST		##	Vrátí hodnotu součtového rozdělení beta.
+BETAINV			= BETAINV		##	Vrátí inverzní hodnotu součtového rozdělení pro zadané rozdělení beta.
+BINOMDIST		= BINOMDIST		##	Vrátí hodnotu binomického rozdělení pravděpodobnosti jednotlivých veličin.
+CHIDIST			= CHIDIST		##	Vrátí jednostrannou pravděpodobnost rozdělení chí-kvadrát.
+CHIINV			= CHIINV		##	Vrátí hodnotu funkce inverzní k distribuční funkci jednostranné pravděpodobnosti rozdělení chí-kvadrát.
+CHITEST			= CHITEST		##	Vrátí test nezávislosti.
+CONFIDENCE		= CONFIDENCE		##	Vrátí interval spolehlivosti pro střední hodnotu základního souboru.
+CORREL			= CORREL		##	Vrátí korelační koeficient mezi dvěma množinami dat.
+COUNT			= POČET			##	Vrátí počet čísel v seznamu argumentů.
+COUNTA			= POČET2		##	Vrátí počet hodnot v seznamu argumentů.
+COUNTBLANK		= COUNTBLANK		##	Spočítá počet prázdných buněk v oblasti.
+COUNTIF			= COUNTIF		##	Spočítá buňky v oblasti, které odpovídají zadaným kritériím.
+COUNTIFS		= COUNTIFS		##	Spočítá buňky v oblasti, které odpovídají více kritériím.
+COVAR			= COVAR			##	Vrátí hodnotu kovariance, průměrnou hodnotu součinů párových odchylek
+CRITBINOM		= CRITBINOM		##	Vrátí nejmenší hodnotu, pro kterou má součtové binomické rozdělení hodnotu větší nebo rovnu hodnotě kritéria.
+DEVSQ			= DEVSQ			##	Vrátí součet čtverců odchylek.
+EXPONDIST		= EXPONDIST		##	Vrátí hodnotu exponenciálního rozdělení.
+FDIST			= FDIST			##	Vrátí hodnotu rozdělení pravděpodobnosti F.
+FINV			= FINV			##	Vrátí hodnotu inverzní funkce k distribuční funkci rozdělení F.
+FISHER			= FISHER		##	Vrátí hodnotu Fisherovy transformace.
+FISHERINV		= FISHERINV		##	Vrátí hodnotu inverzní funkce k Fisherově transformaci.
+FORECAST		= FORECAST		##	Vrátí hodnotu lineárního trendu.
+FREQUENCY		= ČETNOSTI		##	Vrátí četnost rozdělení jako svislou matici.
+FTEST			= FTEST			##	Vrátí výsledek F-testu.
+GAMMADIST		= GAMMADIST		##	Vrátí hodnotu rozdělení gama.
+GAMMAINV		= GAMMAINV		##	Vrátí hodnotu inverzní funkce k distribuční funkci součtového rozdělení gama.
+GAMMALN			= GAMMALN		##	Vrátí přirozený logaritmus funkce gama, Γ(x).
+GEOMEAN			= GEOMEAN		##	Vrátí geometrický průměr.
+GROWTH			= LOGLINTREND		##	Vrátí hodnoty exponenciálního trendu.
+HARMEAN			= HARMEAN		##	Vrátí harmonický průměr.
+HYPGEOMDIST		= HYPGEOMDIST		##	Vrátí hodnotu hypergeometrického rozdělení.
+INTERCEPT		= INTERCEPT		##	Vrátí úsek lineární regresní čáry.
+KURT			= KURT			##	Vrátí hodnotu excesu množiny dat.
+LARGE			= LARGE			##	Vrátí k-tou největší hodnotu množiny dat.
+LINEST			= LINREGRESE		##	Vrátí parametry lineárního trendu.
+LOGEST			= LOGLINREGRESE		##	Vrátí parametry exponenciálního trendu.
+LOGINV			= LOGINV		##	Vrátí inverzní funkci k distribuční funkci logaritmicko-normálního rozdělení.
+LOGNORMDIST		= LOGNORMDIST		##	Vrátí hodnotu součtového logaritmicko-normálního rozdělení.
+MAX			= MAX			##	Vrátí maximální hodnotu seznamu argumentů.
+MAXA			= MAXA			##	Vrátí maximální hodnotu seznamu argumentů včetně čísel, textu a logických hodnot.
+MEDIAN			= MEDIAN		##	Vrátí střední hodnotu zadaných čísel.
+MIN			= MIN			##	Vrátí minimální hodnotu seznamu argumentů.
+MINA			= MINA			##	Vrátí nejmenší hodnotu v seznamu argumentů včetně čísel, textu a logických hodnot.
+MODE			= MODE			##	Vrátí hodnotu, která se v množině dat vyskytuje nejčastěji.
+NEGBINOMDIST		= NEGBINOMDIST		##	Vrátí hodnotu negativního binomického rozdělení.
+NORMDIST		= NORMDIST		##	Vrátí hodnotu normálního součtového rozdělení.
+NORMINV			= NORMINV		##	Vrátí inverzní funkci k funkci normálního součtového rozdělení.
+NORMSDIST		= NORMSDIST		##	Vrátí hodnotu standardního normálního součtového rozdělení.
+NORMSINV		= NORMSINV		##	Vrátí inverzní funkci k funkci standardního normálního součtového rozdělení.
+PEARSON			= PEARSON		##	Vrátí Pearsonův výsledný momentový korelační koeficient.
+PERCENTILE		= PERCENTIL		##	Vrátí hodnotu k-tého percentilu hodnot v oblasti.
+PERCENTRANK		= PERCENTRANK		##	Vrátí pořadí hodnoty v množině dat vyjádřené procentuální částí množiny dat.
+PERMUT			= PERMUTACE		##	Vrátí počet permutací pro zadaný počet objektů.
+POISSON			= POISSON		##	Vrátí hodnotu distribuční funkce Poissonova rozdělení.
+PROB			= PROB			##	Vrátí pravděpodobnost výskytu hodnot v oblasti mezi dvěma mezními hodnotami.
+QUARTILE		= QUARTIL		##	Vrátí hodnotu kvartilu množiny dat.
+RANK			= RANK			##	Vrátí pořadí čísla v seznamu čísel.
+RSQ			= RKQ			##	Vrátí druhou mocninu Pearsonova výsledného momentového korelačního koeficientu.
+SKEW			= SKEW			##	Vrátí zešikmení rozdělení.
+SLOPE			= SLOPE			##	Vrátí směrnici lineární regresní čáry.
+SMALL			= SMALL			##	Vrátí k-tou nejmenší hodnotu množiny dat.
+STANDARDIZE		= STANDARDIZE		##	Vrátí normalizovanou hodnotu.
+STDEV			= SMODCH.VÝBĚR		##	Vypočte směrodatnou odchylku výběru.
+STDEVA			= STDEVA		##	Vypočte směrodatnou odchylku výběru včetně čísel, textu a logických hodnot.
+STDEVP			= SMODCH		##	Vypočte směrodatnou odchylku základního souboru.
+STDEVPA			= STDEVPA		##	Vypočte směrodatnou odchylku základního souboru včetně čísel, textu a logických hodnot.
+STEYX			= STEYX			##	Vrátí standardní chybu předpovězené hodnoty y pro každou hodnotu x v regresi.
+TDIST			= TDIST			##	Vrátí hodnotu Studentova t-rozdělení.
+TINV			= TINV			##	Vrátí inverzní funkci k distribuční funkci Studentova t-rozdělení.
+TREND			= LINTREND		##	Vrátí hodnoty lineárního trendu.
+TRIMMEAN		= TRIMMEAN		##	Vrátí střední hodnotu vnitřní části množiny dat.
+TTEST			= TTEST			##	Vrátí pravděpodobnost spojenou se Studentovým t-testem.
+VAR			= VAR.VÝBĚR		##	Vypočte rozptyl výběru.
+VARA			= VARA			##	Vypočte rozptyl výběru včetně čísel, textu a logických hodnot.
+VARP			= VAR			##	Vypočte rozptyl základního souboru.
+VARPA			= VARPA			##	Vypočte rozptyl základního souboru včetně čísel, textu a logických hodnot.
+WEIBULL			= WEIBULL		##	Vrátí hodnotu Weibullova rozdělení.
+ZTEST			= ZTEST			##	Vrátí jednostrannou P-hodnotu z-testu.
+
+
+##
+##	Text functions				Textové funkce
+##
+ASC			= ASC			##	Změní znaky s plnou šířkou (dvoubajtové)v řetězci znaků na znaky s poloviční šířkou (jednobajtové).
+BAHTTEXT		= BAHTTEXT		##	Převede číslo na text ve formátu, měny ß (baht).
+CHAR			= ZNAK			##	Vrátí znak určený číslem kódu.
+CLEAN			= VYČISTIT		##	Odebere z textu všechny netisknutelné znaky.
+CODE			= KÓD			##	Vrátí číselný kód prvního znaku zadaného textového řetězce.
+CONCATENATE		= CONCATENATE		##	Spojí několik textových položek do jedné.
+DOLLAR			= KČ			##	Převede číslo na text ve formátu měny Kč (česká koruna).
+EXACT			= STEJNÉ		##	Zkontroluje, zda jsou dvě textové hodnoty shodné.
+FIND			= NAJÍT			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
+FINDB			= FINDB			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
+FIXED			= ZAOKROUHLIT.NA.TEXT	##	Zformátuje číslo jako text s pevným počtem desetinných míst.
+JIS			= JIS			##	Změní znaky s poloviční šířkou (jednobajtové) v řetězci znaků na znaky s plnou šířkou (dvoubajtové).
+LEFT			= ZLEVA			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
+LEFTB			= LEFTB			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
+LEN			= DÉLKA			##	Vrátí počet znaků textového řetězce.
+LENB			= LENB			##	Vrátí počet znaků textového řetězce.
+LOWER			= MALÁ			##	Převede text na malá písmena.
+MID			= ČÁST			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
+MIDB			= MIDB			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
+PHONETIC		= ZVUKOVÉ		##	Extrahuje fonetické znaky (furigana) z textového řetězce.
+PROPER			= VELKÁ2		##	Převede první písmeno každého slova textové hodnoty na velké.
+REPLACE			= NAHRADIT		##	Nahradí znaky uvnitř textu.
+REPLACEB		= NAHRADITB		##	Nahradí znaky uvnitř textu.
+REPT			= OPAKOVAT		##	Zopakuje text podle zadaného počtu opakování.
+RIGHT			= ZPRAVA		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
+RIGHTB			= RIGHTB		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
+SEARCH			= HLEDAT		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
+SEARCHB			= SEARCHB		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
+SUBSTITUTE		= DOSADIT		##	V textovém řetězci nahradí starý text novým.
+T			= T			##	Převede argumenty na text.
+TEXT			= HODNOTA.NA.TEXT	##	Zformátuje číslo a převede ho na text.
+TRIM			= PROČISTIT		##	Odstraní z textu mezery.
+UPPER			= VELKÁ			##	Převede text na velká písmena.
+VALUE			= HODNOTA		##	Převede textový argument na číslo.
diff --git a/lib/PHPExcel/locale/da/config b/lib/PHPExcel/locale/da/config
new file mode 100644
index 000000000..ae5900311
--- /dev/null
+++ b/lib/PHPExcel/locale/da/config
@@ -0,0 +1,48 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= kr
+
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NUL!
+DIV0	= #DIVISION/0!
+VALUE	= #VÆRDI!
+REF	= #REFERENCE!
+NAME	= #NAVN?
+NUM	= #NUM!
+NA	= #I/T
diff --git a/lib/PHPExcel/locale/da/functions b/lib/PHPExcel/locale/da/functions
new file mode 100644
index 000000000..26e0310c1
--- /dev/null
+++ b/lib/PHPExcel/locale/da/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Tilføjelsesprogram- og automatiseringsfunktioner
+##
+GETPIVOTDATA		= HENTPIVOTDATA			##	Returnerer data, der er lagret i en pivottabelrapport
+
+
+##
+##	Cube functions					Kubefunktioner
+##
+CUBEKPIMEMBER		= KUBE.KPI.MEDLEM		##	Returnerer navn, egenskab og mål for en KPI-indikator og viser navnet og egenskaben i cellen. En KPI-indikator er en målbar størrelse, f.eks. bruttooverskud pr. måned eller personaleudskiftning pr. kvartal, der bruges til at overvåge en organisations præstationer.
+CUBEMEMBER		= KUBE.MEDLEM			##	Returnerer et medlem eller en tupel fra kubehierarkiet. Bruges til at validere, om et medlem eller en tupel findes i kuben.
+CUBEMEMBERPROPERTY	= KUBEMEDLEM.EGENSKAB		##	Returnerer værdien af en egenskab for et medlem i kuben. Bruges til at validere, om et medlemsnavn findes i kuben, og returnere den angivne egenskab for medlemmet.
+CUBERANKEDMEMBER	= KUBEMEDLEM.RANG		##	Returnerer det n'te eller rangordnede medlem i et sæt. Bruges til at returnere et eller flere elementer i et sæt, f.eks. topsælgere eller de 10 bedste elever.
+CUBESET			= KUBESÆT			##	Definerer et beregnet sæt medlemmer eller tupler ved at sende et sætudtryk til kuben på serveren, som opretter sættet og returnerer det til Microsoft Office Excel.
+CUBESETCOUNT		= KUBESÆT.TÆL			##	Returnerer antallet af elementer i et sæt.
+CUBEVALUE		= KUBEVÆRDI			##	Returnerer en sammenlagt (aggregeret) værdi fra en kube.
+
+
+##
+##	Database functions				Databasefunktioner
+##
+DAVERAGE		= DMIDDEL			##	Returnerer gennemsnittet af markerede databaseposter
+DCOUNT			= DTÆL				##	Tæller de celler, der indeholder tal, i en database
+DCOUNTA			= DTÆLV				##	Tæller udfyldte celler i en database
+DGET			= DHENT				##	Uddrager en enkelt post, der opfylder de angivne kriterier, fra en database
+DMAX			= DMAKS				##	Returnerer den største værdi blandt markerede databaseposter
+DMIN			= DMIN				##	Returnerer den mindste værdi blandt markerede databaseposter
+DPRODUCT		= DPRODUKT			##	Ganger værdierne i et bestemt felt med poster, der opfylder kriterierne i en database
+DSTDEV			= DSTDAFV			##	Beregner et skøn over standardafvigelsen baseret på en stikprøve af markerede databaseposter
+DSTDEVP			= DSTDAFVP			##	Beregner standardafvigelsen baseret på hele populationen af markerede databaseposter
+DSUM			= DSUM				##	Sammenlægger de tal i feltkolonnen i databasen, der opfylder kriterierne
+DVAR			= DVARIANS			##	Beregner varians baseret på en stikprøve af markerede databaseposter
+DVARP			= DVARIANSP			##	Beregner varians baseret på hele populationen af markerede databaseposter
+
+
+##
+##	Date and time functions				Dato- og klokkeslætsfunktioner
+##
+DATE			= DATO				##	Returnerer serienummeret for en bestemt dato
+DATEVALUE		= DATOVÆRDI			##	Konverterer en dato i form af tekst til et serienummer
+DAY			= DAG				##	Konverterer et serienummer til en dag i måneden
+DAYS360			= DAGE360			##	Beregner antallet af dage mellem to datoer på grundlag af et år med 360 dage
+EDATE			= EDATO				##	Returnerer serienummeret for den dato, der ligger det angivne antal måneder før eller efter startdatoen
+EOMONTH			= SLUT.PÅ.MÅNED			##	Returnerer serienummeret på den sidste dag i måneden før eller efter et angivet antal måneder
+HOUR			= TIME				##	Konverterer et serienummer til en time
+MINUTE			= MINUT				##	Konverterer et serienummer til et minut
+MONTH			= MÅNED				##	Konverterer et serienummer til en måned
+NETWORKDAYS		= ANTAL.ARBEJDSDAGE		##	Returnerer antallet af hele arbejdsdage mellem to datoer
+NOW			= NU				##	Returnerer serienummeret for den aktuelle dato eller det aktuelle klokkeslæt
+SECOND			= SEKUND			##	Konverterer et serienummer til et sekund
+TIME			= KLOKKESLÆT			##	Returnerer serienummeret for et bestemt klokkeslæt
+TIMEVALUE		= TIDSVÆRDI			##	Konverterer et klokkeslæt i form af tekst til et serienummer
+TODAY			= IDAG				##	Returnerer serienummeret for dags dato
+WEEKDAY			= UGEDAG			##	Konverterer et serienummer til en ugedag
+WEEKNUM			= UGE.NR			##	Konverterer et serienummer til et tal, der angiver ugenummeret i året
+WORKDAY			= ARBEJDSDAG			##	Returnerer serienummeret for dagen før eller efter det angivne antal arbejdsdage
+YEAR			= ÅR				##	Konverterer et serienummer til et år
+YEARFRAC		= ÅR.BRØK			##	Returnerer årsbrøken, der repræsenterer antallet af hele dage mellem startdato og slutdato
+
+
+##
+##	Engineering functions				Tekniske funktioner
+##
+BESSELI			= BESSELI			##	Returnerer den modificerede Bessel-funktion In(x)
+BESSELJ			= BESSELJ			##	Returnerer Bessel-funktionen Jn(x)
+BESSELK			= BESSELK			##	Returnerer den modificerede Bessel-funktion Kn(x)
+BESSELY			= BESSELY			##	Returnerer Bessel-funktionen Yn(x)
+BIN2DEC			= BIN.TIL.DEC			##	Konverterer et binært tal til et decimaltal
+BIN2HEX			= BIN.TIL.HEX			##	Konverterer et binært tal til et heksadecimalt tal
+BIN2OCT			= BIN.TIL.OKT			##	Konverterer et binært tal til et oktaltal.
+COMPLEX			= KOMPLEKS			##	Konverterer reelle og imaginære koefficienter til et komplekst tal
+CONVERT			= KONVERTER			##	Konverterer et tal fra én måleenhed til en anden
+DEC2BIN			= DEC.TIL.BIN			##	Konverterer et decimaltal til et binært tal
+DEC2HEX			= DEC.TIL.HEX			##	Konverterer et decimaltal til et heksadecimalt tal
+DEC2OCT			= DEC.TIL.OKT			##	Konverterer et decimaltal til et oktaltal
+DELTA			= DELTA				##	Tester, om to værdier er ens
+ERF			= FEJLFUNK			##	Returner fejlfunktionen
+ERFC			= FEJLFUNK.KOMP			##	Returnerer den komplementære fejlfunktion
+GESTEP			= GETRIN			##	Tester, om et tal er større end en grænseværdi
+HEX2BIN			= HEX.TIL.BIN			##	Konverterer et heksadecimalt tal til et binært tal
+HEX2DEC			= HEX.TIL.DEC			##	Konverterer et decimaltal til et heksadecimalt tal
+HEX2OCT			= HEX.TIL.OKT			##	Konverterer et heksadecimalt tal til et oktaltal
+IMABS			= IMAGABS			##	Returnerer den absolutte værdi (modulus) for et komplekst tal
+IMAGINARY		= IMAGINÆR			##	Returnerer den imaginære koefficient for et komplekst tal
+IMARGUMENT		= IMAGARGUMENT			##	Returnerer argumentet theta, en vinkel udtrykt i radianer
+IMCONJUGATE		= IMAGKONJUGERE			##	Returnerer den komplekse konjugation af et komplekst tal
+IMCOS			= IMAGCOS			##	Returnerer et komplekst tals cosinus
+IMDIV			= IMAGDIV			##	Returnerer kvotienten for to komplekse tal
+IMEXP			= IMAGEKSP			##	Returnerer et komplekst tals eksponentialfunktion
+IMLN			= IMAGLN			##	Returnerer et komplekst tals naturlige logaritme
+IMLOG10			= IMAGLOG10			##	Returnerer et komplekst tals sædvanlige logaritme (titalslogaritme)
+IMLOG2			= IMAGLOG2			##	Returnerer et komplekst tals sædvanlige logaritme (totalslogaritme)
+IMPOWER			= IMAGPOTENS			##	Returnerer et komplekst tal opløftet i en heltalspotens
+IMPRODUCT		= IMAGPRODUKT			##	Returnerer produktet af komplekse tal
+IMREAL			= IMAGREELT			##	Returnerer den reelle koefficient for et komplekst tal
+IMSIN			= IMAGSIN			##	Returnerer et komplekst tals sinus
+IMSQRT			= IMAGKVROD			##	Returnerer et komplekst tals kvadratrod
+IMSUB			= IMAGSUB			##	Returnerer forskellen mellem to komplekse tal
+IMSUM			= IMAGSUM			##	Returnerer summen af komplekse tal
+OCT2BIN			= OKT.TIL.BIN			##	Konverterer et oktaltal til et binært tal
+OCT2DEC			= OKT.TIL.DEC			##	Konverterer et oktaltal til et decimaltal
+OCT2HEX			= OKT.TIL.HEX			##	Konverterer et oktaltal til et heksadecimalt tal
+
+
+##
+##	Financial functions				Finansielle funktioner
+##
+ACCRINT			= PÅLØBRENTE			##	Returnerer den påløbne rente for et værdipapir med periodiske renteudbetalinger
+ACCRINTM		= PÅLØBRENTE.UDLØB		##	Returnerer den påløbne rente for et værdipapir, hvor renteudbetalingen finder sted ved papirets udløb
+AMORDEGRC		= AMORDEGRC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode ved hjælp af en afskrivningskoefficient
+AMORLINC		= AMORLINC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode
+COUPDAYBS		= KUPONDAGE.SA			##	Returnerer antallet af dage fra starten af kuponperioden til afregningsdatoen
+COUPDAYS		= KUPONDAGE.A			##	Returnerer antallet af dage fra begyndelsen af kuponperioden til afregningsdatoen
+COUPDAYSNC		= KUPONDAGE.ANK			##	Returnerer antallet af dage i den kuponperiode, der indeholder afregningsdatoen
+COUPNCD			= KUPONDAG.NÆSTE		##	Returnerer den næste kupondato efter afregningsdatoen
+COUPNUM			= KUPONBETALINGER		##	Returnerer antallet af kuponudbetalinger mellem afregnings- og udløbsdatoen
+COUPPCD			= KUPONDAG.FORRIGE		##	Returnerer den forrige kupondato før afregningsdatoen
+CUMIPMT			= AKKUM.RENTE			##	Returnerer den akkumulerede rente, der betales på et lån mellem to perioder
+CUMPRINC		= AKKUM.HOVEDSTOL		##	Returnerer den akkumulerede nedbringelse af hovedstol mellem to perioder
+DB			= DB				##	Returnerer afskrivningen på et aktiv i en angivet periode ved anvendelse af saldometoden
+DDB			= DSA				##	Returnerer afskrivningsbeløbet for et aktiv over en bestemt periode ved anvendelse af dobbeltsaldometoden eller en anden afskrivningsmetode, som du angiver
+DISC			= DISKONTO			##	Returnerer et værdipapirs diskonto
+DOLLARDE		= KR.DECIMAL			##	Konverterer en kronepris udtrykt som brøk til en kronepris udtrykt som decimaltal
+DOLLARFR		= KR.BRØK			##	Konverterer en kronepris udtrykt som decimaltal til en kronepris udtrykt som brøk
+DURATION		= VARIGHED			##	Returnerer den årlige løbetid for et værdipapir med periodiske renteudbetalinger
+EFFECT			= EFFEKTIV.RENTE		##	Returnerer den årlige effektive rente
+FV			= FV				##	Returnerer fremtidsværdien af en investering
+FVSCHEDULE		= FVTABEL			##	Returnerer den fremtidige værdi af en hovedstol, når der er tilskrevet rente og rentes rente efter forskellige rentesatser
+INTRATE			= RENTEFOD			##	Returnerer renten på et fuldt ud investeret værdipapir
+IPMT			= R.YDELSE			##	Returnerer renten fra en investering for en given periode
+IRR			= IA				##	Returnerer den interne rente for en række pengestrømme
+ISPMT			= ISPMT				##	Beregner den betalte rente i løbet af en bestemt investeringsperiode
+MDURATION		= MVARIGHED			##	Returnerer Macauleys modificerede løbetid for et værdipapir med en formodet pari på kr. 100
+MIRR			= MIA				##	Returnerer den interne forrentning, hvor positive og negative pengestrømme finansieres til forskellig rente
+NOMINAL			= NOMINEL			##	Returnerer den årlige nominelle rente
+NPER			= NPER				##	Returnerer antallet af perioder for en investering
+NPV			= NUTIDSVÆRDI			##	Returnerer nettonutidsværdien for en investering baseret på en række periodiske pengestrømme og en diskonteringssats
+ODDFPRICE		= ULIGE.KURS.PÅLYDENDE		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med en ulige (kort eller lang) første periode
+ODDFYIELD		= ULIGE.FØRSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige første periode
+ODDLPRICE		= ULIGE.SIDSTE.KURS		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med ulige sidste periode
+ODDLYIELD		= ULIGE.SIDSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige sidste periode
+PMT			= YDELSE			##	Returnerer renten fra en investering for en given periode
+PPMT			= H.YDELSE			##	Returnerer ydelsen på hovedstolen for en investering i en given periode
+PRICE			= KURS				##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir med periodiske renteudbetalinger
+PRICEDISC		= KURS.DISKONTO			##	Returnerer kursen pr. kr 100 nominel værdi for et diskonteret værdipapir
+PRICEMAT		= KURS.UDLØB			##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir, hvor renten udbetales ved papirets udløb
+PV			= NV				##	Returnerer den nuværende værdi af en investering
+RATE			= RENTE				##	Returnerer renten i hver periode for en annuitet
+RECEIVED		= MODTAGET.VED.UDLØB		##	Returnerer det beløb, der modtages ved udløbet af et fuldt ud investeret værdipapir
+SLN			= LA				##	Returnerer den lineære afskrivning for et aktiv i en enkelt periode
+SYD			= ÅRSAFSKRIVNING		##	Returnerer den årlige afskrivning på et aktiv i en bestemt periode
+TBILLEQ			= STATSOBLIGATION		##	Returnerer det obligationsækvivalente afkast for en statsobligation
+TBILLPRICE		= STATSOBLIGATION.KURS		##	Returnerer kursen pr. kr 100 nominel værdi for en statsobligation
+TBILLYIELD		= STATSOBLIGATION.AFKAST	##	Returnerer en afkastet på en statsobligation
+VDB			= VSA				##	Returnerer afskrivningen på et aktiv i en angivet periode, herunder delperioder, ved brug af dobbeltsaldometoden
+XIRR			= INTERN.RENTE			##	Returnerer den interne rente for en plan over pengestrømme, der ikke behøver at være periodiske
+XNPV			= NETTO.NUTIDSVÆRDI		##	Returnerer nutidsværdien for en plan over pengestrømme, der ikke behøver at være periodiske
+YIELD			= AFKAST			##	Returnerer afkastet for et værdipapir med periodiske renteudbetalinger
+YIELDDISC		= AFKAST.DISKONTO		##	Returnerer det årlige afkast for et diskonteret værdipapir, f.eks. en statsobligation
+YIELDMAT		= AFKAST.UDLØBSDATO		##	Returnerer det årlige afkast for et værdipapir, hvor renten udbetales ved papirets udløb
+
+
+##
+##	Information functions				Informationsfunktioner
+##
+CELL			= CELLE				##	Returnerer oplysninger om formatering, placering eller indhold af en celle
+ERROR.TYPE		= FEJLTYPE			##	Returnerer et tal, der svarer til en fejltype
+INFO			= INFO				##	Returnerer oplysninger om det aktuelle operativmiljø
+ISBLANK			= ER.TOM			##	Returnerer SAND, hvis værdien er tom
+ISERR			= ER.FJL			##	Returnerer SAND, hvis værdien er en fejlværdi undtagen #I/T
+ISERROR			= ER.FEJL			##	Returnerer SAND, hvis værdien er en fejlværdi
+ISEVEN			= ER.LIGE			##	Returnerer SAND, hvis tallet er lige
+ISLOGICAL		= ER.LOGISK			##	Returnerer SAND, hvis værdien er en logisk værdi
+ISNA			= ER.IKKE.TILGÆNGELIG		##	Returnerer SAND, hvis værdien er fejlværdien #I/T
+ISNONTEXT		= ER.IKKE.TEKST			##	Returnerer SAND, hvis værdien ikke er tekst
+ISNUMBER		= ER.TAL			##	Returnerer SAND, hvis værdien er et tal
+ISODD			= ER.ULIGE			##	Returnerer SAND, hvis tallet er ulige
+ISREF			= ER.REFERENCE			##	Returnerer SAND, hvis værdien er en reference
+ISTEXT			= ER.TEKST			##	Returnerer SAND, hvis værdien er tekst
+N			= TAL				##	Returnerer en værdi konverteret til et tal
+NA			= IKKE.TILGÆNGELIG		##	Returnerer fejlværdien #I/T
+TYPE			= VÆRDITYPE			##	Returnerer et tal, der angiver datatypen for en værdi
+
+
+##
+##	Logical functions				Logiske funktioner
+##
+AND			= OG				##	Returnerer SAND, hvis alle argumenterne er sande
+FALSE			= FALSK				##	Returnerer den logiske værdi FALSK
+IF			= HVIS				##	Angiver en logisk test, der skal udføres
+IFERROR			= HVIS.FEJL			##	Returnerer en værdi, du angiver, hvis en formel evauleres som en fejl. Returnerer i modsat fald resultatet af formlen
+NOT			= IKKE				##	Vender argumentets logik om
+OR			= ELLER				##	Returneret værdien SAND, hvis mindst ét argument er sandt
+TRUE			= SAND				##	Returnerer den logiske værdi SAND
+
+
+##
+##	Lookup and reference functions			Opslags- og referencefunktioner
+##
+ADDRESS			= ADRESSE			##	Returnerer en reference som tekst til en enkelt celle i et regneark
+AREAS			= OMRÅDER			##	Returnerer antallet af områder i en reference
+CHOOSE			= VÆLG				##	Vælger en værdi på en liste med værdier
+COLUMN			= KOLONNE			##	Returnerer kolonnenummeret i en reference
+COLUMNS			= KOLONNER			##	Returnerer antallet af kolonner i en reference
+HLOOKUP			= VOPSLAG			##	Søger i den øverste række af en matrix og returnerer værdien af den angivne celle
+HYPERLINK		= HYPERLINK			##	Opretter en genvej kaldet et hyperlink, der åbner et dokument, som er lagret på en netværksserver, på et intranet eller på internettet
+INDEX			= INDEKS			##	Anvender et indeks til at vælge en værdi fra en reference eller en matrix
+INDIRECT		= INDIREKTE			##	Returnerer en reference, der er angivet af en tekstværdi
+LOOKUP			= SLÅ.OP			##	Søger værdier i en vektor eller en matrix
+MATCH			= SAMMENLIGN			##	Søger værdier i en reference eller en matrix
+OFFSET			= FORSKYDNING			##	Returnerer en reference forskudt i forhold til en given reference
+ROW			= RÆKKE				##	Returnerer rækkenummeret for en reference
+ROWS			= RÆKKER			##	Returnerer antallet af rækker i en reference
+RTD			= RTD				##	Henter realtidsdata fra et program, der understøtter COM-automatisering (Automation: En metode til at arbejde med objekter fra et andet program eller udviklingsværktøj. Automation, som tidligere blev kaldt OLE Automation, er en industristandard og en funktion i COM (Component Object Model).)
+TRANSPOSE		= TRANSPONER			##	Returnerer en transponeret matrix
+VLOOKUP			= LOPSLAG			##	Søger i øverste række af en matrix og flytter på tværs af rækken for at returnere en celleværdi
+
+
+##
+##	Math and trigonometry functions			Matematiske og trigonometriske funktioner
+##
+ABS			= ABS				##	Returnerer den absolutte værdi af et tal
+ACOS			= ARCCOS			##	Returnerer et tals arcus cosinus
+ACOSH			= ARCCOSH			##	Returnerer den inverse hyperbolske cosinus af tal
+ASIN			= ARCSIN			##	Returnerer et tals arcus sinus
+ASINH			= ARCSINH			##	Returnerer den inverse hyperbolske sinus for tal
+ATAN			= ARCTAN			##	Returnerer et tals arcus tangens
+ATAN2			= ARCTAN2			##	Returnerer de angivne x- og y-koordinaters arcus tangens
+ATANH			= ARCTANH			##	Returnerer et tals inverse hyperbolske tangens
+CEILING			= AFRUND.LOFT			##	Afrunder et tal til nærmeste heltal eller til nærmeste multiplum af betydning
+COMBIN			= KOMBIN			##	Returnerer antallet af kombinationer for et givet antal objekter
+COS			= COS				##	Returnerer et tals cosinus
+COSH			= COSH				##	Returnerer den inverse hyperbolske cosinus af et tal
+DEGREES			= GRADER			##	Konverterer radianer til grader
+EVEN			= LIGE				##	Runder et tal op til nærmeste lige heltal
+EXP			= EKSP				##	Returnerer e opløftet til en potens af et angivet tal
+FACT			= FAKULTET			##	Returnerer et tals fakultet
+FACTDOUBLE		= DOBBELT.FAKULTET		##	Returnerer et tals dobbelte fakultet
+FLOOR			= AFRUND.GULV			##	Runder et tal ned mod nul
+GCD			= STØRSTE.FÆLLES.DIVISOR	##	Returnerer den største fælles divisor
+INT			= HELTAL			##	Nedrunder et tal til det nærmeste heltal
+LCM			= MINDSTE.FÆLLES.MULTIPLUM	##	Returnerer det mindste fælles multiplum
+LN			= LN				##	Returnerer et tals naturlige logaritme
+LOG			= LOG				##	Returnerer logaritmen for et tal på grundlag af et angivet grundtal
+LOG10			= LOG10				##	Returnerer titalslogaritmen af et tal
+MDETERM			= MDETERM			##	Returnerer determinanten for en matrix
+MINVERSE		= MINVERT			##	Returnerer den inverse matrix for en matrix
+MMULT			= MPRODUKT			##	Returnerer matrixproduktet af to matrixer
+MOD			= REST				##	Returnerer restværdien fra division
+MROUND			= MAFRUND			##	Returnerer et tal afrundet til det ønskede multiplum
+MULTINOMIAL		= MULTINOMIAL			##	Returnerer et multinomialt talsæt
+ODD			= ULIGE				##	Runder et tal op til nærmeste ulige heltal
+PI			= PI				##	Returnerer værdien af pi
+POWER			= POTENS			##	Returnerer resultatet af et tal opløftet til en potens
+PRODUCT			= PRODUKT			##	Multiplicerer argumenterne
+QUOTIENT		= KVOTIENT			##	Returnerer heltalsdelen ved division
+RADIANS			= RADIANER			##	Konverterer grader til radianer
+RAND			= SLUMP				##	Returnerer et tilfældigt tal mellem 0 og 1
+RANDBETWEEN		= SLUMP.MELLEM			##	Returnerer et tilfældigt tal mellem de tal, der angives
+ROMAN			= ROMERTAL			##	Konverterer et arabertal til romertal som tekst
+ROUND			= AFRUND			##	Afrunder et tal til et angivet antal decimaler
+ROUNDDOWN		= RUND.NED			##	Runder et tal ned mod nul
+ROUNDUP			= RUND.OP			##	Runder et tal op, væk fra 0 (nul)
+SERIESSUM		= SERIESUM			##	Returnerer summen af en potensserie baseret på en formel
+SIGN			= FORTEGN			##	Returnerer et tals fortegn
+SIN			= SIN				##	Returnerer en given vinkels sinusværdi
+SINH			= SINH				##	Returnerer den hyperbolske sinus af et tal
+SQRT			= KVROD				##	Returnerer en positiv kvadratrod
+SQRTPI			= KVRODPI			##	Returnerer kvadratroden af (tal * pi;)
+SUBTOTAL		= SUBTOTAL			##	Returnerer en subtotal på en liste eller i en database
+SUM			= SUM				##	Lægger argumenterne sammen
+SUMIF			= SUM.HVIS			##	Lægger de celler sammen, der er specificeret af et givet kriterium.
+SUMIFS			= SUM.HVISER			##	Lægger de celler i et område sammen, der opfylder flere kriterier.
+SUMPRODUCT		= SUMPRODUKT			##	Returnerer summen af produkter af ens matrixkomponenter
+SUMSQ			= SUMKV				##	Returnerer summen af argumenternes kvadrater
+SUMX2MY2		= SUMX2MY2			##	Returnerer summen af differensen mellem kvadrater af ens værdier i to matrixer
+SUMX2PY2		= SUMX2PY2			##	Returnerer summen af summen af kvadrater af tilsvarende værdier i to matrixer
+SUMXMY2			= SUMXMY2			##	Returnerer summen af kvadrater af differenser mellem ens værdier i to matrixer
+TAN			= TAN				##	Returnerer et tals tangens
+TANH			= TANH				##	Returnerer et tals hyperbolske tangens
+TRUNC			= AFKORT			##	Afkorter et tal til et heltal
+
+
+##
+##	Statistical functions				Statistiske funktioner
+##
+AVEDEV			= MAD				##	Returnerer den gennemsnitlige numeriske afvigelse fra stikprøvens middelværdi
+AVERAGE			= MIDDEL			##	Returnerer middelværdien af argumenterne
+AVERAGEA		= MIDDELV			##	Returnerer middelværdien af argumenterne og medtager tal, tekst og logiske værdier
+AVERAGEIF		= MIDDEL.HVIS			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder et givet kriterium, i et område
+AVERAGEIFS		= MIDDEL.HVISER			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder flere kriterier.
+BETADIST		= BETAFORDELING			##	Returnerer den kumulative betafordelingsfunktion
+BETAINV			= BETAINV			##	Returnerer den inverse kumulative fordelingsfunktion for en angivet betafordeling
+BINOMDIST		= BINOMIALFORDELING		##	Returnerer punktsandsynligheden for binomialfordelingen
+CHIDIST			= CHIFORDELING			##	Returnerer fraktilsandsynligheden for en chi2-fordeling
+CHIINV			= CHIINV			##	Returnerer den inverse fraktilsandsynlighed for en chi2-fordeling
+CHITEST			= CHITEST			##	Foretager en test for uafhængighed
+CONFIDENCE		= KONFIDENSINTERVAL		##	Returnerer et konfidensinterval for en population
+CORREL			= KORRELATION			##	Returnerer korrelationskoefficienten mellem to datasæt
+COUNT			= TÆL				##	Tæller antallet af tal på en liste med argumenter
+COUNTA			= TÆLV				##	Tæller antallet af værdier på en liste med argumenter
+COUNTBLANK		= ANTAL.BLANKE			##	Tæller antallet af tomme celler i et område
+COUNTIF			= TÆLHVIS			##	Tæller antallet af celler, som opfylder de givne kriterier, i et område
+COUNTIFS		= TÆL.HVISER			##	Tæller antallet af de celler, som opfylder flere kriterier, i et område
+COVAR			= KOVARIANS			##	Beregner kovariansen mellem to stokastiske variabler
+CRITBINOM		= KRITBINOM			##	Returnerer den mindste værdi for x, for hvilken det gælder, at fordelingsfunktionen er mindre end eller lig med kriterieværdien.
+DEVSQ			= SAK				##	Returnerer summen af de kvadrerede afvigelser fra middelværdien
+EXPONDIST		= EKSPFORDELING			##	Returnerer eksponentialfordelingen
+FDIST			= FFORDELING			##	Returnerer fraktilsandsynligheden for F-fordelingen
+FINV			= FINV				##	Returnerer den inverse fraktilsandsynlighed for F-fordelingen
+FISHER			= FISHER			##	Returnerer Fisher-transformationen
+FISHERINV		= FISHERINV			##	Returnerer den inverse Fisher-transformation
+FORECAST		= PROGNOSE			##	Returnerer en prognoseværdi baseret på lineær tendens
+FREQUENCY		= FREKVENS			##	Returnerer en frekvensfordeling i en søjlevektor
+FTEST			= FTEST				##	Returnerer resultatet af en F-test til sammenligning af varians
+GAMMADIST		= GAMMAFORDELING		##	Returnerer fordelingsfunktionen for gammafordelingen
+GAMMAINV		= GAMMAINV			##	Returnerer den inverse fordelingsfunktion for gammafordelingen
+GAMMALN			= GAMMALN			##	Returnerer den naturlige logaritme til gammafordelingen, G(x)
+GEOMEAN			= GEOMIDDELVÆRDI		##	Returnerer det geometriske gennemsnit
+GROWTH			= FORØGELSE			##	Returnerer værdier langs en eksponentiel tendens
+HARMEAN			= HARMIDDELVÆRDI		##	Returnerer det harmoniske gennemsnit
+HYPGEOMDIST		= HYPGEOFORDELING		##	Returnerer punktsandsynligheden i en hypergeometrisk fordeling
+INTERCEPT		= SKÆRING			##	Returnerer afskæringsværdien på y-aksen i en lineær regression
+KURT			= TOPSTEJL			##	Returnerer kurtosisværdien for en stokastisk variabel
+LARGE			= STOR				##	Returnerer den k'te største værdi i et datasæt
+LINEST			= LINREGR			##	Returnerer parameterestimaterne for en lineær tendens
+LOGEST			= LOGREGR			##	Returnerer parameterestimaterne for en eksponentiel tendens
+LOGINV			= LOGINV			##	Returnerer den inverse fordelingsfunktion for lognormalfordelingen
+LOGNORMDIST		= LOGNORMFORDELING		##	Returnerer fordelingsfunktionen for lognormalfordelingen
+MAX			= MAKS				##	Returnerer den maksimale værdi på en liste med argumenter.
+MAXA			= MAKSV				##	Returnerer den maksimale værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
+MEDIAN			= MEDIAN			##	Returnerer medianen for de angivne tal
+MIN			= MIN				##	Returnerer den mindste værdi på en liste med argumenter.
+MINA			= MINV				##	Returnerer den mindste værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
+MODE			= HYPPIGST			##	Returnerer den hyppigste værdi i et datasæt
+NEGBINOMDIST		= NEGBINOMFORDELING		##	Returnerer den negative binomialfordeling
+NORMDIST		= NORMFORDELING			##	Returnerer fordelingsfunktionen for normalfordelingen
+NORMINV			= NORMINV			##	Returnerer den inverse fordelingsfunktion for normalfordelingen
+NORMSDIST		= STANDARDNORMFORDELING		##	Returnerer fordelingsfunktionen for standardnormalfordelingen
+NORMSINV		= STANDARDNORMINV		##	Returnerer den inverse fordelingsfunktion for standardnormalfordelingen
+PEARSON			= PEARSON			##	Returnerer Pearsons korrelationskoefficient
+PERCENTILE		= FRAKTIL			##	Returnerer den k'te fraktil for datasættet
+PERCENTRANK		= PROCENTPLADS			##	Returnerer den procentuelle rang for en given værdi i et datasæt
+PERMUT			= PERMUT			##	Returnerer antallet af permutationer for et givet sæt objekter
+POISSON			= POISSON			##	Returnerer fordelingsfunktionen for en Poisson-fordeling
+PROB			= SANDSYNLIGHED			##	Returnerer intervalsandsynligheden
+QUARTILE		= KVARTIL			##	Returnerer kvartilen i et givet datasæt
+RANK			= PLADS				##	Returnerer rangen for et tal på en liste med tal
+RSQ			= FORKLARINGSGRAD		##	Returnerer R2-værdien fra en simpel lineær regression
+SKEW			= SKÆVHED			##	Returnerer skævheden for en stokastisk variabel
+SLOPE			= HÆLDNING			##	Returnerer estimatet på hældningen fra en simpel lineær regression
+SMALL			= MINDSTE			##	Returnerer den k'te mindste værdi i datasættet
+STANDARDIZE		= STANDARDISER			##	Returnerer en standardiseret værdi
+STDEV			= STDAFV			##	Estimerer standardafvigelsen på basis af en stikprøve
+STDEVA			= STDAFVV			##	Beregner standardafvigelsen på basis af en prøve og medtager tal, tekst og logiske værdier
+STDEVP			= STDAFVP			##	Beregner standardafvigelsen på basis af en hel population
+STDEVPA			= STDAFVPV			##	Beregner standardafvigelsen på basis af en hel population og medtager tal, tekst og logiske værdier
+STEYX			= STFYX				##	Returnerer standardafvigelsen for de estimerede y-værdier i den simple lineære regression
+TDIST			= TFORDELING			##	Returnerer fordelingsfunktionen for Student's t-fordeling
+TINV			= TINV				##	Returnerer den inverse fordelingsfunktion for Student's t-fordeling
+TREND			= TENDENS			##	Returnerer værdi under antagelse af en lineær tendens
+TRIMMEAN		= TRIMMIDDELVÆRDI		##	Returnerer den trimmede middelværdi for datasættet
+TTEST			= TTEST				##	Returnerer den sandsynlighed, der er forbundet med Student's t-test
+VAR			= VARIANS			##	Beregner variansen på basis af en prøve
+VARA			= VARIANSV			##	Beregner variansen på basis af en prøve og medtager tal, tekst og logiske værdier
+VARP			= VARIANSP			##	Beregner variansen på basis af hele populationen
+VARPA			= VARIANSPV			##	Beregner variansen på basis af hele populationen og medtager tal, tekst og logiske værdier
+WEIBULL			= WEIBULL			##	Returnerer fordelingsfunktionen for Weibull-fordelingen
+ZTEST			= ZTEST				##	Returnerer sandsynlighedsværdien ved en en-sidet z-test
+
+
+##
+##	Text functions					Tekstfunktioner
+##
+ASC			= ASC				##	Ændrer engelske tegn i fuld bredde (dobbelt-byte) eller katakana i en tegnstreng til tegn i halv bredde (enkelt-byte)
+BAHTTEXT		= BAHTTEKST			##	Konverterer et tal til tekst ved hjælp af valutaformatet ß (baht)
+CHAR			= TEGN				##	Returnerer det tegn, der svarer til kodenummeret
+CLEAN			= RENS				##	Fjerner alle tegn, der ikke kan udskrives, fra tekst
+CODE			= KODE				##	Returnerer en numerisk kode for det første tegn i en tekststreng
+CONCATENATE		= SAMMENKÆDNING			##	Sammenkæder adskillige tekstelementer til ét tekstelement
+DOLLAR			= KR				##	Konverterer et tal til tekst ved hjælp af valutaformatet kr. (kroner)
+EXACT			= EKSAKT			##	Kontrollerer, om to tekstværdier er identiske
+FIND			= FIND				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
+FINDB			= FINDB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
+FIXED			= FAST				##	Formaterer et tal som tekst med et fast antal decimaler
+JIS			= JIS				##	Ændrer engelske tegn i halv bredde (enkelt-byte) eller katakana i en tegnstreng til tegn i fuld bredde (dobbelt-byte)
+LEFT			= VENSTRE			##	Returnerer tegnet længst til venstre i en tekstværdi
+LEFTB			= VENSTREB			##	Returnerer tegnet længst til venstre i en tekstværdi
+LEN			= LÆNGDE			##	Returnerer antallet af tegn i en tekststreng
+LENB			= LÆNGDEB			##	Returnerer antallet af tegn i en tekststreng
+LOWER			= SMÅ.BOGSTAVER			##	Konverterer tekst til små bogstaver
+MID			= MIDT				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
+MIDB			= MIDTB				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
+PHONETIC		= FONETISK			##	Uddrager de fonetiske (furigana) tegn fra en tekststreng
+PROPER			= STORT.FORBOGSTAV		##	Konverterer første bogstav i hvert ord i teksten til stort bogstav
+REPLACE			= ERSTAT			##	Erstatter tegn i tekst
+REPLACEB		= ERSTATB			##	Erstatter tegn i tekst
+REPT			= GENTAG			##	Gentager tekst et givet antal gange
+RIGHT			= HØJRE				##	Returnerer tegnet længste til højre i en tekstværdi
+RIGHTB			= HØJREB			##	Returnerer tegnet længste til højre i en tekstværdi
+SEARCH			= SØG				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
+SEARCHB			= SØGB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
+SUBSTITUTE		= UDSKIFT			##	Udskifter gammel tekst med ny tekst i en tekststreng
+T			= T				##	Konverterer argumenterne til tekst
+TEXT			= TEKST				##	Formaterer et tal og konverterer det til tekst
+TRIM			= FJERN.OVERFLØDIGE.BLANKE	##	Fjerner mellemrum fra tekst
+UPPER			= STORE.BOGSTAVER		##	Konverterer tekst til store bogstaver
+VALUE			= VÆRDI				##	Konverterer et tekstargument til et tal
diff --git a/lib/PHPExcel/locale/de/config b/lib/PHPExcel/locale/de/config
new file mode 100644
index 000000000..aa0228e7f
--- /dev/null
+++ b/lib/PHPExcel/locale/de/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= €
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NULL!
+DIV0	= #DIV/0!
+VALUE	= #WERT!
+REF	= #BEZUG!
+NAME	= #NAME?
+NUM	= #ZAHL!
+NA	= #NV
diff --git a/lib/PHPExcel/locale/de/functions b/lib/PHPExcel/locale/de/functions
new file mode 100644
index 000000000..3147f9c8b
--- /dev/null
+++ b/lib/PHPExcel/locale/de/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Add-In- und Automatisierungsfunktionen
+##
+GETPIVOTDATA	= PIVOTDATENZUORDNEN			##	In einem PivotTable-Bericht gespeicherte Daten werden zurückgegeben.
+
+
+##
+##	Cube functions					Cubefunktionen
+##
+CUBEKPIMEMBER		= CUBEKPIELEMENT		##	Gibt Name, Eigenschaft und Measure eines Key Performance Indicators (KPI) zurück und zeigt den Namen und die Eigenschaft in der Zelle an. Ein KPI ist ein quantifizierbares Maß, wie z. B. der monatliche Bruttogewinn oder die vierteljährliche Mitarbeiterfluktuation, mit dessen Hilfe das Leistungsverhalten eines Unternehmens überwacht werden kann.
+CUBEMEMBER		= CUBEELEMENT			##	Gibt ein Element oder ein Tuple in einer Cubehierarchie zurück. Wird verwendet, um zu überprüfen, ob das Element oder Tuple im Cube vorhanden ist.
+CUBEMEMBERPROPERTY	= CUBEELEMENTEIGENSCHAFT	##	Gibt den Wert einer Elementeigenschaft im Cube zurück. Wird verwendet, um zu überprüfen, ob ein Elementname im Cube vorhanden ist, und um die für dieses Element angegebene Eigenschaft zurückzugeben.
+CUBERANKEDMEMBER	= CUBERANGELEMENT		##	Gibt das n-te oder n-rangige Element in einer Menge zurück. Wird verwendet, um mindestens ein Element in einer Menge zurückzugeben, wie z. B. bester Vertriebsmitarbeiter oder 10 beste Kursteilnehmer.
+CUBESET			= CUBEMENGE			##	Definiert eine berechnete Menge Elemente oder Tuples durch Senden eines Mengenausdrucks an den Cube auf dem Server, der die Menge erstellt und an Microsoft Office Excel zurückgibt.
+CUBESETCOUNT		= CUBEMENGENANZAHL		##	Gibt die Anzahl der Elemente in einer Menge zurück.
+CUBEVALUE		= CUBEWERT			##	Gibt einen Aggregatwert aus einem Cube zurück.
+
+
+##
+##	Database functions				Datenbankfunktionen
+##
+DAVERAGE		= DBMITTELWERT			##	Gibt den Mittelwert der ausgewählten Datenbankeinträge zurück
+DCOUNT			= DBANZAHL			##	Zählt die Zellen mit Zahlen in einer Datenbank
+DCOUNTA			= DBANZAHL2			##	Zählt nicht leere Zellen in einer Datenbank
+DGET			= DBAUSZUG			##	Extrahiert aus einer Datenbank einen einzelnen Datensatz, der den angegebenen Kriterien entspricht
+DMAX			= DBMAX				##	Gibt den größten Wert aus ausgewählten Datenbankeinträgen zurück
+DMIN			= DBMIN				##	Gibt den kleinsten Wert aus ausgewählten Datenbankeinträgen zurück
+DPRODUCT		= DBPRODUKT			##	Multipliziert die Werte in einem bestimmten Feld mit Datensätzen, die den Kriterien in einer Datenbank entsprechen
+DSTDEV			= DBSTDABW			##	Schätzt die Standardabweichung auf der Grundlage einer Stichprobe aus ausgewählten Datenbankeinträgen
+DSTDEVP			= DBSTDABWN			##	Berechnet die Standardabweichung auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
+DSUM			= DBSUMME			##	Addiert die Zahlen in der Feldspalte mit Datensätzen in der Datenbank, die den Kriterien entsprechen
+DVAR			= DBVARIANZ			##	Schätzt die Varianz auf der Grundlage ausgewählter Datenbankeinträge
+DVARP			= DBVARIANZEN			##	Berechnet die Varianz auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
+
+
+##
+##	Date and time functions				Datums- und Zeitfunktionen
+##
+DATE			= DATUM				##	Gibt die fortlaufende Zahl eines bestimmten Datums zurück
+DATEVALUE		= DATWERT			##	Wandelt ein Datum in Form von Text in eine fortlaufende Zahl um
+DAY			= TAG				##	Wandelt eine fortlaufende Zahl in den Tag des Monats um
+DAYS360			= TAGE360			##	Berechnet die Anzahl der Tage zwischen zwei Datumsangaben ausgehend von einem Jahr, das 360 Tage hat
+EDATE			= EDATUM			##	Gibt die fortlaufende Zahl des Datums zurück, bei dem es sich um die angegebene Anzahl von Monaten vor oder nach dem Anfangstermin handelt
+EOMONTH			= MONATSENDE			##	Gibt die fortlaufende Zahl des letzten Tags des Monats vor oder nach einer festgelegten Anzahl von Monaten zurück
+HOUR			= STUNDE			##	Wandelt eine fortlaufende Zahl in eine Stunde um
+MINUTE			= MINUTE			##	Wandelt eine fortlaufende Zahl in eine Minute um
+MONTH			= MONAT				##	Wandelt eine fortlaufende Zahl in einen Monat um
+NETWORKDAYS		= NETTOARBEITSTAGE		##	Gibt die Anzahl von ganzen Arbeitstagen zwischen zwei Datumswerten zurück
+NOW			= JETZT				##	Gibt die fortlaufende Zahl des aktuellen Datums und der aktuellen Uhrzeit zurück
+SECOND			= SEKUNDE			##	Wandelt eine fortlaufende Zahl in eine Sekunde um
+TIME			= ZEIT				##	Gibt die fortlaufende Zahl einer bestimmten Uhrzeit zurück
+TIMEVALUE		= ZEITWERT			##	Wandelt eine Uhrzeit in Form von Text in eine fortlaufende Zahl um
+TODAY			= HEUTE				##	Gibt die fortlaufende Zahl des heutigen Datums zurück
+WEEKDAY			= WOCHENTAG			##	Wandelt eine fortlaufende Zahl in den Wochentag um
+WEEKNUM			= KALENDERWOCHE			##	Wandelt eine fortlaufende Zahl in eine Zahl um, die angibt, in welche Woche eines Jahres das angegebene Datum fällt
+WORKDAY			= ARBEITSTAG			##	Gibt die fortlaufende Zahl des Datums vor oder nach einer bestimmten Anzahl von Arbeitstagen zurück
+YEAR			= JAHR				##	Wandelt eine fortlaufende Zahl in ein Jahr um
+YEARFRAC		= BRTEILJAHRE			##	Gibt die Anzahl der ganzen Tage zwischen Ausgangsdatum und Enddatum in Bruchteilen von Jahren zurück
+
+
+##
+##	Engineering functions				Konstruktionsfunktionen
+##
+BESSELI			= BESSELI			##	Gibt die geänderte Besselfunktion In(x) zurück
+BESSELJ			= BESSELJ			##	Gibt die Besselfunktion Jn(x) zurück
+BESSELK			= BESSELK			##	Gibt die geänderte Besselfunktion Kn(x) zurück
+BESSELY			= BESSELY			##	Gibt die Besselfunktion Yn(x) zurück
+BIN2DEC			= BININDEZ			##	Wandelt eine binäre Zahl (Dualzahl) in eine dezimale Zahl um
+BIN2HEX			= BININHEX			##	Wandelt eine binäre Zahl (Dualzahl) in eine hexadezimale Zahl um
+BIN2OCT			= BININOKT			##	Wandelt eine binäre Zahl (Dualzahl) in eine oktale Zahl um
+COMPLEX			= KOMPLEXE			##	Wandelt den Real- und Imaginärteil in eine komplexe Zahl um
+CONVERT			= UMWANDELN			##	Wandelt eine Zahl von einem Maßsystem in ein anderes um
+DEC2BIN			= DEZINBIN			##	Wandelt eine dezimale Zahl in eine binäre Zahl (Dualzahl) um
+DEC2HEX			= DEZINHEX			##	Wandelt eine dezimale Zahl in eine hexadezimale Zahl um
+DEC2OCT			= DEZINOKT			##	Wandelt eine dezimale Zahl in eine oktale Zahl um
+DELTA			= DELTA				##	Überprüft, ob zwei Werte gleich sind
+ERF			= GAUSSFEHLER			##	Gibt die Gauss'sche Fehlerfunktion zurück
+ERFC			= GAUSSFKOMPL			##	Gibt das Komplement zur Gauss'schen Fehlerfunktion zurück
+GESTEP			= GGANZZAHL			##	Überprüft, ob eine Zahl größer als ein gegebener Schwellenwert ist
+HEX2BIN			= HEXINBIN			##	Wandelt eine hexadezimale Zahl in eine Binärzahl um
+HEX2DEC			= HEXINDEZ			##	Wandelt eine hexadezimale Zahl in eine dezimale Zahl um
+HEX2OCT			= HEXINOKT			##	Wandelt eine hexadezimale Zahl in eine Oktalzahl um
+IMABS			= IMABS				##	Gibt den Absolutbetrag (Modulo) einer komplexen Zahl zurück
+IMAGINARY		= IMAGINÄRTEIL			##	Gibt den Imaginärteil einer komplexen Zahl zurück
+IMARGUMENT		= IMARGUMENT			##	Gibt das Argument Theta zurück, einen Winkel, der als Bogenmaß ausgedrückt wird
+IMCONJUGATE		= IMKONJUGIERTE			##	Gibt die konjugierte komplexe Zahl zu einer komplexen Zahl zurück
+IMCOS			= IMCOS				##	Gibt den Kosinus einer komplexen Zahl zurück
+IMDIV			= IMDIV				##	Gibt den Quotienten zweier komplexer Zahlen zurück
+IMEXP			= IMEXP				##	Gibt die algebraische Form einer in exponentieller Schreibweise vorliegenden komplexen Zahl zurück
+IMLN			= IMLN				##	Gibt den natürlichen Logarithmus einer komplexen Zahl zurück
+IMLOG10			= IMLOG10			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 10 zurück
+IMLOG2			= IMLOG2			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 2 zurück
+IMPOWER			= IMAPOTENZ			##	Potenziert eine komplexe Zahl mit einer ganzen Zahl
+IMPRODUCT		= IMPRODUKT			##	Gibt das Produkt von komplexen Zahlen zurück
+IMREAL			= IMREALTEIL			##	Gibt den Realteil einer komplexen Zahl zurück
+IMSIN			= IMSIN				##	Gibt den Sinus einer komplexen Zahl zurück
+IMSQRT			= IMWURZEL			##	Gibt die Quadratwurzel einer komplexen Zahl zurück
+IMSUB			= IMSUB				##	Gibt die Differenz zwischen zwei komplexen Zahlen zurück
+IMSUM			= IMSUMME			##	Gibt die Summe von komplexen Zahlen zurück
+OCT2BIN			= OKTINBIN			##	Wandelt eine oktale Zahl in eine binäre Zahl (Dualzahl) um
+OCT2DEC			= OKTINDEZ			##	Wandelt eine oktale Zahl in eine dezimale Zahl um
+OCT2HEX			= OKTINHEX			##	Wandelt eine oktale Zahl in eine hexadezimale Zahl um
+
+
+##
+##	Financial functions				Finanzmathematische Funktionen
+##
+ACCRINT			= AUFGELZINS			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers mit periodischen Zinszahlungen zurück
+ACCRINTM		= AUFGELZINSF			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers zurück, die bei Fälligkeit ausgezahlt werden
+AMORDEGRC		= AMORDEGRK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume mithilfe eines Abschreibungskoeffizienten zurück
+AMORLINC		= AMORLINEARK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume zurück
+COUPDAYBS		= ZINSTERMTAGVA			##	Gibt die Anzahl der Tage vom Anfang des Zinstermins bis zum Abrechnungstermin zurück
+COUPDAYS		= ZINSTERMTAGE			##	Gibt die Anzahl der Tage der Zinsperiode zurück, die den Abrechnungstermin einschließt
+COUPDAYSNC		= ZINSTERMTAGNZ			##	Gibt die Anzahl der Tage vom Abrechnungstermin bis zum nächsten Zinstermin zurück
+COUPNCD			= ZINSTERMNZ			##	Gibt das Datum des ersten Zinstermins nach dem Abrechnungstermin zurück
+COUPNUM			= ZINSTERMZAHL			##	Gibt die Anzahl der Zinstermine zwischen Abrechnungs- und Fälligkeitsdatum zurück
+COUPPCD			= ZINSTERMVZ			##	Gibt das Datum des letzten Zinstermins vor dem Abrechnungstermin zurück
+CUMIPMT			= KUMZINSZ			##	Berechnet die kumulierten Zinsen, die zwischen zwei Perioden zu zahlen sind
+CUMPRINC		= KUMKAPITAL			##	Berechnet die aufgelaufene Tilgung eines Darlehens, die zwischen zwei Perioden zu zahlen ist
+DB			= GDA2				##	Gibt die geometrisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
+DDB			= GDA				##	Gibt die Abschreibung eines Anlageguts für einen angegebenen Zeitraum unter Verwendung der degressiven Doppelraten-Abschreibung oder eines anderen von Ihnen angegebenen Abschreibungsverfahrens zurück
+DISC			= DISAGIO			##	Gibt den in Prozent ausgedrückten Abzinsungssatz eines Wertpapiers zurück
+DOLLARDE		= NOTIERUNGDEZ			##	Wandelt eine Notierung, die als Dezimalbruch ausgedrückt wurde, in eine Dezimalzahl um
+DOLLARFR		= NOTIERUNGBRU			##	Wandelt eine Notierung, die als Dezimalzahl ausgedrückt wurde, in einen Dezimalbruch um
+DURATION		= DURATION			##	Gibt die jährliche Duration eines Wertpapiers mit periodischen Zinszahlungen zurück
+EFFECT			= EFFEKTIV			##	Gibt die jährliche Effektivverzinsung zurück
+FV			= ZW				##	Gibt den zukünftigen Wert (Endwert) einer Investition zurück
+FVSCHEDULE		= ZW2				##	Gibt den aufgezinsten Wert des Anfangskapitals für eine Reihe periodisch unterschiedlicher Zinssätze zurück
+INTRATE			= ZINSSATZ			##	Gibt den Zinssatz eines voll investierten Wertpapiers zurück
+IPMT			= ZINSZ				##	Gibt die Zinszahlung einer Investition für die angegebene Periode zurück
+IRR			= IKV				##	Gibt den internen Zinsfuß einer Investition ohne Finanzierungskosten oder Reinvestitionsgewinne zurück
+ISPMT			= ISPMT				##	Berechnet die während eines bestimmten Zeitraums für eine Investition gezahlten Zinsen
+MDURATION		= MDURATION			##	Gibt die geänderte Dauer für ein Wertpapier mit einem angenommenen Nennwert von 100 € zurück
+MIRR			= QIKV				##	Gibt den internen Zinsfuß zurück, wobei positive und negative Zahlungen zu unterschiedlichen Sätzen finanziert werden
+NOMINAL			= NOMINAL			##	Gibt die jährliche Nominalverzinsung zurück
+NPER			= ZZR				##	Gibt die Anzahl der Zahlungsperioden einer Investition zurück
+NPV			= NBW				##	Gibt den Nettobarwert einer Investition auf Basis periodisch anfallender Zahlungen und eines Abzinsungsfaktors zurück
+ODDFPRICE		= UNREGER.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
+ODDFYIELD		= UNREGER.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
+ODDLPRICE		= UNREGLE.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
+ODDLYIELD		= UNREGLE.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
+PMT			= RMZ				##	Gibt die periodische Zahlung für eine Annuität zurück
+PPMT			= KAPZ				##	Gibt die Kapitalrückzahlung einer Investition für eine angegebene Periode zurück
+PRICE			= KURS				##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das periodisch Zinsen auszahlt
+PRICEDISC		= KURSDISAGIO			##	Gibt den Kurs pro 100 € Nennwert eines unverzinslichen Wertpapiers zurück
+PRICEMAT		= KURSFÄLLIG			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
+PV			= BW				##	Gibt den Barwert einer Investition zurück
+RATE			= ZINS				##	Gibt den Zinssatz pro Zeitraum einer Annuität zurück
+RECEIVED		= AUSZAHLUNG			##	Gibt den Auszahlungsbetrag eines voll investierten Wertpapiers am Fälligkeitstermin zurück
+SLN			= LIA				##	Gibt die lineare Abschreibung eines Wirtschaftsguts pro Periode zurück
+SYD			= DIA				##	Gibt die arithmetisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
+TBILLEQ			= TBILLÄQUIV			##	Gibt die Rendite für ein Wertpapier zurück
+TBILLPRICE		= TBILLKURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück
+TBILLYIELD		= TBILLRENDITE			##	Gibt die Rendite für ein Wertpapier zurück
+VDB			= VDB				##	Gibt die degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode oder Teilperiode zurück
+XIRR			= XINTZINSFUSS			##	Gibt den internen Zinsfuß einer Reihe nicht periodisch anfallender Zahlungen zurück
+XNPV			= XKAPITALWERT			##	Gibt den Nettobarwert (Kapitalwert) einer Reihe nicht periodisch anfallender Zahlungen zurück
+YIELD			= RENDITE			##	Gibt die Rendite eines Wertpapiers zurück, das periodisch Zinsen auszahlt
+YIELDDISC		= RENDITEDIS			##	Gibt die jährliche Rendite eines unverzinslichen Wertpapiers zurück
+YIELDMAT		= RENDITEFÄLL			##	Gibt die jährliche Rendite eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
+
+
+##
+##	Information functions				Informationsfunktionen
+##
+CELL			= ZELLE				##	Gibt Informationen zu Formatierung, Position oder Inhalt einer Zelle zurück
+ERROR.TYPE		= FEHLER.TYP			##	Gibt eine Zahl zurück, die einem Fehlertyp entspricht
+INFO			= INFO				##	Gibt Informationen zur aktuellen Betriebssystemumgebung zurück
+ISBLANK			= ISTLEER			##	Gibt WAHR zurück, wenn der Wert leer ist
+ISERR			= ISTFEHL			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert außer #N/V ist
+ISERROR			= ISTFEHLER			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert ist
+ISEVEN			= ISTGERADE			##	Gibt WAHR zurück, wenn es sich um eine gerade Zahl handelt
+ISLOGICAL		= ISTLOG			##	Gibt WAHR zurück, wenn der Wert ein Wahrheitswert ist
+ISNA			= ISTNV				##	Gibt WAHR zurück, wenn der Wert der Fehlerwert #N/V ist
+ISNONTEXT		= ISTKTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das keinen Text enthält
+ISNUMBER		= ISTZAHL			##	Gibt WAHR zurück, wenn der Wert eine Zahl ist
+ISODD			= ISTUNGERADE			##	Gibt WAHR zurück, wenn es sich um eine ungerade Zahl handelt
+ISREF			= ISTBEZUG			##	Gibt WAHR zurück, wenn der Wert ein Bezug ist
+ISTEXT			= ISTTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das Text enthält
+N			= N				##	Gibt den in eine Zahl umgewandelten Wert zurück
+NA			= NV				##	Gibt den Fehlerwert #NV zurück
+TYPE			= TYP				##	Gibt eine Zahl zurück, die den Datentyp des angegebenen Werts anzeigt
+
+
+##
+##	Logical functions				Logische Funktionen
+##
+AND			= UND				##	Gibt WAHR zurück, wenn alle zugehörigen Argumente WAHR sind
+FALSE			= FALSCH			##	Gibt den Wahrheitswert FALSCH zurück
+IF			= WENN				##	Gibt einen logischen Test zum Ausführen an
+IFERROR			= WENNFEHLER			##	Gibt einen von Ihnen festgelegten Wert zurück, wenn die Auswertung der Formel zu einem Fehler führt; andernfalls wird das Ergebnis der Formel zurückgegeben
+NOT			= NICHT				##	Kehrt den Wahrheitswert der zugehörigen Argumente um
+OR			= ODER				##	Gibt WAHR zurück, wenn ein Argument WAHR ist
+TRUE			= WAHR				##	Gibt den Wahrheitswert WAHR zurück
+
+
+##
+##	Lookup and reference functions			Nachschlage- und Verweisfunktionen
+##
+ADDRESS			= ADRESSE			##	Gibt einen Bezug auf eine einzelne Zelle in einem Tabellenblatt als Text zurück
+AREAS			= BEREICHE			##	Gibt die Anzahl der innerhalb eines Bezugs aufgeführten Bereiche zurück
+CHOOSE			= WAHL				##	Wählt einen Wert aus eine Liste mit Werten aus
+COLUMN			= SPALTE			##	Gibt die Spaltennummer eines Bezugs zurück
+COLUMNS			= SPALTEN			##	Gibt die Anzahl der Spalten in einem Bezug zurück
+HLOOKUP			= HVERWEIS			##	Sucht in der obersten Zeile einer Matrix und gibt den Wert der angegebenen Zelle zurück
+HYPERLINK		= HYPERLINK			##	Erstellt eine Verknüpfung, über die ein auf einem Netzwerkserver, in einem Intranet oder im Internet gespeichertes Dokument geöffnet wird
+INDEX			= INDEX				##	Verwendet einen Index, um einen Wert aus einem Bezug oder einer Matrix auszuwählen
+INDIRECT		= INDIREKT			##	Gibt einen Bezug zurück, der von einem Textwert angegeben wird
+LOOKUP			= LOOKUP			##	Sucht Werte in einem Vektor oder einer Matrix
+MATCH			= VERGLEICH			##	Sucht Werte in einem Bezug oder einer Matrix
+OFFSET			= BEREICH.VERSCHIEBEN		##	Gibt einen Bezugoffset aus einem gegebenen Bezug zurück
+ROW			= ZEILE				##	Gibt die Zeilennummer eines Bezugs zurück
+ROWS			= ZEILEN			##	Gibt die Anzahl der Zeilen in einem Bezug zurück
+RTD			= RTD				##	Ruft Echtzeitdaten von einem Programm ab, das die COM-Automatisierung (Automatisierung: Ein Verfahren, bei dem aus einer Anwendung oder einem Entwicklungstool heraus mit den Objekten einer anderen Anwendung gearbeitet wird. Die früher als OLE-Automatisierung bezeichnete Automatisierung ist ein Industriestandard und eine Funktion von COM (Component Object Model).) unterstützt
+TRANSPOSE		= MTRANS			##	Gibt die transponierte Matrix einer Matrix zurück
+VLOOKUP			= SVERWEIS			##	Sucht in der ersten Spalte einer Matrix und arbeitet sich durch die Zeile, um den Wert einer Zelle zurückzugeben
+
+
+##
+##	Math and trigonometry functions			Mathematische und trigonometrische Funktionen
+##
+ABS			= ABS				##	Gibt den Absolutwert einer Zahl zurück
+ACOS			= ARCCOS			##	Gibt den Arkuskosinus einer Zahl zurück
+ACOSH			= ARCCOSHYP			##	Gibt den umgekehrten hyperbolischen Kosinus einer Zahl zurück
+ASIN			= ARCSIN			##	Gibt den Arkussinus einer Zahl zurück
+ASINH			= ARCSINHYP			##	Gibt den umgekehrten hyperbolischen Sinus einer Zahl zurück
+ATAN			= ARCTAN			##	Gibt den Arkustangens einer Zahl zurück
+ATAN2			= ARCTAN2			##	Gibt den Arkustangens einer x- und einer y-Koordinate zurück
+ATANH			= ARCTANHYP			##	Gibt den umgekehrten hyperbolischen Tangens einer Zahl zurück
+CEILING			= OBERGRENZE			##	Rundet eine Zahl auf die nächste ganze Zahl oder das nächste Vielfache von Schritt
+COMBIN			= KOMBINATIONEN			##	Gibt die Anzahl der Kombinationen für eine bestimmte Anzahl von Objekten zurück
+COS			= COS				##	Gibt den Kosinus einer Zahl zurück
+COSH			= COSHYP			##	Gibt den hyperbolischen Kosinus einer Zahl zurück
+DEGREES			= GRAD				##	Wandelt Bogenmaß (Radiant) in Grad um
+EVEN			= GERADE			##	Rundet eine Zahl auf die nächste gerade ganze Zahl auf
+EXP			= EXP				##	Potenziert die Basis e mit der als Argument angegebenen Zahl
+FACT			= FAKULTÄT			##	Gibt die Fakultät einer Zahl zurück
+FACTDOUBLE		= ZWEIFAKULTÄT			##	Gibt die Fakultät zu Zahl mit Schrittlänge 2 zurück
+FLOOR			= UNTERGRENZE			##	Rundet die Zahl auf Anzahl_Stellen ab
+GCD			= GGT				##	Gibt den größten gemeinsamen Teiler zurück
+INT			= GANZZAHL			##	Rundet eine Zahl auf die nächstkleinere ganze Zahl ab
+LCM			= KGV				##	Gibt das kleinste gemeinsame Vielfache zurück
+LN			= LN				##	Gibt den natürlichen Logarithmus einer Zahl zurück
+LOG			= LOG				##	Gibt den Logarithmus einer Zahl zu der angegebenen Basis zurück
+LOG10			= LOG10				##	Gibt den Logarithmus einer Zahl zur Basis 10 zurück
+MDETERM			= MDET				##	Gibt die Determinante einer Matrix zurück
+MINVERSE		= MINV				##	Gibt die inverse Matrix einer Matrix zurück
+MMULT			= MMULT				##	Gibt das Produkt zweier Matrizen zurück
+MOD			= REST				##	Gibt den Rest einer Division zurück
+MROUND			= VRUNDEN			##	Gibt eine auf das gewünschte Vielfache gerundete Zahl zurück
+MULTINOMIAL		= POLYNOMIAL			##	Gibt den Polynomialkoeffizienten einer Gruppe von Zahlen zurück
+ODD			= UNGERADE			##	Rundet eine Zahl auf die nächste ungerade ganze Zahl auf
+PI			= PI				##	Gibt den Wert Pi zurück
+POWER			= POTENZ			##	Gibt als Ergebnis eine potenzierte Zahl zurück
+PRODUCT			= PRODUKT			##	Multipliziert die zugehörigen Argumente
+QUOTIENT		= QUOTIENT			##	Gibt den ganzzahligen Anteil einer Division zurück
+RADIANS			= BOGENMASS			##	Wandelt Grad in Bogenmaß (Radiant) um
+RAND			= ZUFALLSZAHL			##	Gibt eine Zufallszahl zwischen 0 und 1 zurück
+RANDBETWEEN		= ZUFALLSBEREICH		##	Gibt eine Zufallszahl aus dem festgelegten Bereich zurück
+ROMAN			= RÖMISCH			##	Wandelt eine arabische Zahl in eine römische Zahl als Text um
+ROUND			= RUNDEN			##	Rundet eine Zahl auf eine bestimmte Anzahl von Dezimalstellen
+ROUNDDOWN		= ABRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen ab
+ROUNDUP			= AUFRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen auf
+SERIESSUM		= POTENZREIHE			##	Gibt die Summe von Potenzen (zur Berechnung von Potenzreihen und dichotomen Wahrscheinlichkeiten) zurück
+SIGN			= VORZEICHEN			##	Gibt das Vorzeichen einer Zahl zurück
+SIN			= SIN				##	Gibt den Sinus einer Zahl zurück
+SINH			= SINHYP			##	Gibt den hyperbolischen Sinus einer Zahl zurück
+SQRT			= WURZEL			##	Gibt die Quadratwurzel einer Zahl zurück
+SQRTPI			= WURZELPI			##	Gibt die Wurzel aus der mit Pi (pi) multiplizierten Zahl zurück
+SUBTOTAL		= TEILERGEBNIS			##	Gibt ein Teilergebnis in einer Liste oder Datenbank zurück
+SUM			= SUMME				##	Addiert die zugehörigen Argumente
+SUMIF			= SUMMEWENN			##	Addiert Zahlen, die mit den Suchkriterien übereinstimmen
+SUMIFS			= SUMMEWENNS			##	Die Zellen, die mehrere Kriterien erfüllen, werden in einem Bereich hinzugefügt
+SUMPRODUCT		= SUMMENPRODUKT			##	Gibt die Summe der Produkte zusammengehöriger Matrixkomponenten zurück
+SUMSQ			= QUADRATESUMME			##	Gibt die Summe der quadrierten Argumente zurück
+SUMX2MY2		= SUMMEX2MY2			##	Gibt die Summe der Differenzen der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
+SUMX2PY2		= SUMMEX2PY2			##	Gibt die Summe der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
+SUMXMY2			= SUMMEXMY2			##	Gibt die Summe der quadrierten Differenzen für zusammengehörige Komponenten zweier Matrizen zurück
+TAN			= TAN				##	Gibt den Tangens einer Zahl zurück
+TANH			= TANHYP			##	Gibt den hyperbolischen Tangens einer Zahl zurück
+TRUNC			= KÜRZEN			##	Schneidet die Kommastellen einer Zahl ab und gibt als Ergebnis eine ganze Zahl zurück
+
+
+##
+##	Statistical functions				Statistische Funktionen
+##
+AVEDEV			= MITTELABW			##	Gibt die durchschnittliche absolute Abweichung einer Reihe von Merkmalsausprägungen und ihrem Mittelwert zurück
+AVERAGE			= MITTELWERT			##	Gibt den Mittelwert der zugehörigen Argumente zurück
+AVERAGEA		= MITTELWERTA			##	Gibt den Mittelwert der zugehörigen Argumente, die Zahlen, Text und Wahrheitswerte enthalten, zurück
+AVERAGEIF		= MITTELWERTWENN		##	Der Durchschnittswert (arithmetisches Mittel) für alle Zellen in einem Bereich, die einem angegebenen Kriterium entsprechen, wird zurückgegeben
+AVERAGEIFS		= MITTELWERTWENNS		##	Gibt den Durchschnittswert (arithmetisches Mittel) aller Zellen zurück, die mehreren Kriterien entsprechen
+BETADIST		= BETAVERT			##	Gibt die Werte der kumulierten Betaverteilungsfunktion zurück
+BETAINV			= BETAINV			##	Gibt das Quantil der angegebenen Betaverteilung zurück
+BINOMDIST		= BINOMVERT			##	Gibt Wahrscheinlichkeiten einer binomialverteilten Zufallsvariablen zurück
+CHIDIST			= CHIVERT			##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer Chi-Quadrat-verteilten Zufallsgröße zurück
+CHIINV			= CHIINV			##	Gibt Quantile der Verteilungsfunktion (1-Alpha) der Chi-Quadrat-Verteilung zurück
+CHITEST			= CHITEST			##	Gibt die Teststatistik eines Unabhängigkeitstests zurück
+CONFIDENCE		= KONFIDENZ			##	Ermöglicht die Berechnung des 1-Alpha Konfidenzintervalls für den Erwartungswert einer Zufallsvariablen
+CORREL			= KORREL			##	Gibt den Korrelationskoeffizienten zweier Reihen von Merkmalsausprägungen zurück
+COUNT			= ANZAHL			##	Gibt die Anzahl der Zahlen in der Liste mit Argumenten an
+COUNTA			= ANZAHL2			##	Gibt die Anzahl der Werte in der Liste mit Argumenten an
+COUNTBLANK		= ANZAHLLEEREZELLEN		##	Gibt die Anzahl der leeren Zellen in einem Bereich an
+COUNTIF			= ZÄHLENWENN			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit den Suchkriterien übereinstimmen
+COUNTIFS		= ZÄHLENWENNS			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit mehreren Suchkriterien übereinstimmen
+COVAR			= KOVAR				##	Gibt die Kovarianz zurück, den Mittelwert der für alle Datenpunktpaare gebildeten Produkte der Abweichungen
+CRITBINOM		= KRITBINOM			##	Gibt den kleinsten Wert zurück, für den die kumulierten Wahrscheinlichkeiten der Binomialverteilung kleiner oder gleich einer Grenzwahrscheinlichkeit sind
+DEVSQ			= SUMQUADABW			##	Gibt die Summe der quadrierten Abweichungen der Datenpunkte von ihrem Stichprobenmittelwert zurück
+EXPONDIST		= EXPONVERT			##	Gibt Wahrscheinlichkeiten einer exponential verteilten Zufallsvariablen zurück
+FDIST			= FVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer F-verteilten Zufallsvariablen zurück
+FINV			= FINV				##	Gibt Quantile der F-Verteilung zurück
+FISHER			= FISHER			##	Gibt die Fisher-Transformation zurück
+FISHERINV		= FISHERINV			##	Gibt die Umkehrung der Fisher-Transformation zurück
+FORECAST		= PROGNOSE			##	Gibt einen Wert zurück, der sich aus einem linearen Trend ergibt
+FREQUENCY		= HÄUFIGKEIT			##	Gibt eine Häufigkeitsverteilung als vertikale Matrix zurück
+FTEST			= FTEST				##	Gibt die Teststatistik eines F-Tests zurück
+GAMMADIST		= GAMMAVERT			##	Gibt Wahrscheinlichkeiten einer gammaverteilten Zufallsvariablen zurück
+GAMMAINV		= GAMMAINV			##	Gibt Quantile der Gammaverteilung zurück
+GAMMALN			= GAMMALN			##	Gibt den natürlichen Logarithmus der Gammafunktion zurück, Γ(x)
+GEOMEAN			= GEOMITTEL			##	Gibt das geometrische Mittel zurück
+GROWTH			= VARIATION			##	Gibt Werte zurück, die sich aus einem exponentiellen Trend ergeben
+HARMEAN			= HARMITTEL			##	Gibt das harmonische Mittel zurück
+HYPGEOMDIST		= HYPGEOMVERT			##	Gibt Wahrscheinlichkeiten einer hypergeometrisch-verteilten Zufallsvariablen zurück
+INTERCEPT		= ACHSENABSCHNITT		##	Gibt den Schnittpunkt der Regressionsgeraden zurück
+KURT			= KURT				##	Gibt die Kurtosis (Exzess) einer Datengruppe zurück
+LARGE			= KGRÖSSTE			##	Gibt den k-größten Wert einer Datengruppe zurück
+LINEST			= RGP				##	Gibt die Parameter eines linearen Trends zurück
+LOGEST			= RKP				##	Gibt die Parameter eines exponentiellen Trends zurück
+LOGINV			= LOGINV			##	Gibt Quantile der Lognormalverteilung zurück
+LOGNORMDIST		= LOGNORMVERT			##	Gibt Werte der Verteilungsfunktion einer lognormalverteilten Zufallsvariablen zurück
+MAX			= MAX				##	Gibt den Maximalwert einer Liste mit Argumenten zurück
+MAXA			= MAXA				##	Gibt den Maximalwert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
+MEDIAN			= MEDIAN			##	Gibt den Median der angegebenen Zahlen zurück
+MIN			= MIN				##	Gibt den Minimalwert einer Liste mit Argumenten zurück
+MINA			= MINA				##	Gibt den kleinsten Wert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
+MODE			= MODALWERT			##	Gibt den am häufigsten vorkommenden Wert in einer Datengruppe zurück
+NEGBINOMDIST		= NEGBINOMVERT			##	Gibt Wahrscheinlichkeiten einer negativen, binominal verteilten Zufallsvariablen zurück
+NORMDIST		= NORMVERT			##	Gibt Wahrscheinlichkeiten einer normal verteilten Zufallsvariablen zurück
+NORMINV			= NORMINV			##	Gibt Quantile der Normalverteilung zurück
+NORMSDIST		= STANDNORMVERT			##	Gibt Werte der Verteilungsfunktion einer standardnormalverteilten Zufallsvariablen zurück
+NORMSINV		= STANDNORMINV			##	Gibt Quantile der Standardnormalverteilung zurück
+PEARSON			= PEARSON			##	Gibt den Pearsonschen Korrelationskoeffizienten zurück
+PERCENTILE		= QUANTIL			##	Gibt das Alpha-Quantil einer Gruppe von Daten zurück
+PERCENTRANK		= QUANTILSRANG			##	Gibt den prozentualen Rang (Alpha) eines Werts in einer Datengruppe zurück
+PERMUT			= VARIATIONEN			##	Gibt die Anzahl der Möglichkeiten zurück, um k Elemente aus einer Menge von n Elementen ohne Zurücklegen zu ziehen
+POISSON			= POISSON			##	Gibt Wahrscheinlichkeiten einer poissonverteilten Zufallsvariablen zurück
+PROB			= WAHRSCHBEREICH		##	Gibt die Wahrscheinlichkeit für ein von zwei Werten eingeschlossenes Intervall zurück
+QUARTILE		= QUARTILE			##	Gibt die Quartile der Datengruppe zurück
+RANK			= RANG				##	Gibt den Rang zurück, den eine Zahl innerhalb einer Liste von Zahlen einnimmt
+RSQ			= BESTIMMTHEITSMASS		##	Gibt das Quadrat des Pearsonschen Korrelationskoeffizienten zurück
+SKEW			= SCHIEFE			##	Gibt die Schiefe einer Verteilung zurück
+SLOPE			= STEIGUNG			##	Gibt die Steigung der Regressionsgeraden zurück
+SMALL			= KKLEINSTE			##	Gibt den k-kleinsten Wert einer Datengruppe zurück
+STANDARDIZE		= STANDARDISIERUNG		##	Gibt den standardisierten Wert zurück
+STDEV			= STABW				##	Schätzt die Standardabweichung ausgehend von einer Stichprobe
+STDEVA			= STABWA			##	Schätzt die Standardabweichung ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
+STDEVP			= STABWN			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit
+STDEVPA			= STABWNA			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
+STEYX			= STFEHLERYX			##	Gibt den Standardfehler der geschätzten y-Werte für alle x-Werte der Regression zurück
+TDIST			= TVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer (Student) t-verteilten Zufallsvariablen zurück
+TINV			= TINV				##	Gibt Quantile der t-Verteilung zurück
+TREND			= TREND				##	Gibt Werte zurück, die sich aus einem linearen Trend ergeben
+TRIMMEAN		= GESTUTZTMITTEL		##	Gibt den Mittelwert einer Datengruppe zurück, ohne die Randwerte zu berücksichtigen
+TTEST			= TTEST				##	Gibt die Teststatistik eines Student'schen t-Tests zurück
+VAR			= VARIANZ			##	Schätzt die Varianz ausgehend von einer Stichprobe
+VARA			= VARIANZA			##	Schätzt die Varianz ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
+VARP			= VARIANZEN			##	Berechnet die Varianz ausgehend von der Grundgesamtheit
+VARPA			= VARIANZENA			##	Berechnet die Varianz ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
+WEIBULL			= WEIBULL			##	Gibt Wahrscheinlichkeiten einer weibullverteilten Zufallsvariablen zurück
+ZTEST			= GTEST				##	Gibt den einseitigen Wahrscheinlichkeitswert für einen Gausstest (Normalverteilung) zurück
+
+
+##
+##	Text functions					Textfunktionen
+##
+ASC			= ASC				##	Konvertiert DB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in SB-Text
+BAHTTEXT		= BAHTTEXT			##	Wandelt eine Zahl in Text im Währungsformat ß (Baht) um
+CHAR			= ZEICHEN			##	Gibt das der Codezahl entsprechende Zeichen zurück
+CLEAN			= SÄUBERN			##	Löscht alle nicht druckbaren Zeichen aus einem Text
+CODE			= CODE				##	Gibt die Codezahl des ersten Zeichens in einem Text zurück
+CONCATENATE		= VERKETTEN			##	Verknüpft mehrere Textelemente zu einem Textelement
+DOLLAR			= DM				##	Wandelt eine Zahl in Text im Währungsformat € (Euro) um
+EXACT			= IDENTISCH			##	Prüft, ob zwei Textwerte identisch sind
+FIND			= FINDEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
+FINDB			= FINDENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
+FIXED			= FEST				##	Formatiert eine Zahl als Text mit einer festen Anzahl von Dezimalstellen
+JIS			= JIS				##	Konvertiert SB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in DB-Text
+LEFT			= LINKS				##	Gibt die Zeichen ganz links in einem Textwert zurück
+LEFTB			= LINKSB			##	Gibt die Zeichen ganz links in einem Textwert zurück
+LEN			= LÄNGE				##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
+LENB			= LÄNGEB			##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
+LOWER			= KLEIN				##	Wandelt Text in Kleinbuchstaben um
+MID			= TEIL				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
+MIDB			= TEILB				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
+PHONETIC		= PHONETIC			##	Extrahiert die phonetischen (Furigana-)Zeichen aus einer Textzeichenfolge
+PROPER			= GROSS2			##	Wandelt den ersten Buchstaben aller Wörter eines Textwerts in Großbuchstaben um
+REPLACE			= ERSETZEN			##	Ersetzt Zeichen in Text
+REPLACEB		= ERSETZENB			##	Ersetzt Zeichen in Text
+REPT			= WIEDERHOLEN			##	Wiederholt einen Text so oft wie angegeben
+RIGHT			= RECHTS			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
+RIGHTB			= RECHTSB			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
+SEARCH			= SUCHEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
+SEARCHB			= SUCHENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
+SUBSTITUTE		= WECHSELN			##	Ersetzt in einer Zeichenfolge neuen Text gegen alten
+T			= T				##	Wandelt die zugehörigen Argumente in Text um
+TEXT			= TEXT				##	Formatiert eine Zahl und wandelt sie in Text um
+TRIM			= GLÄTTEN			##	Entfernt Leerzeichen aus Text
+UPPER			= GROSS				##	Wandelt Text in Großbuchstaben um
+VALUE			= WERT				##	Wandelt ein Textargument in eine Zahl um
diff --git a/lib/PHPExcel/locale/en/uk/config b/lib/PHPExcel/locale/en/uk/config
new file mode 100644
index 000000000..532080b57
--- /dev/null
+++ b/lib/PHPExcel/locale/en/uk/config
@@ -0,0 +1,32 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+##
+##	(For future use)
+##
+currencySymbol	= £
diff --git a/lib/PHPExcel/locale/es/config b/lib/PHPExcel/locale/es/config
new file mode 100644
index 000000000..96cfa69db
--- /dev/null
+++ b/lib/PHPExcel/locale/es/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= $	##	I'm surprised that the Excel Documentation suggests $ rather than €
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #¡NULO!
+DIV0	= #¡DIV/0!
+VALUE	= #¡VALOR!
+REF	= #¡REF!
+NAME	= #¿NOMBRE?
+NUM	= #¡NÚM!
+NA	= #N/A
diff --git a/lib/PHPExcel/locale/es/functions b/lib/PHPExcel/locale/es/functions
new file mode 100644
index 000000000..48762695b
--- /dev/null
+++ b/lib/PHPExcel/locale/es/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions				Funciones de complementos y automatización
+##
+GETPIVOTDATA		= IMPORTARDATOSDINAMICOS		##	Devuelve los datos almacenados en un informe de tabla dinámica.
+
+
+##
+##	Cube functions						Funciones de cubo
+##
+CUBEKPIMEMBER		= MIEMBROKPICUBO			##	Devuelve un nombre, propiedad y medida de indicador de rendimiento clave (KPI) y muestra el nombre y la propiedad en la celda. Un KPI es una medida cuantificable, como los beneficios brutos mensuales o la facturación trimestral por empleado, que se usa para supervisar el rendimiento de una organización.
+CUBEMEMBER		= MIEMBROCUBO				##	Devuelve un miembro o tupla en una jerarquía de cubo. Se usa para validar la existencia del miembro o la tupla en el cubo.
+CUBEMEMBERPROPERTY	= PROPIEDADMIEMBROCUBO			##	Devuelve el valor de una propiedad de miembro del cubo Se usa para validar la existencia de un nombre de miembro en el cubo y para devolver la propiedad especificada para este miembro.
+CUBERANKEDMEMBER	= MIEMBRORANGOCUBO			##	Devuelve el miembro n, o clasificado, de un conjunto. Se usa para devolver uno o más elementos de un conjunto, por ejemplo, el representante con mejores ventas o los diez mejores alumnos.
+CUBESET			= CONJUNTOCUBO				##	Define un conjunto calculado de miembros o tuplas mediante el envío de una expresión de conjunto al cubo en el servidor, lo que crea el conjunto y, después, devuelve dicho conjunto a Microsoft Office Excel.
+CUBESETCOUNT		= RECUENTOCONJUNTOCUBO			##	Devuelve el número de elementos de un conjunto.
+CUBEVALUE		= VALORCUBO				##	Devuelve un valor agregado de un cubo.
+
+
+##
+##	Database functions					Funciones de base de datos
+##
+DAVERAGE		= BDPROMEDIO				##	Devuelve el promedio de las entradas seleccionadas en la base de datos.
+DCOUNT			= BDCONTAR				##	Cuenta el número de celdas que contienen números en una base de datos.
+DCOUNTA			= BDCONTARA				##	Cuenta el número de celdas no vacías en una base de datos.
+DGET			= BDEXTRAER				##	Extrae de una base de datos un único registro que cumple los criterios especificados.
+DMAX			= BDMAX					##	Devuelve el valor máximo de las entradas seleccionadas de la base de datos.
+DMIN			= BDMIN					##	Devuelve el valor mínimo de las entradas seleccionadas de la base de datos.
+DPRODUCT		= BDPRODUCTO				##	Multiplica los valores de un campo concreto de registros de una base de datos que cumplen los criterios especificados.
+DSTDEV			= BDDESVEST				##	Calcula la desviación estándar a partir de una muestra de entradas seleccionadas en la base de datos.
+DSTDEVP			= BDDESVESTP				##	Calcula la desviación estándar en función de la población total de las entradas seleccionadas de la base de datos.
+DSUM			= BDSUMA				##	Suma los números de la columna de campo de los registros de la base de datos que cumplen los criterios.
+DVAR			= BDVAR					##	Calcula la varianza a partir de una muestra de entradas seleccionadas de la base de datos.
+DVARP			= BDVARP				##	Calcula la varianza a partir de la población total de entradas seleccionadas de la base de datos.
+
+
+##
+##	Date and time functions					Funciones de fecha y hora
+##
+DATE			= FECHA					##	Devuelve el número de serie correspondiente a una fecha determinada.
+DATEVALUE		= FECHANUMERO				##	Convierte una fecha con formato de texto en un valor de número de serie.
+DAY			= DIA					##	Convierte un número de serie en un valor de día del mes.
+DAYS360			= DIAS360				##	Calcula el número de días entre dos fechas a partir de un año de 360 días.
+EDATE			= FECHA.MES				##	Devuelve el número de serie de la fecha equivalente al número indicado de meses anteriores o posteriores a la fecha inicial.
+EOMONTH			= FIN.MES				##	Devuelve el número de serie correspondiente al último día del mes anterior o posterior a un número de meses especificado.
+HOUR			= HORA					##	Convierte un número de serie en un valor de hora.
+MINUTE			= MINUTO				##	Convierte un número de serie en un valor de minuto.
+MONTH			= MES					##	Convierte un número de serie en un valor de mes.
+NETWORKDAYS		= DIAS.LAB				##	Devuelve el número de todos los días laborables existentes entre dos fechas.
+NOW			= AHORA					##	Devuelve el número de serie correspondiente a la fecha y hora actuales.
+SECOND			= SEGUNDO				##	Convierte un número de serie en un valor de segundo.
+TIME			= HORA					##	Devuelve el número de serie correspondiente a una hora determinada.
+TIMEVALUE		= HORANUMERO				##	Convierte una hora con formato de texto en un valor de número de serie.
+TODAY			= HOY					##	Devuelve el número de serie correspondiente al día actual.
+WEEKDAY			= DIASEM				##	Convierte un número de serie en un valor de día de la semana.
+WEEKNUM			= NUM.DE.SEMANA				##	Convierte un número de serie en un número que representa el lugar numérico correspondiente a una semana de un año.
+WORKDAY			= DIA.LAB				##	Devuelve el número de serie de la fecha que tiene lugar antes o después de un número determinado de días laborables.
+YEAR			= AÑO					##	Convierte un número de serie en un valor de año.
+YEARFRAC		= FRAC.AÑO				##	Devuelve la fracción de año que representa el número total de días existentes entre el valor de fecha_inicial y el de fecha_final.
+
+
+##
+##	Engineering functions					Funciones de ingeniería
+##
+BESSELI			= BESSELI				##	Devuelve la función Bessel In(x) modificada.
+BESSELJ			= BESSELJ				##	Devuelve la función Bessel Jn(x).
+BESSELK			= BESSELK				##	Devuelve la función Bessel Kn(x) modificada.
+BESSELY			= BESSELY				##	Devuelve la función Bessel Yn(x).
+BIN2DEC			= BIN.A.DEC				##	Convierte un número binario en decimal.
+BIN2HEX			= BIN.A.HEX				##	Convierte un número binario en hexadecimal.
+BIN2OCT			= BIN.A.OCT				##	Convierte un número binario en octal.
+COMPLEX			= COMPLEJO				##	Convierte coeficientes reales e imaginarios en un número complejo.
+CONVERT			= CONVERTIR				##	Convierte un número de un sistema de medida a otro.
+DEC2BIN			= DEC.A.BIN				##	Convierte un número decimal en binario.
+DEC2HEX			= DEC.A.HEX				##	Convierte un número decimal en hexadecimal.
+DEC2OCT			= DEC.A.OCT				##	Convierte un número decimal en octal.
+DELTA			= DELTA					##	Comprueba si dos valores son iguales.
+ERF			= FUN.ERROR				##	Devuelve la función de error.
+ERFC			= FUN.ERROR.COMPL			##	Devuelve la función de error complementario.
+GESTEP			= MAYOR.O.IGUAL				##	Comprueba si un número es mayor que un valor de umbral.
+HEX2BIN			= HEX.A.BIN				##	Convierte un número hexadecimal en binario.
+HEX2DEC			= HEX.A.DEC				##	Convierte un número hexadecimal en decimal.
+HEX2OCT			= HEX.A.OCT				##	Convierte un número hexadecimal en octal.
+IMABS			= IM.ABS				##	Devuelve el valor absoluto (módulo) de un número complejo.
+IMAGINARY		= IMAGINARIO				##	Devuelve el coeficiente imaginario de un número complejo.
+IMARGUMENT		= IM.ANGULO				##	Devuelve el argumento theta, un ángulo expresado en radianes.
+IMCONJUGATE		= IM.CONJUGADA				##	Devuelve la conjugada compleja de un número complejo.
+IMCOS			= IM.COS				##	Devuelve el coseno de un número complejo.
+IMDIV			= IM.DIV				##	Devuelve el cociente de dos números complejos.
+IMEXP			= IM.EXP				##	Devuelve el valor exponencial de un número complejo.
+IMLN			= IM.LN					##	Devuelve el logaritmo natural (neperiano) de un número complejo.
+IMLOG10			= IM.LOG10				##	Devuelve el logaritmo en base 10 de un número complejo.
+IMLOG2			= IM.LOG2				##	Devuelve el logaritmo en base 2 de un número complejo.
+IMPOWER			= IM.POT				##	Devuelve un número complejo elevado a una potencia entera.
+IMPRODUCT		= IM.PRODUCT				##	Devuelve el producto de números complejos.
+IMREAL			= IM.REAL				##	Devuelve el coeficiente real de un número complejo.
+IMSIN			= IM.SENO				##	Devuelve el seno de un número complejo.
+IMSQRT			= IM.RAIZ2				##	Devuelve la raíz cuadrada de un número complejo.
+IMSUB			= IM.SUSTR				##	Devuelve la diferencia entre dos números complejos.
+IMSUM			= IM.SUM				##	Devuelve la suma de números complejos.
+OCT2BIN			= OCT.A.BIN				##	Convierte un número octal en binario.
+OCT2DEC			= OCT.A.DEC				##	Convierte un número octal en decimal.
+OCT2HEX			= OCT.A.HEX				##	Convierte un número octal en hexadecimal.
+
+
+##
+##	Financial functions					Funciones financieras
+##
+ACCRINT			= INT.ACUM				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés periódicos.
+ACCRINTM		= INT.ACUM.V				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés al vencimiento.
+AMORDEGRC		= AMORTIZ.PROGRE			##	Devuelve la amortización de cada período contable mediante el uso de un coeficiente de amortización.
+AMORLINC		= AMORTIZ.LIN				##	Devuelve la amortización de cada uno de los períodos contables.
+COUPDAYBS		= CUPON.DIAS.L1				##	Devuelve el número de días desde el principio del período de un cupón hasta la fecha de liquidación.
+COUPDAYS		= CUPON.DIAS				##	Devuelve el número de días del período (entre dos cupones) donde se encuentra la fecha de liquidación.
+COUPDAYSNC		= CUPON.DIAS.L2				##	Devuelve el número de días desde la fecha de liquidación hasta la fecha del próximo cupón.
+COUPNCD			= CUPON.FECHA.L2			##	Devuelve la fecha del próximo cupón después de la fecha de liquidación.
+COUPNUM			= CUPON.NUM				##	Devuelve el número de pagos de cupón entre la fecha de liquidación y la fecha de vencimiento.
+COUPPCD			= CUPON.FECHA.L1			##	Devuelve la fecha de cupón anterior a la fecha de liquidación.
+CUMIPMT			= PAGO.INT.ENTRE			##	Devuelve el interés acumulado pagado entre dos períodos.
+CUMPRINC		= PAGO.PRINC.ENTRE			##	Devuelve el capital acumulado pagado de un préstamo entre dos períodos.
+DB			= DB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización de saldo fijo.
+DDB			= DDB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización por doble disminución de saldo u otro método que se especifique.
+DISC			= TASA.DESC				##	Devuelve la tasa de descuento de un valor bursátil.
+DOLLARDE		= MONEDA.DEC				##	Convierte una cotización de un valor bursátil expresada en forma fraccionaria en una cotización de un valor bursátil expresada en forma decimal.
+DOLLARFR		= MONEDA.FRAC				##	Convierte una cotización de un valor bursátil expresada en forma decimal en una cotización de un valor bursátil expresada en forma fraccionaria.
+DURATION		= DURACION				##	Devuelve la duración anual de un valor bursátil con pagos de interés periódico.
+EFFECT			= INT.EFECTIVO				##	Devuelve la tasa de interés anual efectiva.
+FV			= VF					##	Devuelve el valor futuro de una inversión.
+FVSCHEDULE		= VF.PLAN				##	Devuelve el valor futuro de un capital inicial después de aplicar una serie de tasas de interés compuesto.
+INTRATE			= TASA.INT				##	Devuelve la tasa de interés para la inversión total de un valor bursátil.
+IPMT			= PAGOINT				##	Devuelve el pago de intereses de una inversión durante un período determinado.
+IRR			= TIR					##	Devuelve la tasa interna de retorno para una serie de flujos de efectivo periódicos.
+ISPMT			= INT.PAGO.DIR				##	Calcula el interés pagado durante un período específico de una inversión.
+MDURATION		= DURACION.MODIF			##	Devuelve la duración de Macauley modificada de un valor bursátil con un valor nominal supuesto de 100 $.
+MIRR			= TIRM					##	Devuelve la tasa interna de retorno donde se financian flujos de efectivo positivos y negativos a tasas diferentes.
+NOMINAL			= TASA.NOMINAL				##	Devuelve la tasa nominal de interés anual.
+NPER			= NPER					##	Devuelve el número de períodos de una inversión.
+NPV			= VNA					##	Devuelve el valor neto actual de una inversión en función de una serie de flujos periódicos de efectivo y una tasa de descuento.
+ODDFPRICE		= PRECIO.PER.IRREGULAR.1		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un primer período impar.
+ODDFYIELD		= RENDTO.PER.IRREGULAR.1		##	Devuelve el rendimiento de un valor bursátil con un primer período impar.
+ODDLPRICE		= PRECIO.PER.IRREGULAR.2		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un último período impar.
+ODDLYIELD		= RENDTO.PER.IRREGULAR.2		##	Devuelve el rendimiento de un valor bursátil con un último período impar.
+PMT			= PAGO					##	Devuelve el pago periódico de una anualidad.
+PPMT			= PAGOPRIN				##	Devuelve el pago de capital de una inversión durante un período determinado.
+PRICE			= PRECIO				##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga una tasa de interés periódico.
+PRICEDISC		= PRECIO.DESCUENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con descuento.
+PRICEMAT		= PRECIO.VENCIMIENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga interés a su vencimiento.
+PV			= VALACT				##	Devuelve el valor actual de una inversión.
+RATE			= TASA					##	Devuelve la tasa de interés por período de una anualidad.
+RECEIVED		= CANTIDAD.RECIBIDA			##	Devuelve la cantidad recibida al vencimiento de un valor bursátil completamente invertido.
+SLN			= SLN					##	Devuelve la amortización por método directo de un bien en un período dado.
+SYD			= SYD					##	Devuelve la amortización por suma de dígitos de los años de un bien durante un período especificado.
+TBILLEQ			= LETRA.DE.TES.EQV.A.BONO		##	Devuelve el rendimiento de un bono equivalente a una letra del Tesoro (de EE.UU.)
+TBILLPRICE		= LETRA.DE.TES.PRECIO			##	Devuelve el precio por un valor nominal de 100 $ de una letra del Tesoro (de EE.UU.)
+TBILLYIELD		= LETRA.DE.TES.RENDTO			##	Devuelve el rendimiento de una letra del Tesoro (de EE.UU.)
+VDB			= DVS					##	Devuelve la amortización de un bien durante un período específico o parcial a través del método de cálculo del saldo en disminución.
+XIRR			= TIR.NO.PER				##	Devuelve la tasa interna de retorno para un flujo de efectivo que no es necesariamente periódico.
+XNPV			= VNA.NO.PER				##	Devuelve el valor neto actual para un flujo de efectivo que no es necesariamente periódico.
+YIELD			= RENDTO				##	Devuelve el rendimiento de un valor bursátil que paga intereses periódicos.
+YIELDDISC		= RENDTO.DESC				##	Devuelve el rendimiento anual de un valor bursátil con descuento; por ejemplo, una letra del Tesoro (de EE.UU.)
+YIELDMAT		= RENDTO.VENCTO				##	Devuelve el rendimiento anual de un valor bursátil que paga intereses al vencimiento.
+
+
+##
+##	Information functions					Funciones de información
+##
+CELL			= CELDA					##	Devuelve información acerca del formato, la ubicación o el contenido de una celda.
+ERROR.TYPE		= TIPO.DE.ERROR				##	Devuelve un número que corresponde a un tipo de error.
+INFO			= INFO					##	Devuelve información acerca del entorno operativo en uso.
+ISBLANK			= ESBLANCO				##	Devuelve VERDADERO si el valor está en blanco.
+ISERR			= ESERR					##	Devuelve VERDADERO si el valor es cualquier valor de error excepto #N/A.
+ISERROR			= ESERROR				##	Devuelve VERDADERO si el valor es cualquier valor de error.
+ISEVEN			= ES.PAR				##	Devuelve VERDADERO si el número es par.
+ISLOGICAL		= ESLOGICO				##	Devuelve VERDADERO si el valor es un valor lógico.
+ISNA			= ESNOD					##	Devuelve VERDADERO si el valor es el valor de error #N/A.
+ISNONTEXT		= ESNOTEXTO				##	Devuelve VERDADERO si el valor no es texto.
+ISNUMBER		= ESNUMERO				##	Devuelve VERDADERO si el valor es un número.
+ISODD			= ES.IMPAR				##	Devuelve VERDADERO si el número es impar.
+ISREF			= ESREF					##	Devuelve VERDADERO si el valor es una referencia.
+ISTEXT			= ESTEXTO				##	Devuelve VERDADERO si el valor es texto.
+N			= N					##	Devuelve un valor convertido en un número.
+NA			= ND					##	Devuelve el valor de error #N/A.
+TYPE			= TIPO					##	Devuelve un número que indica el tipo de datos de un valor.
+
+
+##
+##	Logical functions					Funciones lógicas
+##
+AND			= Y					##	Devuelve VERDADERO si todos sus argumentos son VERDADERO.
+FALSE			= FALSO					##	Devuelve el valor lógico FALSO.
+IF			= SI					##	Especifica una prueba lógica que realizar.
+IFERROR			= SI.ERROR				##	Devuelve un valor que se especifica si una fórmula lo evalúa como un error; de lo contrario, devuelve el resultado de la fórmula.
+NOT			= NO					##	Invierte el valor lógico del argumento.
+OR			= O					##	Devuelve VERDADERO si cualquier argumento es VERDADERO.
+TRUE			= VERDADERO				##	Devuelve el valor lógico VERDADERO.
+
+
+##
+##	Lookup and reference functions				Funciones de búsqueda y referencia
+##
+ADDRESS			= DIRECCION				##	Devuelve una referencia como texto a una sola celda de una hoja de cálculo.
+AREAS			= AREAS					##	Devuelve el número de áreas de una referencia.
+CHOOSE			= ELEGIR				##	Elige un valor de una lista de valores.
+COLUMN			= COLUMNA				##	Devuelve el número de columna de una referencia.
+COLUMNS			= COLUMNAS				##	Devuelve el número de columnas de una referencia.
+HLOOKUP			= BUSCARH				##	Busca en la fila superior de una matriz y devuelve el valor de la celda indicada.
+HYPERLINK		= HIPERVINCULO				##	Crea un acceso directo o un salto que abre un documento almacenado en un servidor de red, en una intranet o en Internet.
+INDEX			= INDICE				##	Usa un índice para elegir un valor de una referencia o matriz.
+INDIRECT		= INDIRECTO				##	Devuelve una referencia indicada por un valor de texto.
+LOOKUP			= BUSCAR				##	Busca valores de un vector o una matriz.
+MATCH			= COINCIDIR				##	Busca valores de una referencia o matriz.
+OFFSET			= DESREF				##	Devuelve un desplazamiento de referencia respecto a una referencia dada.
+ROW			= FILA					##	Devuelve el número de fila de una referencia.
+ROWS			= FILAS					##	Devuelve el número de filas de una referencia.
+RTD			= RDTR					##	Recupera datos en tiempo real desde un programa compatible con la automatización COM (automatización: modo de trabajar con los objetos de una aplicación desde otra aplicación o herramienta de entorno. La automatización, antes denominada automatización OLE, es un estándar de la industria y una función del Modelo de objetos componentes (COM).).
+TRANSPOSE		= TRANSPONER				##	Devuelve la transposición de una matriz.
+VLOOKUP			= BUSCARV				##	Busca en la primera columna de una matriz y se mueve en horizontal por la fila para devolver el valor de una celda.
+
+
+##
+##	Math and trigonometry functions				Funciones matemáticas y trigonométricas
+##
+ABS			= ABS					##	Devuelve el valor absoluto de un número.
+ACOS			= ACOS					##	Devuelve el arcocoseno de un número.
+ACOSH			= ACOSH					##	Devuelve el coseno hiperbólico inverso de un número.
+ASIN			= ASENO					##	Devuelve el arcoseno de un número.
+ASINH			= ASENOH				##	Devuelve el seno hiperbólico inverso de un número.
+ATAN			= ATAN					##	Devuelve la arcotangente de un número.
+ATAN2			= ATAN2					##	Devuelve la arcotangente de las coordenadas "x" e "y".
+ATANH			= ATANH					##	Devuelve la tangente hiperbólica inversa de un número.
+CEILING			= MULTIPLO.SUPERIOR			##	Redondea un número al entero más próximo o al múltiplo significativo más cercano.
+COMBIN			= COMBINAT				##	Devuelve el número de combinaciones para un número determinado de objetos.
+COS			= COS					##	Devuelve el coseno de un número.
+COSH			= COSH					##	Devuelve el coseno hiperbólico de un número.
+DEGREES			= GRADOS				##	Convierte radianes en grados.
+EVEN			= REDONDEA.PAR				##	Redondea un número hasta el entero par más próximo.
+EXP			= EXP					##	Devuelve e elevado a la potencia de un número dado.
+FACT			= FACT					##	Devuelve el factorial de un número.
+FACTDOUBLE		= FACT.DOBLE				##	Devuelve el factorial doble de un número.
+FLOOR			= MULTIPLO.INFERIOR			##	Redondea un número hacia abajo, en dirección hacia cero.
+GCD			= M.C.D					##	Devuelve el máximo común divisor.
+INT			= ENTERO				##	Redondea un número hacia abajo hasta el entero más próximo.
+LCM			= M.C.M					##	Devuelve el mínimo común múltiplo.
+LN			= LN					##	Devuelve el logaritmo natural (neperiano) de un número.
+LOG			= LOG					##	Devuelve el logaritmo de un número en una base especificada.
+LOG10			= LOG10					##	Devuelve el logaritmo en base 10 de un número.
+MDETERM			= MDETERM				##	Devuelve la determinante matricial de una matriz.
+MINVERSE		= MINVERSA				##	Devuelve la matriz inversa de una matriz.
+MMULT			= MMULT					##	Devuelve el producto de matriz de dos matrices.
+MOD			= RESIDUO				##	Devuelve el resto de la división.
+MROUND			= REDOND.MULT				##	Devuelve un número redondeado al múltiplo deseado.
+MULTINOMIAL		= MULTINOMIAL				##	Devuelve el polinomio de un conjunto de números.
+ODD			= REDONDEA.IMPAR			##	Redondea un número hacia arriba hasta el entero impar más próximo.
+PI			= PI					##	Devuelve el valor de pi.
+POWER			= POTENCIA				##	Devuelve el resultado de elevar un número a una potencia.
+PRODUCT			= PRODUCTO				##	Multiplica sus argumentos.
+QUOTIENT		= COCIENTE				##	Devuelve la parte entera de una división.
+RADIANS			= RADIANES				##	Convierte grados en radianes.
+RAND			= ALEATORIO				##	Devuelve un número aleatorio entre 0 y 1.
+RANDBETWEEN		= ALEATORIO.ENTRE			##	Devuelve un número aleatorio entre los números que especifique.
+ROMAN			= NUMERO.ROMANO				##	Convierte un número arábigo en número romano, con formato de texto.
+ROUND			= REDONDEAR				##	Redondea un número al número de decimales especificado.
+ROUNDDOWN		= REDONDEAR.MENOS			##	Redondea un número hacia abajo, en dirección hacia cero.
+ROUNDUP			= REDONDEAR.MAS				##	Redondea un número hacia arriba, en dirección contraria a cero.
+SERIESSUM		= SUMA.SERIES				##	Devuelve la suma de una serie de potencias en función de la fórmula.
+SIGN			= SIGNO					##	Devuelve el signo de un número.
+SIN			= SENO					##	Devuelve el seno de un ángulo determinado.
+SINH			= SENOH					##	Devuelve el seno hiperbólico de un número.
+SQRT			= RAIZ					##	Devuelve la raíz cuadrada positiva de un número.
+SQRTPI			= RAIZ2PI				##	Devuelve la raíz cuadrada de un número multiplicado por PI (número * pi).
+SUBTOTAL		= SUBTOTALES				##	Devuelve un subtotal en una lista o base de datos.
+SUM			= SUMA					##	Suma sus argumentos.
+SUMIF			= SUMAR.SI				##	Suma las celdas especificadas que cumplen unos criterios determinados.
+SUMIFS			= SUMAR.SI.CONJUNTO			##	Suma las celdas de un rango que cumplen varios criterios.
+SUMPRODUCT		= SUMAPRODUCTO				##	Devuelve la suma de los productos de los correspondientes componentes de matriz.
+SUMSQ			= SUMA.CUADRADOS			##	Devuelve la suma de los cuadrados de los argumentos.
+SUMX2MY2		= SUMAX2MENOSY2				##	Devuelve la suma de la diferencia de los cuadrados de los valores correspondientes de dos matrices.
+SUMX2PY2		= SUMAX2MASY2				##	Devuelve la suma de la suma de los cuadrados de los valores correspondientes de dos matrices.
+SUMXMY2			= SUMAXMENOSY2				##	Devuelve la suma de los cuadrados de las diferencias de los valores correspondientes de dos matrices.
+TAN			= TAN					##	Devuelve la tangente de un número.
+TANH			= TANH					##	Devuelve la tangente hiperbólica de un número.
+TRUNC			= TRUNCAR				##	Trunca un número a un entero.
+
+
+##
+##	Statistical functions					Funciones estadísticas
+##
+AVEDEV			= DESVPROM				##	Devuelve el promedio de las desviaciones absolutas de la media de los puntos de datos.
+AVERAGE			= PROMEDIO				##	Devuelve el promedio de sus argumentos.
+AVERAGEA		= PROMEDIOA				##	Devuelve el promedio de sus argumentos, incluidos números, texto y valores lógicos.
+AVERAGEIF		= PROMEDIO.SI				##	Devuelve el promedio (media aritmética) de todas las celdas de un rango que cumplen unos criterios determinados.
+AVERAGEIFS		= PROMEDIO.SI.CONJUNTO			##	Devuelve el promedio (media aritmética) de todas las celdas que cumplen múltiples criterios.
+BETADIST		= DISTR.BETA				##	Devuelve la función de distribución beta acumulativa.
+BETAINV			= DISTR.BETA.INV			##	Devuelve la función inversa de la función de distribución acumulativa de una distribución beta especificada.
+BINOMDIST		= DISTR.BINOM				##	Devuelve la probabilidad de una variable aleatoria discreta siguiendo una distribución binomial.
+CHIDIST			= DISTR.CHI				##	Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
+CHIINV			= PRUEBA.CHI.INV			##	Devuelve la función inversa de la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
+CHITEST			= PRUEBA.CHI				##	Devuelve la prueba de independencia.
+CONFIDENCE		= INTERVALO.CONFIANZA			##	Devuelve el intervalo de confianza de la media de una población.
+CORREL			= COEF.DE.CORREL			##	Devuelve el coeficiente de correlación entre dos conjuntos de datos.
+COUNT			= CONTAR				##	Cuenta cuántos números hay en la lista de argumentos.
+COUNTA			= CONTARA				##	Cuenta cuántos valores hay en la lista de argumentos.
+COUNTBLANK		= CONTAR.BLANCO				##	Cuenta el número de celdas en blanco de un rango.
+COUNTIF			= CONTAR.SI				##	Cuenta el número de celdas, dentro del rango, que cumplen el criterio especificado.
+COUNTIFS		= CONTAR.SI.CONJUNTO			##	Cuenta el número de celdas, dentro del rango, que cumplen varios criterios.
+COVAR			= COVAR					##	Devuelve la covarianza, que es el promedio de los productos de las desviaciones para cada pareja de puntos de datos.
+CRITBINOM		= BINOM.CRIT				##	Devuelve el menor valor cuya distribución binomial acumulativa es menor o igual a un valor de criterio.
+DEVSQ			= DESVIA2				##	Devuelve la suma de los cuadrados de las desviaciones.
+EXPONDIST		= DISTR.EXP				##	Devuelve la distribución exponencial.
+FDIST			= DISTR.F				##	Devuelve la distribución de probabilidad F.
+FINV			= DISTR.F.INV				##	Devuelve la función inversa de la distribución de probabilidad F.
+FISHER			= FISHER				##	Devuelve la transformación Fisher.
+FISHERINV		= PRUEBA.FISHER.INV			##	Devuelve la función inversa de la transformación Fisher.
+FORECAST		= PRONOSTICO				##	Devuelve un valor en una tendencia lineal.
+FREQUENCY		= FRECUENCIA				##	Devuelve una distribución de frecuencia como una matriz vertical.
+FTEST			= PRUEBA.F				##	Devuelve el resultado de una prueba F.
+GAMMADIST		= DISTR.GAMMA				##	Devuelve la distribución gamma.
+GAMMAINV		= DISTR.GAMMA.INV			##	Devuelve la función inversa de la distribución gamma acumulativa.
+GAMMALN			= GAMMA.LN				##	Devuelve el logaritmo natural de la función gamma, G(x).
+GEOMEAN			= MEDIA.GEOM				##	Devuelve la media geométrica.
+GROWTH			= CRECIMIENTO				##	Devuelve valores en una tendencia exponencial.
+HARMEAN			= MEDIA.ARMO				##	Devuelve la media armónica.
+HYPGEOMDIST		= DISTR.HIPERGEOM			##	Devuelve la distribución hipergeométrica.
+INTERCEPT		= INTERSECCION.EJE			##	Devuelve la intersección de la línea de regresión lineal.
+KURT			= CURTOSIS				##	Devuelve la curtosis de un conjunto de datos.
+LARGE			= K.ESIMO.MAYOR				##	Devuelve el k-ésimo mayor valor de un conjunto de datos.
+LINEST			= ESTIMACION.LINEAL			##	Devuelve los parámetros de una tendencia lineal.
+LOGEST			= ESTIMACION.LOGARITMICA		##	Devuelve los parámetros de una tendencia exponencial.
+LOGINV			= DISTR.LOG.INV				##	Devuelve la función inversa de la distribución logarítmico-normal.
+LOGNORMDIST		= DISTR.LOG.NORM			##	Devuelve la distribución logarítmico-normal acumulativa.
+MAX			= MAX					##	Devuelve el valor máximo de una lista de argumentos.
+MAXA			= MAXA					##	Devuelve el valor máximo de una lista de argumentos, incluidos números, texto y valores lógicos.
+MEDIAN			= MEDIANA				##	Devuelve la mediana de los números dados.
+MIN			= MIN					##	Devuelve el valor mínimo de una lista de argumentos.
+MINA			= MINA					##	Devuelve el valor mínimo de una lista de argumentos, incluidos números, texto y valores lógicos.
+MODE			= MODA					##	Devuelve el valor más común de un conjunto de datos.
+NEGBINOMDIST		= NEGBINOMDIST				##	Devuelve la distribución binomial negativa.
+NORMDIST		= DISTR.NORM				##	Devuelve la distribución normal acumulativa.
+NORMINV			= DISTR.NORM.INV			##	Devuelve la función inversa de la distribución normal acumulativa.
+NORMSDIST		= DISTR.NORM.ESTAND			##	Devuelve la distribución normal estándar acumulativa.
+NORMSINV		= DISTR.NORM.ESTAND.INV			##	Devuelve la función inversa de la distribución normal estándar acumulativa.
+PEARSON			= PEARSON				##	Devuelve el coeficiente de momento de correlación de producto Pearson.
+PERCENTILE		= PERCENTIL				##	Devuelve el k-ésimo percentil de los valores de un rango.
+PERCENTRANK		= RANGO.PERCENTIL			##	Devuelve el rango porcentual de un valor de un conjunto de datos.
+PERMUT			= PERMUTACIONES				##	Devuelve el número de permutaciones de un número determinado de objetos.
+POISSON			= POISSON				##	Devuelve la distribución de Poisson.
+PROB			= PROBABILIDAD				##	Devuelve la probabilidad de que los valores de un rango se encuentren entre dos límites.
+QUARTILE		= CUARTIL				##	Devuelve el cuartil de un conjunto de datos.
+RANK			= JERARQUIA				##	Devuelve la jerarquía de un número en una lista de números.
+RSQ			= COEFICIENTE.R2			##	Devuelve el cuadrado del coeficiente de momento de correlación de producto Pearson.
+SKEW			= COEFICIENTE.ASIMETRIA			##	Devuelve la asimetría de una distribución.
+SLOPE			= PENDIENTE				##	Devuelve la pendiente de la línea de regresión lineal.
+SMALL			= K.ESIMO.MENOR				##	Devuelve el k-ésimo menor valor de un conjunto de datos.
+STANDARDIZE		= NORMALIZACION				##	Devuelve un valor normalizado.
+STDEV			= DESVEST				##	Calcula la desviación estándar a partir de una muestra.
+STDEVA			= DESVESTA				##	Calcula la desviación estándar a partir de una muestra, incluidos números, texto y valores lógicos.
+STDEVP			= DESVESTP				##	Calcula la desviación estándar en función de toda la población.
+STDEVPA			= DESVESTPA				##	Calcula la desviación estándar en función de toda la población, incluidos números, texto y valores lógicos.
+STEYX			= ERROR.TIPICO.XY			##	Devuelve el error estándar del valor de "y" previsto para cada "x" de la regresión.
+TDIST			= DISTR.T				##	Devuelve la distribución de t de Student.
+TINV			= DISTR.T.INV				##	Devuelve la función inversa de la distribución de t de Student.
+TREND			= TENDENCIA				##	Devuelve valores en una tendencia lineal.
+TRIMMEAN		= MEDIA.ACOTADA				##	Devuelve la media del interior de un conjunto de datos.
+TTEST			= PRUEBA.T				##	Devuelve la probabilidad asociada a una prueba t de Student.
+VAR			= VAR					##	Calcula la varianza en función de una muestra.
+VARA			= VARA					##	Calcula la varianza en función de una muestra, incluidos números, texto y valores lógicos.
+VARP			= VARP					##	Calcula la varianza en función de toda la población.
+VARPA			= VARPA					##	Calcula la varianza en función de toda la población, incluidos números, texto y valores lógicos.
+WEIBULL			= DIST.WEIBULL				##	Devuelve la distribución de Weibull.
+ZTEST			= PRUEBA.Z				##	Devuelve el valor de una probabilidad de una cola de una prueba z.
+
+
+##
+##	Text functions						Funciones de texto
+##
+ASC			= ASC					##	Convierte las letras inglesas o katakana de ancho completo (de dos bytes) dentro de una cadena de caracteres en caracteres de ancho medio (de un byte).
+BAHTTEXT		= TEXTOBAHT				##	Convierte un número en texto, con el formato de moneda ß (Baht).
+CHAR			= CARACTER				##	Devuelve el carácter especificado por el número de código.
+CLEAN			= LIMPIAR				##	Quita del texto todos los caracteres no imprimibles.
+CODE			= CODIGO				##	Devuelve un código numérico del primer carácter de una cadena de texto.
+CONCATENATE		= CONCATENAR				##	Concatena varios elementos de texto en uno solo.
+DOLLAR			= MONEDA				##	Convierte un número en texto, con el formato de moneda $ (dólar).
+EXACT			= IGUAL					##	Comprueba si dos valores de texto son idénticos.
+FIND			= ENCONTRAR				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
+FINDB			= ENCONTRARB				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
+FIXED			= DECIMAL				##	Da formato a un número como texto con un número fijo de decimales.
+JIS			= JIS					##	Convierte las letras inglesas o katakana de ancho medio (de un byte) dentro de una cadena de caracteres en caracteres de ancho completo (de dos bytes).
+LEFT			= IZQUIERDA				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
+LEFTB			= IZQUIERDAB				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
+LEN			= LARGO					##	Devuelve el número de caracteres de una cadena de texto.
+LENB			= LARGOB				##	Devuelve el número de caracteres de una cadena de texto.
+LOWER			= MINUSC				##	Pone el texto en minúsculas.
+MID			= EXTRAE				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
+MIDB			= EXTRAEB				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
+PHONETIC		= FONETICO				##	Extrae los caracteres fonéticos (furigana) de una cadena de texto.
+PROPER			= NOMPROPIO				##	Pone en mayúscula la primera letra de cada palabra de un valor de texto.
+REPLACE			= REEMPLAZAR				##	Reemplaza caracteres de texto.
+REPLACEB		= REEMPLAZARB				##	Reemplaza caracteres de texto.
+REPT			= REPETIR				##	Repite el texto un número determinado de veces.
+RIGHT			= DERECHA				##	Devuelve los caracteres del lado derecho de un valor de texto.
+RIGHTB			= DERECHAB				##	Devuelve los caracteres del lado derecho de un valor de texto.
+SEARCH			= HALLAR				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
+SEARCHB			= HALLARB				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
+SUBSTITUTE		= SUSTITUIR				##	Sustituye texto nuevo por texto antiguo en una cadena de texto.
+T			= T					##	Convierte sus argumentos a texto.
+TEXT			= TEXTO					##	Da formato a un número y lo convierte en texto.
+TRIM			= ESPACIOS				##	Quita los espacios del texto.
+UPPER			= MAYUSC				##	Pone el texto en mayúsculas.
+VALUE			= VALOR					##	Convierte un argumento de texto en un número.
diff --git a/lib/PHPExcel/locale/fi/config b/lib/PHPExcel/locale/fi/config
new file mode 100644
index 000000000..498cf4ceb
--- /dev/null
+++ b/lib/PHPExcel/locale/fi/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= $	#	Symbol not known, should it be a € (Euro)?
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #TYHJÄ!
+DIV0	= #JAKO/0!
+VALUE	= #ARVO!
+REF	= #VIITTAUS!
+NAME	= #NIMI?
+NUM	= #LUKU!
+NA	= #PUUTTUU
diff --git a/lib/PHPExcel/locale/fi/functions b/lib/PHPExcel/locale/fi/functions
new file mode 100644
index 000000000..6a7c2b36f
--- /dev/null
+++ b/lib/PHPExcel/locale/fi/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Apuohjelma- ja automaatiofunktiot
+##
+GETPIVOTDATA		= NOUDA.PIVOT.TIEDOT		##	Palauttaa pivot-taulukkoraporttiin tallennettuja tietoja.
+
+
+##
+##	Cube functions					Kuutiofunktiot
+##
+CUBEKPIMEMBER		= KUUTIOKPIJÄSEN		##	Palauttaa suorituskykyilmaisimen (KPI) nimen, ominaisuuden sekä mitan ja näyttää nimen sekä ominaisuuden solussa. KPI on mitattavissa oleva suure, kuten kuukauden bruttotuotto tai vuosineljänneksen työntekijäkohtainen liikevaihto, joiden avulla tarkkaillaan organisaation suorituskykyä.
+CUBEMEMBER		= KUUTIONJÄSEN			##	Palauttaa kuutiohierarkian jäsenen tai monikon. Tällä funktiolla voit tarkistaa, että jäsen tai monikko on olemassa kuutiossa.
+CUBEMEMBERPROPERTY	= KUUTIONJÄSENENOMINAISUUS	##	Palauttaa kuution jäsenominaisuuden arvon. Tällä funktiolla voit tarkistaa, että nimi on olemassa kuutiossa, ja palauttaa tämän jäsenen määritetyn ominaisuuden.
+CUBERANKEDMEMBER	= KUUTIONLUOKITELTUJÄSEN	##	Palauttaa joukon n:nnen jäsenen. Tällä funktiolla voit palauttaa joukosta elementtejä, kuten parhaan myyjän tai 10 parasta opiskelijaa.
+CUBESET			= KUUTIOJOUKKO			##	Määrittää lasketun jäsen- tai monikkojoukon lähettämällä joukon lausekkeita palvelimessa olevalle kuutiolle. Palvelin luo joukon ja palauttaa sen Microsoft Office Excelille.
+CUBESETCOUNT		= KUUTIOJOUKKOJENMÄÄRÄ		##	Palauttaa joukon kohteiden määrän.
+CUBEVALUE		= KUUTIONARVO			##	Palauttaa koostetun arvon kuutiosta.
+
+
+##
+##	Database functions				Tietokantafunktiot
+##
+DAVERAGE		= TKESKIARVO			##	Palauttaa valittujen tietokantamerkintöjen keskiarvon.
+DCOUNT			= TLASKE			##	Laskee tietokannan lukuja sisältävien solujen määrän.
+DCOUNTA			= TLASKEA			##	Laskee tietokannan tietoja sisältävien solujen määrän.
+DGET			= TNOUDA			##	Hakee määritettyjä ehtoja vastaavan tietueen tietokannasta.
+DMAX			= TMAKS				##	Palauttaa suurimman arvon tietokannasta valittujen arvojen joukosta.
+DMIN			= TMIN				##	Palauttaa pienimmän arvon tietokannasta valittujen arvojen joukosta.
+DPRODUCT		= TTULO				##	Kertoo määritetyn ehdon täyttävien tietokannan tietueiden tietyssä kentässä olevat arvot.
+DSTDEV			= TKESKIHAJONTA			##	Laskee keskihajonnan tietokannasta valituista arvoista muodostuvan otoksen perusteella.
+DSTDEVP			= TKESKIHAJONTAP		##	Laskee keskihajonnan tietokannasta valittujen arvojen koko populaation perusteella.
+DSUM			= TSUMMA			##	Lisää luvut määritetyn ehdon täyttävien tietokannan tietueiden kenttäsarakkeeseen.
+DVAR			= TVARIANSSI			##	Laskee varianssin tietokannasta valittujen arvojen otoksen perusteella.
+DVARP			= TVARIANSSIP			##	Laskee varianssin tietokannasta valittujen arvojen koko populaation perusteella.
+
+
+##
+##	Date and time functions				Päivämäärä- ja aikafunktiot
+##
+DATE			= PÄIVÄYS			##	Palauttaa annetun päivämäärän järjestysluvun.
+DATEVALUE		= PÄIVÄYSARVO			##	Muuntaa tekstimuodossa olevan päivämäärän järjestysluvuksi.
+DAY			= PÄIVÄ				##	Muuntaa järjestysluvun kuukauden päiväksi.
+DAYS360			= PÄIVÄT360			##	Laskee kahden päivämäärän välisten päivien määrän käyttäen perustana 360-päiväistä vuotta.
+EDATE			= PÄIVÄ.KUUKAUSI		##	Palauttaa järjestyslukuna päivämäärän, joka poikkeaa aloituspäivän päivämäärästä annetun kuukausimäärän verran joko eteen- tai taaksepäin.
+EOMONTH			= KUUKAUSI.LOPPU		##	Palauttaa järjestyslukuna sen kuukauden viimeisen päivämäärän, joka poikkeaa annetun kuukausimäärän verran eteen- tai taaksepäin.
+HOUR			= TUNNIT			##	Muuntaa järjestysluvun tunneiksi.
+MINUTE			= MINUUTIT			##	Muuntaa järjestysluvun minuuteiksi.
+MONTH			= KUUKAUSI			##	Muuntaa järjestysluvun kuukausiksi.
+NETWORKDAYS		= TYÖPÄIVÄT			##	Palauttaa kahden päivämäärän välissä olevien täysien työpäivien määrän.
+NOW			= NYT				##	Palauttaa kuluvan päivämäärän ja ajan järjestysnumeron.
+SECOND			= SEKUNNIT			##	Muuntaa järjestysluvun sekunneiksi.
+TIME			= AIKA				##	Palauttaa annetun kellonajan järjestysluvun.
+TIMEVALUE		= AIKA_ARVO			##	Muuntaa tekstimuodossa olevan kellonajan järjestysluvuksi.
+TODAY			= TÄMÄ.PÄIVÄ			##	Palauttaa kuluvan päivän päivämäärän järjestysluvun.
+WEEKDAY			= VIIKONPÄIVÄ			##	Muuntaa järjestysluvun viikonpäiväksi.
+WEEKNUM			= VIIKKO.NRO			##	Muuntaa järjestysluvun luvuksi, joka ilmaisee viikon järjestysluvun vuoden alusta laskettuna.
+WORKDAY			= TYÖPÄIVÄ			##	Palauttaa järjestysluvun päivämäärälle, joka sijaitsee annettujen työpäivien verran eteen tai taaksepäin.
+YEAR			= VUOSI				##	Muuntaa järjestysluvun vuosiksi.
+YEARFRAC		= VUOSI.OSA			##	Palauttaa määritettyjen päivämäärien (aloituspäivä ja lopetuspäivä) välisen osan vuodesta.
+
+
+##
+##	Engineering functions				Tekniset funktiot
+##
+BESSELI			= BESSELI			##	Palauttaa muunnetun Bessel-funktion In(x).
+BESSELJ			= BESSELJ			##	Palauttaa Bessel-funktion Jn(x).
+BESSELK			= BESSELK			##	Palauttaa muunnetun Bessel-funktion Kn(x).
+BESSELY			= BESSELY			##	Palauttaa Bessel-funktion Yn(x).
+BIN2DEC			= BINDES			##	Muuntaa binaariluvun desimaaliluvuksi.
+BIN2HEX			= BINHEKSA			##	Muuntaa binaariluvun heksadesimaaliluvuksi.
+BIN2OCT			= BINOKT			##	Muuntaa binaariluvun oktaaliluvuksi.
+COMPLEX			= KOMPLEKSI			##	Muuntaa reaali- ja imaginaariosien kertoimet kompleksiluvuksi.
+CONVERT			= MUUNNA			##	Muuntaa luvun toisen mittajärjestelmän mukaiseksi.
+DEC2BIN			= DESBIN			##	Muuntaa desimaaliluvun binaariluvuksi.
+DEC2HEX			= DESHEKSA			##	Muuntaa kymmenjärjestelmän luvun heksadesimaaliluvuksi.
+DEC2OCT			= DESOKT			##	Muuntaa kymmenjärjestelmän luvun oktaaliluvuksi.
+DELTA			= SAMA.ARVO			##	Tarkistaa, ovatko kaksi arvoa yhtä suuria.
+ERF			= VIRHEFUNKTIO			##	Palauttaa virhefunktion.
+ERFC			= VIRHEFUNKTIO.KOMPLEMENTTI	##	Palauttaa komplementtivirhefunktion.
+GESTEP			= RAJA				##	Testaa, onko luku suurempi kuin kynnysarvo.
+HEX2BIN			= HEKSABIN			##	Muuntaa heksadesimaaliluvun binaariluvuksi.
+HEX2DEC			= HEKSADES			##	Muuntaa heksadesimaaliluvun desimaaliluvuksi.
+HEX2OCT			= HEKSAOKT			##	Muuntaa heksadesimaaliluvun oktaaliluvuksi.
+IMABS			= KOMPLEKSI.ITSEISARVO		##	Palauttaa kompleksiluvun itseisarvon (moduluksen).
+IMAGINARY		= KOMPLEKSI.IMAG		##	Palauttaa kompleksiluvun imaginaariosan kertoimen.
+IMARGUMENT		= KOMPLEKSI.ARG			##	Palauttaa theeta-argumentin, joka on radiaaneina annettu kulma.
+IMCONJUGATE		= KOMPLEKSI.KONJ		##	Palauttaa kompleksiluvun konjugaattiluvun.
+IMCOS			= KOMPLEKSI.COS			##	Palauttaa kompleksiluvun kosinin.
+IMDIV			= KOMPLEKSI.OSAM		##	Palauttaa kahden kompleksiluvun osamäärän.
+IMEXP			= KOMPLEKSI.EKSP		##	Palauttaa kompleksiluvun eksponentin.
+IMLN			= KOMPLEKSI.LN			##	Palauttaa kompleksiluvun luonnollisen logaritmin.
+IMLOG10			= KOMPLEKSI.LOG10		##	Palauttaa kompleksiluvun kymmenkantaisen logaritmin.
+IMLOG2			= KOMPLEKSI.LOG2		##	Palauttaa kompleksiluvun kaksikantaisen logaritmin.
+IMPOWER			= KOMPLEKSI.POT			##	Palauttaa kokonaislukupotenssiin korotetun kompleksiluvun.
+IMPRODUCT		= KOMPLEKSI.TULO		##	Palauttaa kompleksilukujen tulon.
+IMREAL			= KOMPLEKSI.REAALI		##	Palauttaa kompleksiluvun reaaliosan kertoimen.
+IMSIN			= KOMPLEKSI.SIN			##	Palauttaa kompleksiluvun sinin.
+IMSQRT			= KOMPLEKSI.NELIÖJ		##	Palauttaa kompleksiluvun neliöjuuren.
+IMSUB			= KOMPLEKSI.EROTUS		##	Palauttaa kahden kompleksiluvun erotuksen.
+IMSUM			= KOMPLEKSI.SUM			##	Palauttaa kompleksilukujen summan.
+OCT2BIN			= OKTBIN			##	Muuntaa oktaaliluvun binaariluvuksi.
+OCT2DEC			= OKTDES			##	Muuntaa oktaaliluvun desimaaliluvuksi.
+OCT2HEX			= OKTHEKSA			##	Muuntaa oktaaliluvun heksadesimaaliluvuksi.
+
+
+##
+##	Financial functions				Rahoitusfunktiot   
+##
+ACCRINT			= KERTYNYT.KORKO		##	Laskee arvopaperille kertyneen koron, kun korko kertyy säännöllisin väliajoin.
+ACCRINTM		= KERTYNYT.KORKO.LOPUSSA	##	Laskee arvopaperille kertyneen koron, kun korko maksetaan eräpäivänä.
+AMORDEGRC		= AMORDEGRC			##	Laskee kunkin laskentakauden poiston poistokerrointa käyttämällä.
+AMORLINC		= AMORLINC			##	Palauttaa kunkin laskentakauden poiston.
+COUPDAYBS		= KORKOPÄIVÄT.ALUSTA		##	Palauttaa koronmaksukauden aloituspäivän ja tilityspäivän välisen ajanjakson päivien määrän.
+COUPDAYS		= KORKOPÄIVÄT			##	Palauttaa päivien määrän koronmaksukaudelta, johon tilityspäivä kuuluu.
+COUPDAYSNC		= KORKOPÄIVÄT.SEURAAVA		##	Palauttaa tilityspäivän ja seuraavan koronmaksupäivän välisen ajanjakson päivien määrän.
+COUPNCD			= KORKOMAKSU.SEURAAVA		##	Palauttaa tilityspäivän jälkeisen seuraavan koronmaksupäivän.
+COUPNUM			= KORKOPÄIVÄJAKSOT		##	Palauttaa arvopaperin ostopäivän ja erääntymispäivän välisten koronmaksupäivien määrän.
+COUPPCD			= KORKOPÄIVÄ.EDELLINEN		##	Palauttaa tilityspäivää edeltävän koronmaksupäivän.
+CUMIPMT			= MAKSETTU.KORKO		##	Palauttaa kahden jakson välisenä aikana kertyneen koron.
+CUMPRINC		= MAKSETTU.LYHENNYS		##	Palauttaa lainalle kahden jakson välisenä aikana kertyneen lyhennyksen.
+DB			= DB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
+DDB			= DDB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DDB-menetelmän (Double-Declining Balance) tai jonkin muun määrittämäsi menetelmän mukaan.
+DISC			= DISKONTTOKORKO		##	Palauttaa arvopaperin diskonttokoron.
+DOLLARDE		= VALUUTTA.DES			##	Muuntaa murtolukuna ilmoitetun valuuttamäärän desimaaliluvuksi.
+DOLLARFR		= VALUUTTA.MURTO		##	Muuntaa desimaalilukuna ilmaistun valuuttamäärän murtoluvuksi.
+DURATION		= KESTO				##	Palauttaa keston arvopaperille, jonka koronmaksu tapahtuu säännöllisesti.
+EFFECT			= KORKO.EFEKT			##	Palauttaa todellisen vuosikoron.
+FV			= TULEVA.ARVO			##	Palauttaa sijoituksen tulevan arvon.
+FVSCHEDULE		= TULEVA.ARVO.ERIKORKO		##	Palauttaa pääoman tulevan arvon, kun pääomalle on kertynyt korkoa vaihtelevasti.
+INTRATE			= KORKO.ARVOPAPERI		##	Palauttaa arvopaperin korkokannan täysin sijoitetulle arvopaperille.
+IPMT			= IPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona kertyvän koron.
+IRR			= SISÄINEN.KORKO		##	Laskee sisäisen korkokannan kassavirrasta muodostuvalle sarjalle.
+ISPMT			= ONMAKSU			##	Laskee sijoituksen maksetun koron tietyllä jaksolla.
+MDURATION		= KESTO.MUUNN			##	Palauttaa muunnetun Macauley-keston arvopaperille, jonka oletettu nimellisarvo on 100 euroa.
+MIRR			= MSISÄINEN			##	Palauttaa sisäisen korkokannan, kun positiivisten ja negatiivisten kassavirtojen rahoituskorko on erilainen.
+NOMINAL			= KORKO.VUOSI			##	Palauttaa vuosittaisen nimelliskoron.
+NPER			= NJAKSO			##	Palauttaa sijoituksen jaksojen määrän.
+NPV			= NNA				##	Palauttaa sijoituksen nykyarvon toistuvista kassavirroista muodostuvan sarjan ja diskonttokoron perusteella.
+ODDFPRICE		= PARITON.ENS.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa ensimmäinen jakso on pariton.
+ODDFYIELD		= PARITON.ENS.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa ensimmäinen jakso on pariton.
+ODDLPRICE		= PARITON.VIIM.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa viimeinen jakso on pariton.
+ODDLYIELD		= PARITON.VIIM.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa viimeinen jakso on pariton.
+PMT			= MAKSU				##	Palauttaa annuiteetin kausittaisen maksuerän.
+PPMT			= PPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona maksettavan lyhennyksen.
+PRICE			= HINTA				##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
+PRICEDISC		= HINTA.DISK			##	Palauttaa diskontatun arvopaperin hinnan 100 euron nimellisarvoa kohden.
+PRICEMAT		= HINTA.LUNASTUS		##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan erääntymispäivänä.
+PV			= NA				##	Palauttaa sijoituksen nykyarvon.
+RATE			= KORKO				##	Palauttaa annuiteetin kausittaisen korkokannan.
+RECEIVED		= SAATU.HINTA			##	Palauttaa arvopaperin tuoton erääntymispäivänä kokonaan maksetulle sijoitukselle.
+SLN			= STP				##	Palauttaa sijoituksen tasapoiston yhdeltä jaksolta.
+SYD			= VUOSIPOISTO			##	Palauttaa sijoituksen vuosipoiston annettuna kautena amerikkalaisen SYD-menetelmän (Sum-of-Year's Digits) avulla.
+TBILLEQ			= OBLIG.TUOTTOPROS		##	Palauttaa valtion obligaation tuoton vastaavana joukkovelkakirjan tuottona.
+TBILLPRICE		= OBLIG.HINTA			##	Palauttaa obligaation hinnan 100 euron nimellisarvoa kohden.
+TBILLYIELD		= OBLIG.TUOTTO			##	Palauttaa obligaation tuoton.
+VDB			= VDB				##	Palauttaa annetun kauden tai kauden osan kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
+XIRR			= SISÄINEN.KORKO.JAKSOTON	##	Palauttaa sisäisen korkokannan kassavirtojen sarjoille, jotka eivät välttämättä ole säännöllisiä.
+XNPV			= NNA.JAKSOTON			##	Palauttaa nettonykyarvon kassavirtasarjalle, joka ei välttämättä ole kausittainen.
+YIELD			= TUOTTO			##	Palauttaa tuoton arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
+YIELDDISC		= TUOTTO.DISK			##	Palauttaa diskontatun arvopaperin, kuten obligaation, vuosittaisen tuoton.
+YIELDMAT		= TUOTTO.ERÄP			##	Palauttaa erääntymispäivänään korkoa tuottavan arvopaperin vuosittaisen tuoton.
+
+
+##
+##	Information functions				Erikoisfunktiot
+##
+CELL			= SOLU				##	Palauttaa tietoja solun muotoilusta, sijainnista ja sisällöstä.
+ERROR.TYPE		= VIRHEEN.LAJI			##	Palauttaa virhetyyppiä vastaavan luvun.
+INFO			= KUVAUS			##	Palauttaa tietoja nykyisestä käyttöympäristöstä.
+ISBLANK			= ONTYHJÄ			##	Palauttaa arvon TOSI, jos arvo on tyhjä.
+ISERR			= ONVIRH			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo paitsi arvo #PUUTTUU!.
+ISERROR			= ONVIRHE			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo.
+ISEVEN			= ONPARILLINEN			##	Palauttaa arvon TOSI, jos arvo on parillinen.
+ISLOGICAL		= ONTOTUUS			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa looginen arvo.
+ISNA			= ONPUUTTUU			##	Palauttaa arvon TOSI, jos virhearvo on #PUUTTUU!.
+ISNONTEXT		= ONEI_TEKSTI			##	Palauttaa arvon TOSI, jos arvo ei ole teksti.
+ISNUMBER		= ONLUKU			##	Palauttaa arvon TOSI, jos arvo on luku.
+ISODD			= ONPARITON			##	Palauttaa arvon TOSI, jos arvo on pariton.
+ISREF			= ONVIITT			##	Palauttaa arvon TOSI, jos arvo on viittaus.
+ISTEXT			= ONTEKSTI			##	Palauttaa arvon TOSI, jos arvo on teksti.
+N			= N				##	Palauttaa arvon luvuksi muunnettuna.
+NA			= PUUTTUU			##	Palauttaa virhearvon #PUUTTUU!.
+TYPE			= TYYPPI			##	Palauttaa luvun, joka ilmaisee arvon tietotyypin.
+
+
+##
+##	Logical functions				Loogiset funktiot
+##
+AND			= JA				##	Palauttaa arvon TOSI, jos kaikkien argumenttien arvo on TOSI.
+FALSE			= EPÄTOSI			##	Palauttaa totuusarvon EPÄTOSI.
+IF			= JOS				##	Määrittää suoritettavan loogisen testin.
+IFERROR			= JOSVIRHE			##	Palauttaa määrittämäsi arvon, jos kaavan tulos on virhe; muussa tapauksessa palauttaa kaavan tuloksen.
+NOT			= EI				##	Kääntää argumentin loogisen arvon.
+OR			= TAI				##	Palauttaa arvon TOSI, jos minkä tahansa argumentin arvo on TOSI.
+TRUE			= TOSI				##	Palauttaa totuusarvon TOSI.
+
+
+##
+##	Lookup and reference functions			Haku- ja viitefunktiot
+##
+ADDRESS			= OSOITE			##	Palauttaa laskentataulukon soluun osoittavan viittauksen tekstinä.
+AREAS			= ALUEET			##	Palauttaa viittauksessa olevien alueiden määrän.
+CHOOSE			= VALITSE.INDEKSI		##	Valitsee arvon arvoluettelosta.
+COLUMN			= SARAKE			##	Palauttaa viittauksen sarakenumeron.
+COLUMNS			= SARAKKEET			##	Palauttaa viittauksessa olevien sarakkeiden määrän.
+HLOOKUP			= VHAKU				##	Suorittaa haun matriisin ylimmältä riviltä ja palauttaa määritetyn solun arvon.
+HYPERLINK		= HYPERLINKKI			##	Luo pikakuvakkeen tai tekstin, joka avaa verkkopalvelimeen, intranetiin tai Internetiin tallennetun tiedoston.
+INDEX			= INDEKSI			##	Valitsee arvon viittauksesta tai matriisista indeksin mukaan.
+INDIRECT		= EPÄSUORA			##	Palauttaa tekstiarvona ilmaistun viittauksen.
+LOOKUP			= HAKU				##	Etsii arvoja vektorista tai matriisista.
+MATCH			= VASTINE			##	Etsii arvoja viittauksesta tai matriisista.
+OFFSET			= SIIRTYMÄ			##	Palauttaa annetun viittauksen siirtymän.
+ROW			= RIVI				##	Palauttaa viittauksen rivinumeron.
+ROWS			= RIVIT				##	Palauttaa viittauksessa olevien rivien määrän.
+RTD			= RTD				##	Noutaa COM-automaatiota (automaatio: Tapa käsitellä sovelluksen objekteja toisesta sovelluksesta tai kehitystyökalusta. Automaatio, jota aiemmin kutsuttiin OLE-automaatioksi, on teollisuusstandardi ja COM-mallin (Component Object Model) ominaisuus.) tukevasta ohjelmasta reaaliaikaisia tietoja.
+TRANSPOSE		= TRANSPONOI			##	Palauttaa matriisin käänteismatriisin.
+VLOOKUP			= PHAKU				##	Suorittaa haun matriisin ensimmäisestä sarakkeesta ja palauttaa rivillä olevan solun arvon.
+
+
+##
+##	Math and trigonometry functions			Matemaattiset ja trigonometriset funktiot
+##
+ABS			= ITSEISARVO			##	Palauttaa luvun itseisarvon.
+ACOS			= ACOS				##	Palauttaa luvun arkuskosinin.
+ACOSH			= ACOSH				##	Palauttaa luvun käänteisen hyperbolisen kosinin.
+ASIN			= ASIN				##	Palauttaa luvun arkussinin.
+ASINH			= ASINH				##	Palauttaa luvun käänteisen hyperbolisen sinin.
+ATAN			= ATAN				##	Palauttaa luvun arkustangentin.
+ATAN2			= ATAN2				##	Palauttaa arkustangentin x- ja y-koordinaatin perusteella.
+ATANH			= ATANH				##	Palauttaa luvun käänteisen hyperbolisen tangentin.
+CEILING			= PYÖRISTÄ.KERR.YLÖS		##	Pyöristää luvun lähimpään kokonaislukuun tai tarkkuusargumentin lähimpään kerrannaiseen.
+COMBIN			= KOMBINAATIO			##	Palauttaa mahdollisten kombinaatioiden määrän annetulle objektien määrälle.
+COS			= COS				##	Palauttaa luvun kosinin.
+COSH			= COSH				##	Palauttaa luvun hyperbolisen kosinin.
+DEGREES			= ASTEET			##	Muuntaa radiaanit asteiksi.
+EVEN			= PARILLINEN			##	Pyöristää luvun ylöspäin lähimpään parilliseen kokonaislukuun.
+EXP			= EKSPONENTTI			##	Palauttaa e:n korotettuna annetun luvun osoittamaan potenssiin.
+FACT			= KERTOMA			##	Palauttaa luvun kertoman.
+FACTDOUBLE		= KERTOMA.OSA			##	Palauttaa luvun osakertoman.
+FLOOR			= PYÖRISTÄ.KERR.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
+GCD			= SUURIN.YHT.TEKIJÄ		##	Palauttaa suurimman yhteisen tekijän.
+INT			= KOKONAISLUKU			##	Pyöristää luvun alaspäin lähimpään kokonaislukuun.
+LCM			= PIENIN.YHT.JAETTAVA		##	Palauttaa pienimmän yhteisen tekijän.
+LN			= LUONNLOG			##	Palauttaa luvun luonnollisen logaritmin.
+LOG			= LOG				##	Laskee luvun logaritmin käyttämällä annettua kantalukua.
+LOG10			= LOG10				##	Palauttaa luvun kymmenkantaisen logaritmin.
+MDETERM			= MDETERM			##	Palauttaa matriisin matriisideterminantin.
+MINVERSE		= MKÄÄNTEINEN			##	Palauttaa matriisin käänteismatriisin.
+MMULT			= MKERRO			##	Palauttaa kahden matriisin tulon.
+MOD			= JAKOJ				##	Palauttaa jakolaskun jäännöksen.
+MROUND			= PYÖRISTÄ.KERR			##	Palauttaa luvun pyöristettynä annetun luvun kerrannaiseen.
+MULTINOMIAL		= MULTINOMI			##	Palauttaa lukujoukon multinomin.
+ODD			= PARITON			##	Pyöristää luvun ylöspäin lähimpään parittomaan kokonaislukuun.
+PI			= PII				##	Palauttaa piin arvon.
+POWER			= POTENSSI			##	Palauttaa luvun korotettuna haluttuun potenssiin.
+PRODUCT			= TULO				##	Kertoo annetut argumentit.
+QUOTIENT		= OSAMÄÄRÄ			##	Palauttaa osamäärän kokonaislukuosan.
+RADIANS			= RADIAANIT			##	Muuntaa asteet radiaaneiksi.
+RAND			= SATUNNAISLUKU			##	Palauttaa satunnaisluvun väliltä 0–1.
+RANDBETWEEN		= SATUNNAISLUKU.VÄLILTÄ		##	Palauttaa satunnaisluvun määritettyjen lukujen väliltä.
+ROMAN			= ROMAN				##	Muuntaa arabialaisen numeron tekstimuotoiseksi roomalaiseksi numeroksi.
+ROUND			= PYÖRISTÄ			##	Pyöristää luvun annettuun määrään desimaaleja.
+ROUNDDOWN		= PYÖRISTÄ.DES.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
+ROUNDUP			= PYÖRISTÄ.DES.YLÖS		##	Pyöristää luvun ylöspäin (poispäin nollasta).
+SERIESSUM		= SARJA.SUMMA			##	Palauttaa kaavaan perustuvan potenssisarjan arvon.
+SIGN			= ETUMERKKI			##	Palauttaa luvun etumerkin.
+SIN			= SIN				##	Palauttaa annetun kulman sinin.
+SINH			= SINH				##	Palauttaa luvun hyperbolisen sinin.
+SQRT			= NELIÖJUURI			##	Palauttaa positiivisen neliöjuuren.
+SQRTPI			= NELIÖJUURI.PII		##	Palauttaa tulon (luku * pii) neliöjuuren.
+SUBTOTAL		= VÄLISUMMA			##	Palauttaa luettelon tai tietokannan välisumman.
+SUM			= SUMMA				##	Laskee yhteen annetut argumentit.
+SUMIF			= SUMMA.JOS			##	Laskee ehdot täyttävien solujen summan.
+SUMIFS			= SUMMA.JOS.JOUKKO		##	Laskee yhteen solualueen useita ehtoja vastaavat solut.
+SUMPRODUCT		= TULOJEN.SUMMA			##	Palauttaa matriisin toisiaan vastaavien osien tulojen summan.
+SUMSQ			= NELIÖSUMMA			##	Palauttaa argumenttien neliöiden summan.
+SUMX2MY2		= NELIÖSUMMIEN.EROTUS		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen laskettujen neliösummien erotuksen.
+SUMX2PY2		= NELIÖSUMMIEN.SUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen neliösummien summan.
+SUMXMY2			= EROTUSTEN.NELIÖSUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen erotusten neliösumman.
+TAN			= TAN				##	Palauttaa luvun tangentin.
+TANH			= TANH				##	Palauttaa luvun hyperbolisen tangentin.
+TRUNC			= KATKAISE			##	Katkaisee luvun kokonaisluvuksi.
+
+
+##
+##	Statistical functions				Tilastolliset funktiot
+##
+AVEDEV			= KESKIPOIKKEAMA		##	Palauttaa hajontojen itseisarvojen keskiarvon.
+AVERAGE			= KESKIARVO			##	Palauttaa argumenttien keskiarvon.
+AVERAGEA		= KESKIARVOA			##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, keskiarvon.
+AVERAGEIF		= KESKIARVO.JOS			##	Palauttaa alueen niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka täyttävät annetut ehdot.
+AVERAGEIFS		= KESKIARVO.JOS.JOUKKO		##	Palauttaa niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka vastaavat useita ehtoja.
+BETADIST		= BEETAJAKAUMA			##	Palauttaa kumulatiivisen beetajakaumafunktion arvon.
+BETAINV			= BEETAJAKAUMA.KÄÄNT		##	Palauttaa määritetyn beetajakauman käänteisen kumulatiivisen jakaumafunktion arvon.
+BINOMDIST		= BINOMIJAKAUMA			##	Palauttaa yksittäisen termin binomijakaumatodennäköisyyden.
+CHIDIST			= CHIJAKAUMA			##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden.
+CHIINV			= CHIJAKAUMA.KÄÄNT		##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden käänteisarvon.
+CHITEST			= CHITESTI			##	Palauttaa riippumattomuustestin tuloksen.
+CONFIDENCE		= LUOTTAMUSVÄLI			##	Palauttaa luottamusvälin populaation keskiarvolle.
+CORREL			= KORRELAATIO			##	Palauttaa kahden arvojoukon korrelaatiokertoimen.
+COUNT			= LASKE				##	Laskee argumenttiluettelossa olevien lukujen määrän.
+COUNTA			= LASKE.A			##	Laskee argumenttiluettelossa olevien arvojen määrän.
+COUNTBLANK		= LASKE.TYHJÄT			##	Laskee alueella olevien tyhjien solujen määrän.
+COUNTIF			= LASKE.JOS			##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa annettuja ehtoja.
+COUNTIFS		= LASKE.JOS.JOUKKO		##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa useita ehtoja.
+COVAR			= KOVARIANSSI			##	Palauttaa kovarianssin, joka on keskiarvo havaintoaineiston kunkin pisteparin poikkeamien tuloista.
+CRITBINOM		= BINOMIJAKAUMA.KRIT		##	Palauttaa pienimmän arvon, jossa binomijakauman kertymäfunktion arvo on pienempi tai yhtä suuri kuin vertailuarvo.
+DEVSQ			= OIKAISTU.NELIÖSUMMA		##	Palauttaa keskipoikkeamien neliösumman.
+EXPONDIST		= EKSPONENTIAALIJAKAUMA		##	Palauttaa eksponentiaalijakauman.
+FDIST			= FJAKAUMA			##	Palauttaa F-todennäköisyysjakauman.
+FINV			= FJAKAUMA.KÄÄNT		##	Palauttaa F-todennäköisyysjakauman käänteisfunktion.
+FISHER			= FISHER			##	Palauttaa Fisher-muunnoksen.
+FISHERINV		= FISHER.KÄÄNT			##	Palauttaa käänteisen Fisher-muunnoksen.
+FORECAST		= ENNUSTE			##	Palauttaa lineaarisen trendin arvon.
+FREQUENCY		= TAAJUUS			##	Palauttaa frekvenssijakautuman pystysuuntaisena matriisina.
+FTEST			= FTESTI			##	Palauttaa F-testin tuloksen.
+GAMMADIST		= GAMMAJAKAUMA			##	Palauttaa gammajakauman.
+GAMMAINV		= GAMMAJAKAUMA.KÄÄNT		##	Palauttaa käänteisen gammajakauman kertymäfunktion.
+GAMMALN			= GAMMALN			##	Palauttaa gammafunktion luonnollisen logaritmin G(x).
+GEOMEAN			= KESKIARVO.GEOM		##	Palauttaa geometrisen keskiarvon.
+GROWTH			= KASVU				##	Palauttaa eksponentiaalisen trendin arvon.
+HARMEAN			= KESKIARVO.HARM		##	Palauttaa harmonisen keskiarvon.
+HYPGEOMDIST		= HYPERGEOM.JAKAUMA		##	Palauttaa hypergeometrisen jakauman.
+INTERCEPT		= LEIKKAUSPISTE			##	Palauttaa lineaarisen regressiosuoran leikkauspisteen.
+KURT			= KURT				##	Palauttaa tietoalueen vinous-arvon eli huipukkuuden.
+LARGE			= SUURI				##	Palauttaa tietojoukon k:nneksi suurimman arvon.
+LINEST			= LINREGR			##	Palauttaa lineaarisen trendin parametrit.
+LOGEST			= LOGREGR			##	Palauttaa eksponentiaalisen trendin parametrit.
+LOGINV			= LOGNORM.JAKAUMA.KÄÄNT		##	Palauttaa lognormeeratun jakauman käänteisfunktion.
+LOGNORMDIST		= LOGNORM.JAKAUMA		##	Palauttaa lognormaalisen jakauman kertymäfunktion.
+MAX			= MAKS				##	Palauttaa suurimman arvon argumenttiluettelosta.
+MAXA			= MAKSA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, suurimman arvon.
+MEDIAN			= MEDIAANI			##	Palauttaa annettujen lukujen mediaanin.
+MIN			= MIN				##	Palauttaa pienimmän arvon argumenttiluettelosta.
+MINA			= MINA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, pienimmän arvon.
+MODE			= MOODI				##	Palauttaa tietojoukossa useimmin esiintyvän arvon.
+NEGBINOMDIST		= BINOMIJAKAUMA.NEG		##	Palauttaa negatiivisen binomijakauman.
+NORMDIST		= NORM.JAKAUMA			##	Palauttaa normaalijakauman kertymäfunktion.
+NORMINV			= NORM.JAKAUMA.KÄÄNT		##	Palauttaa käänteisen normaalijakauman kertymäfunktion.
+NORMSDIST		= NORM.JAKAUMA.NORMIT		##	Palauttaa normitetun normaalijakauman kertymäfunktion.
+NORMSINV		= NORM.JAKAUMA.NORMIT.KÄÄNT	##	Palauttaa normitetun normaalijakauman kertymäfunktion käänteisarvon.
+PEARSON			= PEARSON			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen.
+PERCENTILE		= PROSENTTIPISTE		##	Palauttaa alueen arvojen k:nnen prosenttipisteen.
+PERCENTRANK		= PROSENTTIJÄRJESTYS		##	Palauttaa tietojoukon arvon prosentuaalisen järjestysluvun.
+PERMUT			= PERMUTAATIO			##	Palauttaa mahdollisten permutaatioiden määrän annetulle objektien määrälle.
+POISSON			= POISSON			##	Palauttaa Poissonin todennäköisyysjakauman.
+PROB			= TODENNÄKÖISYYS		##	Palauttaa todennäköisyyden sille, että arvot ovat tietyltä väliltä.
+QUARTILE		= NELJÄNNES			##	Palauttaa tietoalueen neljänneksen.
+RANK			= ARVON.MUKAAN			##	Palauttaa luvun paikan lukuarvoluettelossa.
+RSQ			= PEARSON.NELIÖ			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen neliön.
+SKEW			= JAKAUMAN.VINOUS		##	Palauttaa jakauman vinouden.
+SLOPE			= KULMAKERROIN			##	Palauttaa lineaarisen regressiosuoran kulmakertoimen.
+SMALL			= PIENI				##	Palauttaa tietojoukon k:nneksi pienimmän arvon.
+STANDARDIZE		= NORMITA			##	Palauttaa normitetun arvon.
+STDEV			= KESKIHAJONTA			##	Laskee populaation keskihajonnan otoksen perusteella.
+STDEVA			= KESKIHAJONTAA			##	Laskee populaation keskihajonnan otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
+STDEVP			= KESKIHAJONTAP			##	Laskee normaalijakautuman koko populaation perusteella.
+STDEVPA			= KESKIHAJONTAPA		##	Laskee populaation keskihajonnan koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
+STEYX			= KESKIVIRHE			##	Palauttaa regression kutakin x-arvoa vastaavan ennustetun y-arvon keskivirheen.
+TDIST			= TJAKAUMA			##	Palauttaa t-jakautuman.
+TINV			= TJAKAUMA.KÄÄNT		##	Palauttaa käänteisen t-jakauman.
+TREND			= SUUNTAUS			##	Palauttaa lineaarisen trendin arvoja.
+TRIMMEAN		= KESKIARVO.TASATTU		##	Palauttaa tietojoukon tasatun keskiarvon.
+TTEST			= TTESTI			##	Palauttaa t-testiin liittyvän todennäköisyyden.
+VAR			= VAR				##	Arvioi populaation varianssia otoksen perusteella.
+VARA			= VARA				##	Laskee populaation varianssin otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
+VARP			= VARP				##	Laskee varianssin koko populaation perusteella.
+VARPA			= VARPA				##	Laskee populaation varianssin koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
+WEIBULL			= WEIBULL			##	Palauttaa Weibullin jakauman.
+ZTEST			= ZTESTI			##	Palauttaa z-testin yksisuuntaisen todennäköisyysarvon.
+
+
+##
+##	Text functions					Tekstifunktiot
+##
+ASC			= ASC				##	Muuntaa merkkijonossa olevat englanninkieliset DBCS- tai katakana-merkit SBCS-merkeiksi.
+BAHTTEXT		= BAHTTEKSTI			##	Muuntaa luvun tekstiksi ß (baht) -valuuttamuotoa käyttämällä.
+CHAR			= MERKKI			##	Palauttaa koodin lukua vastaavan merkin.
+CLEAN			= SIIVOA			##	Poistaa tekstistä kaikki tulostumattomat merkit.
+CODE			= KOODI				##	Palauttaa tekstimerkkijonon ensimmäisen merkin numerokoodin.
+CONCATENATE		= KETJUTA			##	Yhdistää useat merkkijonot yhdeksi merkkijonoksi.
+DOLLAR			= VALUUTTA			##	Muuntaa luvun tekstiksi $ (dollari) -valuuttamuotoa käyttämällä.
+EXACT			= VERTAA			##	Tarkistaa, ovatko kaksi tekstiarvoa samanlaiset.
+FIND			= ETSI				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
+FINDB			= ETSIB				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
+FIXED			= KIINTEÄ			##	Muotoilee luvun tekstiksi, jossa on kiinteä määrä desimaaleja.
+JIS			= JIS				##	Muuntaa merkkijonossa olevat englanninkieliset SBCS- tai katakana-merkit DBCS-merkeiksi.
+LEFT			= VASEN				##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
+LEFTB			= VASENB			##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
+LEN			= PITUUS			##	Palauttaa tekstimerkkijonon merkkien määrän.
+LENB			= PITUUSB			##	Palauttaa tekstimerkkijonon merkkien määrän.
+LOWER			= PIENET			##	Muuntaa tekstin pieniksi kirjaimiksi.
+MID			= POIMI.TEKSTI			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
+MIDB			= POIMI.TEKSTIB			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
+PHONETIC		= FONEETTINEN			##	Hakee foneettiset (furigana) merkit merkkijonosta.
+PROPER			= ERISNIMI			##	Muuttaa merkkijonon kunkin sanan ensimmäisen kirjaimen isoksi.
+REPLACE			= KORVAA			##	Korvaa tekstissä olevat merkit.
+REPLACEB		= KORVAAB			##	Korvaa tekstissä olevat merkit.
+REPT			= TOISTA			##	Toistaa tekstin annetun määrän kertoja.
+RIGHT			= OIKEA				##	Palauttaa tekstiarvon oikeanpuoliset merkit.
+RIGHTB			= OIKEAB			##	Palauttaa tekstiarvon oikeanpuoliset merkit.
+SEARCH			= KÄY.LÄPI			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
+SEARCHB			= KÄY.LÄPIB			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
+SUBSTITUTE		= VAIHDA			##	Korvaa merkkijonossa olevan tekstin toisella.
+T			= T				##	Muuntaa argumentit tekstiksi.
+TEXT			= TEKSTI			##	Muotoilee luvun ja muuntaa sen tekstiksi.
+TRIM			= POISTA.VÄLIT			##	Poistaa välilyönnit tekstistä.
+UPPER			= ISOT				##	Muuntaa tekstin isoiksi kirjaimiksi.
+VALUE			= ARVO				##	Muuntaa tekstiargumentin luvuksi.
diff --git a/lib/PHPExcel/locale/fr/config b/lib/PHPExcel/locale/fr/config
new file mode 100644
index 000000000..1f5db88c4
--- /dev/null
+++ b/lib/PHPExcel/locale/fr/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= €
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NUL!
+DIV0	= #DIV/0!
+VALUE	= #VALEUR!
+REF	= #REF!
+NAME	= #NOM?
+NUM	= #NOMBRE!
+NA	= #N/A
diff --git a/lib/PHPExcel/locale/fr/functions b/lib/PHPExcel/locale/fr/functions
new file mode 100644
index 000000000..03b80e5a4
--- /dev/null
+++ b/lib/PHPExcel/locale/fr/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Fonctions de complément et d’automatisation
+##
+GETPIVOTDATA		= LIREDONNEESTABCROISDYNAMIQUE	##	Renvoie les données stockées dans un rapport de tableau croisé dynamique.
+
+
+##
+##	Cube functions					Fonctions Cube
+##
+CUBEKPIMEMBER		= MEMBREKPICUBE			##	Renvoie un nom, une propriété et une mesure d’indicateur de performance clé et affiche le nom et la propriété dans la cellule. Un indicateur de performance clé est une mesure quantifiable, telle que la marge bénéficiaire brute mensuelle ou la rotation trimestrielle du personnel, utilisée pour évaluer les performances d’une entreprise.
+CUBEMEMBER		= MEMBRECUBE			##	Renvoie un membre ou un uplet dans une hiérarchie de cubes. Utilisez cette fonction pour valider l’existence du membre ou de l’uplet dans le cube.
+CUBEMEMBERPROPERTY	= PROPRIETEMEMBRECUBE		##	Renvoie la valeur d’une propriété de membre du cube. Utilisez cette fonction pour valider l’existence d’un nom de membre dans le cube et pour renvoyer la propriété spécifiée pour ce membre.
+CUBERANKEDMEMBER	= RANGMEMBRECUBE		##	Renvoie le nième membre ou le membre placé à un certain rang dans un ensemble. Utilisez cette fonction pour renvoyer un ou plusieurs éléments d’un ensemble, tels que les meilleurs vendeurs ou les 10 meilleurs étudiants.
+CUBESET			= JEUCUBE			##	Définit un ensemble calculé de membres ou d’uplets en envoyant une expression définie au cube sur le serveur qui crée l’ensemble et le renvoie à Microsoft Office Excel.
+CUBESETCOUNT		= NBJEUCUBE			##	Renvoie le nombre d’éléments dans un jeu.
+CUBEVALUE		= VALEURCUBE			##	Renvoie une valeur d’agrégation issue d’un cube.
+
+
+##
+##	Database functions				Fonctions de base de données
+##
+DAVERAGE		= BDMOYENNE			##	Renvoie la moyenne des entrées de base de données sélectionnées.
+DCOUNT			= BCOMPTE			##	Compte le nombre de cellules d’une base de données qui contiennent des nombres.
+DCOUNTA			= BDNBVAL			##	Compte les cellules non vides d’une base de données.
+DGET			= BDLIRE			##	Extrait d’une base de données un enregistrement unique répondant aux critères spécifiés.
+DMAX			= BDMAX				##	Renvoie la valeur maximale des entrées de base de données sélectionnées.
+DMIN			= BDMIN				##	Renvoie la valeur minimale des entrées de base de données sélectionnées.
+DPRODUCT		= BDPRODUIT			##	Multiplie les valeurs d’un champ particulier des enregistrements d’une base de données, qui répondent aux critères spécifiés.
+DSTDEV			= BDECARTYPE			##	Calcule l’écart type pour un échantillon d’entrées de base de données sélectionnées.
+DSTDEVP			= BDECARTYPEP			##	Calcule l’écart type pour l’ensemble d’une population d’entrées de base de données sélectionnées.
+DSUM			= BDSOMME			##	Ajoute les nombres dans la colonne de champ des enregistrements de la base de données, qui répondent aux critères.
+DVAR			= BDVAR				##	Calcule la variance pour un échantillon d’entrées de base de données sélectionnées.
+DVARP			= BDVARP			##	Calcule la variance pour l’ensemble d’une population d’entrées de base de données sélectionnées.
+
+
+##
+##	Date and time functions				Fonctions de date et d’heure
+##
+DATE			= DATE				##	Renvoie le numéro de série d’une date précise.
+DATEVALUE		= DATEVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
+DAY			= JOUR				##	Convertit un numéro de série en jour du mois.
+DAYS360			= JOURS360			##	Calcule le nombre de jours qui séparent deux dates sur la base d’une année de 360 jours.
+EDATE			= MOIS.DECALER			##	Renvoie le numéro séquentiel de la date qui représente une date spécifiée (l’argument date_départ), corrigée en plus ou en moins du nombre de mois indiqué.
+EOMONTH			= FIN.MOIS			##	Renvoie le numéro séquentiel de la date du dernier jour du mois précédant ou suivant la date_départ du nombre de mois indiqué.
+HOUR			= HEURE				##	Convertit un numéro de série en heure.
+MINUTE			= MINUTE			##	Convertit un numéro de série en minute.
+MONTH			= MOIS				##	Convertit un numéro de série en mois.
+NETWORKDAYS		= NB.JOURS.OUVRES		##	Renvoie le nombre de jours ouvrés entiers compris entre deux dates.
+NOW			= MAINTENANT			##	Renvoie le numéro de série de la date et de l’heure du jour.
+SECOND			= SECONDE			##	Convertit un numéro de série en seconde.
+TIME			= TEMPS				##	Renvoie le numéro de série d’une heure précise.
+TIMEVALUE		= TEMPSVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
+TODAY			= AUJOURDHUI			##	Renvoie le numéro de série de la date du jour.
+WEEKDAY			= JOURSEM			##	Convertit un numéro de série en jour de la semaine.
+WEEKNUM			= NO.SEMAINE			##	Convertit un numéro de série en un numéro représentant l’ordre de la semaine dans l’année.
+WORKDAY			= SERIE.JOUR.OUVRE		##	Renvoie le numéro de série de la date avant ou après le nombre de jours ouvrés spécifiés.
+YEAR			= ANNEE				##	Convertit un numéro de série en année.
+YEARFRAC		= FRACTION.ANNEE		##	Renvoie la fraction de l’année représentant le nombre de jours entre la date de début et la date de fin.
+
+
+##
+##	Engineering functions				Fonctions d’ingénierie
+##
+BESSELI			= BESSELI			##	Renvoie la fonction Bessel modifiée In(x).
+BESSELJ			= BESSELJ			##	Renvoie la fonction Bessel Jn(x).
+BESSELK			= BESSELK			##	Renvoie la fonction Bessel modifiée Kn(x).
+BESSELY			= BESSELY			##	Renvoie la fonction Bessel Yn(x).
+BIN2DEC			= BINDEC			##	Convertit un nombre binaire en nombre décimal.
+BIN2HEX			= BINHEX			##	Convertit un nombre binaire en nombre hexadécimal.
+BIN2OCT			= BINOCT			##	Convertit un nombre binaire en nombre octal.
+COMPLEX			= COMPLEXE			##	Convertit des coefficients réel et imaginaire en un nombre complexe.
+CONVERT			= CONVERT			##	Convertit un nombre d’une unité de mesure à une autre.
+DEC2BIN			= DECBIN			##	Convertit un nombre décimal en nombre binaire.
+DEC2HEX			= DECHEX			##	Convertit un nombre décimal en nombre hexadécimal.
+DEC2OCT			= DECOCT			##	Convertit un nombre décimal en nombre octal.
+DELTA			= DELTA				##	Teste l’égalité de deux nombres.
+ERF			= ERF				##	Renvoie la valeur de la fonction d’erreur.
+ERFC			= ERFC				##	Renvoie la valeur de la fonction d’erreur complémentaire.
+GESTEP			= SUP.SEUIL			##	Teste si un nombre est supérieur à une valeur de seuil.
+HEX2BIN			= HEXBIN			##	Convertit un nombre hexadécimal en nombre binaire.
+HEX2DEC			= HEXDEC			##	Convertit un nombre hexadécimal en nombre décimal.
+HEX2OCT			= HEXOCT			##	Convertit un nombre hexadécimal en nombre octal.
+IMABS			= COMPLEXE.MODULE		##	Renvoie la valeur absolue (module) d’un nombre complexe.
+IMAGINARY		= COMPLEXE.IMAGINAIRE		##	Renvoie le coefficient imaginaire d’un nombre complexe.
+IMARGUMENT		= COMPLEXE.ARGUMENT		##	Renvoie l’argument thêta, un angle exprimé en radians.
+IMCONJUGATE		= COMPLEXE.CONJUGUE		##	Renvoie le nombre complexe conjugué d’un nombre complexe.
+IMCOS			= IMCOS				##	Renvoie le cosinus d’un nombre complexe.
+IMDIV			= COMPLEXE.DIV			##	Renvoie le quotient de deux nombres complexes.
+IMEXP			= COMPLEXE.EXP			##	Renvoie la fonction exponentielle d’un nombre complexe.
+IMLN			= COMPLEXE.LN			##	Renvoie le logarithme népérien d’un nombre complexe.
+IMLOG10			= COMPLEXE.LOG10		##	Calcule le logarithme en base 10 d’un nombre complexe.
+IMLOG2			= COMPLEXE.LOG2			##	Calcule le logarithme en base 2 d’un nombre complexe.
+IMPOWER			= COMPLEXE.PUISSANCE		##	Renvoie un nombre complexe élevé à une puissance entière.
+IMPRODUCT		= COMPLEXE.PRODUIT		##	Renvoie le produit de plusieurs nombres complexes.
+IMREAL			= COMPLEXE.REEL			##	Renvoie le coefficient réel d’un nombre complexe.
+IMSIN			= COMPLEXE.SIN			##	Renvoie le sinus d’un nombre complexe.
+IMSQRT			= COMPLEXE.RACINE		##	Renvoie la racine carrée d’un nombre complexe.
+IMSUB			= COMPLEXE.DIFFERENCE		##	Renvoie la différence entre deux nombres complexes.
+IMSUM			= COMPLEXE.SOMME		##	Renvoie la somme de plusieurs nombres complexes.
+OCT2BIN			= OCTBIN			##	Convertit un nombre octal en nombre binaire.
+OCT2DEC			= OCTDEC			##	Convertit un nombre octal en nombre décimal.
+OCT2HEX			= OCTHEX			##	Convertit un nombre octal en nombre hexadécimal.
+
+
+##
+##	Financial functions				Fonctions financières
+##
+ACCRINT			= INTERET.ACC			##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu périodiquement.
+ACCRINTM		= INTERET.ACC.MAT		##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu à l’échéance.
+AMORDEGRC		= AMORDEGRC			##	Renvoie l’amortissement correspondant à chaque période comptable en utilisant un coefficient d’amortissement.
+AMORLINC		= AMORLINC			##	Renvoie l’amortissement d’un bien à la fin d’une période fiscale donnée.
+COUPDAYBS		= NB.JOURS.COUPON.PREC		##	Renvoie le nombre de jours entre le début de la période de coupon et la date de liquidation.
+COUPDAYS		= NB.JOURS.COUPONS		##	Renvoie le nombre de jours pour la période du coupon contenant la date de liquidation.
+COUPDAYSNC		= NB.JOURS.COUPON.SUIV		##	Renvoie le nombre de jours entre la date de liquidation et la date du coupon suivant la date de liquidation.
+COUPNCD			= DATE.COUPON.SUIV		##	Renvoie la première date de coupon ultérieure à la date de règlement.
+COUPNUM			= NB.COUPONS			##	Renvoie le nombre de coupons dus entre la date de règlement et la date d’échéance.
+COUPPCD			= DATE.COUPON.PREC		##	Renvoie la date de coupon précédant la date de règlement.
+CUMIPMT			= CUMUL.INTER			##	Renvoie l’intérêt cumulé payé sur un emprunt entre deux périodes.
+CUMPRINC		= CUMUL.PRINCPER		##	Renvoie le montant cumulé des remboursements du capital d’un emprunt effectués entre deux périodes.
+DB			= DB				##	Renvoie l’amortissement d’un bien pour une période spécifiée en utilisant la méthode de l’amortissement dégressif à taux fixe.
+DDB			= DDB				##	Renvoie l’amortissement d’un bien pour toute période spécifiée, en utilisant la méthode de l’amortissement dégressif à taux double ou selon un coefficient à spécifier.
+DISC			= TAUX.ESCOMPTE			##	Calcule le taux d’escompte d’une transaction.
+DOLLARDE		= PRIX.DEC			##	Convertit un prix en euros, exprimé sous forme de fraction, en un prix en euros exprimé sous forme de nombre décimal.
+DOLLARFR		= PRIX.FRAC			##	Convertit un prix en euros, exprimé sous forme de nombre décimal, en un prix en euros exprimé sous forme de fraction.
+DURATION		= DUREE				##	Renvoie la durée, en années, d’un titre dont l’intérêt est perçu périodiquement.
+EFFECT			= TAUX.EFFECTIF			##	Renvoie le taux d’intérêt annuel effectif.
+FV			= VC				##	Renvoie la valeur future d’un investissement.
+FVSCHEDULE		= VC.PAIEMENTS			##	Calcule la valeur future d’un investissement en appliquant une série de taux d’intérêt composites.
+INTRATE			= TAUX.INTERET			##	Affiche le taux d’intérêt d’un titre totalement investi.
+IPMT			= INTPER			##	Calcule le montant des intérêts d’un investissement pour une période donnée.
+IRR			= TRI				##	Calcule le taux de rentabilité interne d’un investissement pour une succession de trésoreries.
+ISPMT			= ISPMT				##	Calcule le montant des intérêts d’un investissement pour une période donnée.
+MDURATION		= DUREE.MODIFIEE		##	Renvoie la durée de Macauley modifiée pour un titre ayant une valeur nominale hypothétique de 100_euros.
+MIRR			= TRIM				##	Calcule le taux de rentabilité interne lorsque les paiements positifs et négatifs sont financés à des taux différents.
+NOMINAL			= TAUX.NOMINAL			##	Calcule le taux d’intérêt nominal annuel.
+NPER			= NPM				##	Renvoie le nombre de versements nécessaires pour rembourser un emprunt.
+NPV			= VAN				##	Calcule la valeur actuelle nette d’un investissement basé sur une série de décaissements et un taux d’escompte.
+ODDFPRICE		= PRIX.PCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
+ODDFYIELD		= REND.PCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la première période de coupon est irrégulière.
+ODDLPRICE		= PRIX.DCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
+ODDLYIELD		= REND.DCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la dernière période de coupon est irrégulière.
+PMT			= VPM				##	Calcule le paiement périodique d’un investissement donné.
+PPMT			= PRINCPER			##	Calcule, pour une période donnée, la part de remboursement du principal d’un investissement.
+PRICE			= PRIX.TITRE			##	Renvoie le prix d’un titre rapportant des intérêts périodiques, pour une valeur nominale de 100 euros.
+PRICEDISC		= VALEUR.ENCAISSEMENT		##	Renvoie la valeur d’encaissement d’un escompte commercial, pour une valeur nominale de 100 euros.
+PRICEMAT		= PRIX.TITRE.ECHEANCE		##	Renvoie le prix d’un titre dont la valeur nominale est 100 euros et qui rapporte des intérêts à l’échéance.
+PV			= PV				##	Calcule la valeur actuelle d’un investissement.
+RATE			= TAUX				##	Calcule le taux d’intérêt par période pour une annuité.
+RECEIVED		= VALEUR.NOMINALE		##	Renvoie la valeur nominale à échéance d’un effet de commerce.
+SLN			= AMORLIN			##	Calcule l’amortissement linéaire d’un bien pour une période donnée.
+SYD			= SYD				##	Calcule l’amortissement d’un bien pour une période donnée sur la base de la méthode américaine Sum-of-Years Digits (amortissement dégressif à taux décroissant appliqué à une valeur constante).
+TBILLEQ			= TAUX.ESCOMPTE.R		##	Renvoie le taux d’escompte rationnel d’un bon du Trésor.
+TBILLPRICE		= PRIX.BON.TRESOR		##	Renvoie le prix d’un bon du Trésor d’une valeur nominale de 100 euros.
+TBILLYIELD		= RENDEMENT.BON.TRESOR		##	Calcule le taux de rendement d’un bon du Trésor.
+VDB			= VDB				##	Renvoie l’amortissement d’un bien pour une période spécifiée ou partielle en utilisant une méthode de l’amortissement dégressif à taux fixe.
+XIRR			= TRI.PAIEMENTS			##	Calcule le taux de rentabilité interne d’un ensemble de paiements non périodiques.
+XNPV			= VAN.PAIEMENTS			##	Renvoie la valeur actuelle nette d’un ensemble de paiements non périodiques.
+YIELD			= RENDEMENT.TITRE		##	Calcule le rendement d’un titre rapportant des intérêts périodiquement.
+YIELDDISC		= RENDEMENT.SIMPLE		##	Calcule le taux de rendement d’un emprunt à intérêt simple (par exemple, un bon du Trésor).
+YIELDMAT		= RENDEMENT.TITRE.ECHEANCE	##	Renvoie le rendement annuel d’un titre qui rapporte des intérêts à l’échéance.
+
+
+##
+##	Information functions				Fonctions d’information
+##
+CELL			= CELLULE			##	Renvoie des informations sur la mise en forme, l’emplacement et le contenu d’une cellule.
+ERROR.TYPE		= TYPE.ERREUR			##	Renvoie un nombre correspondant à un type d’erreur.
+INFO			= INFORMATIONS			##	Renvoie des informations sur l’environnement d’exploitation actuel.
+ISBLANK			= ESTVIDE			##	Renvoie VRAI si l’argument valeur est vide.
+ISERR			= ESTERR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur, sauf #N/A.
+ISERROR			= ESTERREUR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur.
+ISEVEN			= EST.PAIR			##	Renvoie VRAI si le chiffre est pair.
+ISLOGICAL		= ESTLOGIQUE			##	Renvoie VRAI si l’argument valeur fait référence à une valeur logique.
+ISNA			= ESTNA				##	Renvoie VRAI si l’argument valeur fait référence à la valeur d’erreur #N/A.
+ISNONTEXT		= ESTNONTEXTE			##	Renvoie VRAI si l’argument valeur ne se présente pas sous forme de texte.
+ISNUMBER		= ESTNUM			##	Renvoie VRAI si l’argument valeur représente un nombre.
+ISODD			= EST.IMPAIR			##	Renvoie VRAI si le chiffre est impair.
+ISREF			= ESTREF			##	Renvoie VRAI si l’argument valeur est une référence.
+ISTEXT			= ESTTEXTE			##	Renvoie VRAI si l’argument valeur se présente sous forme de texte.
+N			= N				##	Renvoie une valeur convertie en nombre.
+NA			= NA				##	Renvoie la valeur d’erreur #N/A.
+TYPE			= TYPE				##	Renvoie un nombre indiquant le type de données d’une valeur.
+
+
+##
+##	Logical functions				Fonctions logiques
+##
+AND			= ET				##	Renvoie VRAI si tous ses arguments sont VRAI.
+FALSE			= FAUX				##	Renvoie la valeur logique FAUX.
+IF			= SI				##	Spécifie un test logique à effectuer.
+IFERROR			= SIERREUR			##	Renvoie une valeur que vous spécifiez si une formule génère une erreur ; sinon, elle renvoie le résultat de la formule.
+NOT			= NON				##	Inverse la logique de cet argument.
+OR			= OU				##	Renvoie VRAI si un des arguments est VRAI.
+TRUE			= VRAI				##	Renvoie la valeur logique VRAI.
+
+
+##
+##	Lookup and reference functions			Fonctions de recherche et de référence
+##
+ADDRESS			= ADRESSE			##	Renvoie une référence sous forme de texte à une seule cellule d’une feuille de calcul.
+AREAS			= ZONES				##	Renvoie le nombre de zones dans une référence.
+CHOOSE			= CHOISIR			##	Choisit une valeur dans une liste.
+COLUMN			= COLONNE			##	Renvoie le numéro de colonne d’une référence.
+COLUMNS			= COLONNES			##	Renvoie le nombre de colonnes dans une référence.
+HLOOKUP			= RECHERCHEH			##	Effectue une recherche dans la première ligne d’une matrice et renvoie la valeur de la cellule indiquée.
+HYPERLINK		= LIEN_HYPERTEXTE		##	Crée un raccourci ou un renvoi qui ouvre un document stocké sur un serveur réseau, sur un réseau Intranet ou sur Internet.
+INDEX			= INDEX				##	Utilise un index pour choisir une valeur provenant d’une référence ou d’une matrice.
+INDIRECT		= INDIRECT			##	Renvoie une référence indiquée par une valeur de texte.
+LOOKUP			= RECHERCHE			##	Recherche des valeurs dans un vecteur ou une matrice.
+MATCH			= EQUIV				##	Recherche des valeurs dans une référence ou une matrice.
+OFFSET			= DECALER			##	Renvoie une référence décalée par rapport à une référence donnée.
+ROW			= LIGNE				##	Renvoie le numéro de ligne d’une référence.
+ROWS			= LIGNES			##	Renvoie le nombre de lignes dans une référence.
+RTD			= RTD				##	Extrait les données en temps réel à partir d’un programme prenant en charge l’automation COM (Automation : utilisation des objets d'une application à partir d'une autre application ou d'un autre outil de développement. Autrefois appelée OLE Automation, Automation est une norme industrielle et une fonctionnalité du modèle d'objet COM (Component Object Model).).
+TRANSPOSE		= TRANSPOSE			##	Renvoie la transposition d’une matrice.
+VLOOKUP			= RECHERCHEV			##	Effectue une recherche dans la première colonne d’une matrice et se déplace sur la ligne pour renvoyer la valeur d’une cellule.
+
+
+##
+##	Math and trigonometry functions			Fonctions mathématiques et trigonométriques
+##
+ABS			= ABS				##	Renvoie la valeur absolue d’un nombre.
+ACOS			= ACOS				##	Renvoie l’arccosinus d’un nombre.
+ACOSH			= ACOSH				##	Renvoie le cosinus hyperbolique inverse d’un nombre.
+ASIN			= ASIN				##	Renvoie l’arcsinus d’un nombre.
+ASINH			= ASINH				##	Renvoie le sinus hyperbolique inverse d’un nombre.
+ATAN			= ATAN				##	Renvoie l’arctangente d’un nombre.
+ATAN2			= ATAN2				##	Renvoie l’arctangente des coordonnées x et y.
+ATANH			= ATANH				##	Renvoie la tangente hyperbolique inverse d’un nombre.
+CEILING			= PLAFOND			##	Arrondit un nombre au nombre entier le plus proche ou au multiple le plus proche de l’argument précision en s’éloignant de zéro.
+COMBIN			= COMBIN			##	Renvoie le nombre de combinaisons que l’on peut former avec un nombre donné d’objets.
+COS			= COS				##	Renvoie le cosinus d’un nombre.
+COSH			= COSH				##	Renvoie le cosinus hyperbolique d’un nombre.
+DEGREES			= DEGRES			##	Convertit des radians en degrés.
+EVEN			= PAIR				##	Arrondit un nombre au nombre entier pair le plus proche en s’éloignant de zéro.
+EXP			= EXP				##	Renvoie e élevé à la puissance d’un nombre donné.
+FACT			= FACT				##	Renvoie la factorielle d’un nombre.
+FACTDOUBLE		= FACTDOUBLE			##	Renvoie la factorielle double d’un nombre.
+FLOOR			= PLANCHER			##	Arrondit un nombre en tendant vers 0 (zéro).
+GCD			= PGCD				##	Renvoie le plus grand commun diviseur.
+INT			= ENT				##	Arrondit un nombre à l’entier immédiatement inférieur.
+LCM			= PPCM				##	Renvoie le plus petit commun multiple.
+LN			= LN				##	Renvoie le logarithme népérien d’un nombre.
+LOG			= LOG				##	Renvoie le logarithme d’un nombre dans la base spécifiée.
+LOG10			= LOG10				##	Calcule le logarithme en base 10 d’un nombre.
+MDETERM			= DETERMAT			##	Renvoie le déterminant d’une matrice.
+MINVERSE		= INVERSEMAT			##	Renvoie la matrice inverse d’une matrice.
+MMULT			= PRODUITMAT			##	Renvoie le produit de deux matrices.
+MOD			= MOD				##	Renvoie le reste d’une division.
+MROUND			= ARRONDI.AU.MULTIPLE		##	Donne l’arrondi d’un nombre au multiple spécifié.
+MULTINOMIAL		= MULTINOMIALE			##	Calcule la multinomiale d’un ensemble de nombres.
+ODD			= IMPAIR			##	Renvoie le nombre, arrondi à la valeur du nombre entier impair le plus proche en s’éloignant de zéro.
+PI			= PI				##	Renvoie la valeur de pi.
+POWER			= PUISSANCE			##	Renvoie la valeur du nombre élevé à une puissance.
+PRODUCT			= PRODUIT			##	Multiplie ses arguments.
+QUOTIENT		= QUOTIENT			##	Renvoie la partie entière du résultat d’une division.
+RADIANS			= RADIANS			##	Convertit des degrés en radians.
+RAND			= ALEA				##	Renvoie un nombre aléatoire compris entre 0 et 1.
+RANDBETWEEN		= ALEA.ENTRE.BORNES		##	Renvoie un nombre aléatoire entre les nombres que vous spécifiez.
+ROMAN			= ROMAIN			##	Convertit des chiffres arabes en chiffres romains, sous forme de texte.
+ROUND			= ARRONDI			##	Arrondit un nombre au nombre de chiffres indiqué.
+ROUNDDOWN		= ARRONDI.INF			##	Arrondit un nombre en tendant vers 0 (zéro).
+ROUNDUP			= ARRONDI.SUP			##	Arrondit un nombre à l’entier supérieur, en s’éloignant de zéro.
+SERIESSUM		= SOMME.SERIES			##	Renvoie la somme d’une série géométrique en s’appuyant sur la formule suivante :
+SIGN			= SIGNE				##	Renvoie le signe d’un nombre.
+SIN			= SIN				##	Renvoie le sinus d’un angle donné.
+SINH			= SINH				##	Renvoie le sinus hyperbolique d’un nombre.
+SQRT			= RACINE			##	Renvoie la racine carrée d’un nombre.
+SQRTPI			= RACINE.PI			##	Renvoie la racine carrée de (nombre * pi).
+SUBTOTAL		= SOUS.TOTAL			##	Renvoie un sous-total dans une liste ou une base de données.
+SUM			= SOMME				##	Calcule la somme de ses arguments.
+SUMIF			= SOMME.SI			##	Additionne les cellules spécifiées si elles répondent à un critère donné.
+SUMIFS			= SOMME.SI.ENS			##	Ajoute les cellules d’une plage qui répondent à plusieurs critères.
+SUMPRODUCT		= SOMMEPROD			##	Multiplie les valeurs correspondantes des matrices spécifiées et calcule la somme de ces produits.
+SUMSQ			= SOMME.CARRES			##	Renvoie la somme des carrés des arguments.
+SUMX2MY2		= SOMME.X2MY2			##	Renvoie la somme de la différence des carrés des valeurs correspondantes de deux matrices.
+SUMX2PY2		= SOMME.X2PY2			##	Renvoie la somme de la somme des carrés des valeurs correspondantes de deux matrices.
+SUMXMY2			= SOMME.XMY2			##	Renvoie la somme des carrés des différences entre les valeurs correspondantes de deux matrices.
+TAN			= TAN				##	Renvoie la tangente d’un nombre.
+TANH			= TANH				##	Renvoie la tangente hyperbolique d’un nombre.
+TRUNC			= TRONQUE			##	Renvoie la partie entière d’un nombre.
+
+
+##
+##	Statistical functions				Fonctions statistiques
+##
+AVEDEV			= ECART.MOYEN			##	Renvoie la moyenne des écarts absolus observés dans la moyenne des points de données.
+AVERAGE			= MOYENNE			##	Renvoie la moyenne de ses arguments.
+AVERAGEA		= AVERAGEA			##	Renvoie la moyenne de ses arguments, nombres, texte et valeurs logiques inclus.
+AVERAGEIF		= MOYENNE.SI			##	Renvoie la moyenne (arithmétique) de toutes les cellules d’une plage qui répondent à des critères donnés.
+AVERAGEIFS		= MOYENNE.SI.ENS		##	Renvoie la moyenne (arithmétique) de toutes les cellules qui répondent à plusieurs critères.
+BETADIST		= LOI.BETA			##	Renvoie la fonction de distribution cumulée.
+BETAINV			= BETA.INVERSE			##	Renvoie l’inverse de la fonction de distribution cumulée pour une distribution bêta spécifiée.
+BINOMDIST		= LOI.BINOMIALE			##	Renvoie la probabilité d’une variable aléatoire discrète suivant la loi binomiale.
+CHIDIST			= LOI.KHIDEUX			##	Renvoie la probabilité unilatérale de la distribution khi-deux.
+CHIINV			= KHIDEUX.INVERSE		##	Renvoie l’inverse de la probabilité unilatérale de la distribution khi-deux.
+CHITEST			= TEST.KHIDEUX			##	Renvoie le test d’indépendance.
+CONFIDENCE		= INTERVALLE.CONFIANCE		##	Renvoie l’intervalle de confiance pour une moyenne de population.
+CORREL			= COEFFICIENT.CORRELATION	##	Renvoie le coefficient de corrélation entre deux séries de données.
+COUNT			= NB				##	Détermine les nombres compris dans la liste des arguments.
+COUNTA			= NBVAL				##	Détermine le nombre de valeurs comprises dans la liste des arguments.
+COUNTBLANK		= NB.VIDE			##	Compte le nombre de cellules vides dans une plage.
+COUNTIF			= NB.SI				##	Compte le nombre de cellules qui répondent à un critère donné dans une plage.
+COUNTIFS		= NB.SI.ENS			##	Compte le nombre de cellules à l’intérieur d’une plage qui répondent à plusieurs critères.
+COVAR			= COVARIANCE			##	Renvoie la covariance, moyenne des produits des écarts pour chaque série d’observations.
+CRITBINOM		= CRITERE.LOI.BINOMIALE		##	Renvoie la plus petite valeur pour laquelle la distribution binomiale cumulée est inférieure ou égale à une valeur de critère.
+DEVSQ			= SOMME.CARRES.ECARTS		##	Renvoie la somme des carrés des écarts.
+EXPONDIST		= LOI.EXPONENTIELLE		##	Renvoie la distribution exponentielle.
+FDIST			= LOI.F				##	Renvoie la distribution de probabilité F.
+FINV			= INVERSE.LOI.F			##	Renvoie l’inverse de la distribution de probabilité F.
+FISHER			= FISHER			##	Renvoie la transformation de Fisher.
+FISHERINV		= FISHER.INVERSE		##	Renvoie l’inverse de la transformation de Fisher.
+FORECAST		= PREVISION			##	Calcule une valeur par rapport à une tendance linéaire.
+FREQUENCY		= FREQUENCE			##	Calcule la fréquence d’apparition des valeurs dans une plage de valeurs, puis renvoie des nombres sous forme de matrice verticale.
+FTEST			= TEST.F			##	Renvoie le résultat d’un test F.
+GAMMADIST		= LOI.GAMMA			##	Renvoie la probabilité d’une variable aléatoire suivant une loi Gamma.
+GAMMAINV		= LOI.GAMMA.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi Gamma.
+GAMMALN			= LNGAMMA			##	Renvoie le logarithme népérien de la fonction Gamma, G(x)
+GEOMEAN			= MOYENNE.GEOMETRIQUE		##	Renvoie la moyenne géométrique.
+GROWTH			= CROISSANCE			##	Calcule des valeurs par rapport à une tendance exponentielle.
+HARMEAN			= MOYENNE.HARMONIQUE		##	Renvoie la moyenne harmonique.
+HYPGEOMDIST		= LOI.HYPERGEOMETRIQUE		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi hypergéométrique.
+INTERCEPT		= ORDONNEE.ORIGINE		##	Renvoie l’ordonnée à l’origine d’une droite de régression linéaire.
+KURT			= KURTOSIS			##	Renvoie le kurtosis d’une série de données.
+LARGE			= GRANDE.VALEUR			##	Renvoie la k-ième plus grande valeur d’une série de données.
+LINEST			= DROITEREG			##	Renvoie les paramètres d’une tendance linéaire.
+LOGEST			= LOGREG			##	Renvoie les paramètres d’une tendance exponentielle.
+LOGINV			= LOI.LOGNORMALE.INVERSE	##	Renvoie l’inverse de la probabilité pour une variable aléatoire suivant la loi lognormale.
+LOGNORMDIST		= LOI.LOGNORMALE		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi lognormale.
+MAX			= MAX				##	Renvoie la valeur maximale contenue dans une liste d’arguments.
+MAXA			= MAXA				##	Renvoie la valeur maximale d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
+MEDIAN			= MEDIANE			##	Renvoie la valeur médiane des nombres donnés.
+MIN			= MIN				##	Renvoie la valeur minimale contenue dans une liste d’arguments.
+MINA			= MINA				##	Renvoie la plus petite valeur d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
+MODE			= MODE				##	Renvoie la valeur la plus courante d’une série de données.
+NEGBINOMDIST		= LOI.BINOMIALE.NEG		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi binomiale négative.
+NORMDIST		= LOI.NORMALE			##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale.
+NORMINV			= LOI.NORMALE.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi normale standard.
+NORMSDIST		= LOI.NORMALE.STANDARD		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale standard.
+NORMSINV		= LOI.NORMALE.STANDARD.INVERSE	##	Renvoie l’inverse de la distribution cumulée normale standard.
+PEARSON			= PEARSON			##	Renvoie le coefficient de corrélation d’échantillonnage de Pearson.
+PERCENTILE		= CENTILE			##	Renvoie le k-ième centile des valeurs d’une plage.
+PERCENTRANK		= RANG.POURCENTAGE		##	Renvoie le rang en pourcentage d’une valeur d’une série de données.
+PERMUT			= PERMUTATION			##	Renvoie le nombre de permutations pour un nombre donné d’objets.
+POISSON			= LOI.POISSON			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Poisson.
+PROB			= PROBABILITE			##	Renvoie la probabilité que des valeurs d’une plage soient comprises entre deux limites.
+QUARTILE		= QUARTILE			##	Renvoie le quartile d’une série de données.
+RANK			= RANG				##	Renvoie le rang d’un nombre contenu dans une liste.
+RSQ			= COEFFICIENT.DETERMINATION	##	Renvoie la valeur du coefficient de détermination R^2 d’une régression linéaire.
+SKEW			= COEFFICIENT.ASYMETRIE		##	Renvoie l’asymétrie d’une distribution.
+SLOPE			= PENTE				##	Renvoie la pente d’une droite de régression linéaire.
+SMALL			= PETITE.VALEUR			##	Renvoie la k-ième plus petite valeur d’une série de données.
+STANDARDIZE		= CENTREE.REDUITE		##	Renvoie une valeur centrée réduite.
+STDEV			= ECARTYPE			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population.
+STDEVA			= STDEVA			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques inclus.
+STDEVP			= ECARTYPEP			##	Calcule l’écart type d’une population à partir de la population entière.
+STDEVPA			= STDEVPA			##	Calcule l’écart type d’une population à partir de l’ensemble de la population, nombres, texte et valeurs logiques inclus.
+STEYX			= ERREUR.TYPE.XY		##	Renvoie l’erreur type de la valeur y prévue pour chaque x de la régression.
+TDIST			= LOI.STUDENT			##	Renvoie la probabilité d’une variable aléatoire suivant une loi T de Student.
+TINV			= LOI.STUDENT.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi T de Student.
+TREND			= TENDANCE			##	Renvoie des valeurs par rapport à une tendance linéaire.
+TRIMMEAN		= MOYENNE.REDUITE		##	Renvoie la moyenne de l’intérieur d’une série de données.
+TTEST			= TEST.STUDENT			##	Renvoie la probabilité associée à un test T de Student.
+VAR			= VAR				##	Calcule la variance sur la base d’un échantillon.
+VARA			= VARA				##	Estime la variance d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques incluses.
+VARP			= VAR.P				##	Calcule la variance sur la base de l’ensemble de la population.
+VARPA			= VARPA				##	Calcule la variance d’une population en se basant sur la population entière, nombres, texte et valeurs logiques inclus.
+WEIBULL			= LOI.WEIBULL			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Weibull.
+ZTEST			= TEST.Z			##	Renvoie la valeur de probabilité unilatérale d’un test z.
+
+
+##
+##	Text functions					Fonctions de texte
+##
+ASC			= ASC				##	Change les caractères anglais ou katakana à pleine chasse (codés sur deux octets) à l’intérieur d’une chaîne de caractères en caractères à demi-chasse (codés sur un octet).
+BAHTTEXT		= BAHTTEXT			##	Convertit un nombre en texte en utilisant le format monétaire ß (baht).
+CHAR			= CAR				##	Renvoie le caractère spécifié par le code numérique.
+CLEAN			= EPURAGE			##	Supprime tous les caractères de contrôle du texte.
+CODE			= CODE				##	Renvoie le numéro de code du premier caractère du texte.
+CONCATENATE		= CONCATENER			##	Assemble plusieurs éléments textuels de façon à n’en former qu’un seul.
+DOLLAR			= EURO				##	Convertit un nombre en texte en utilisant le format monétaire € (euro).
+EXACT			= EXACT				##	Vérifie si deux valeurs de texte sont identiques.
+FIND			= TROUVE			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
+FINDB			= TROUVERB			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
+FIXED			= CTXT				##	Convertit un nombre au format texte avec un nombre de décimales spécifié.
+JIS			= JIS				##	Change les caractères anglais ou katakana à demi-chasse (codés sur un octet) à l’intérieur d’une chaîne de caractères en caractères à à pleine chasse (codés sur deux octets).
+LEFT			= GAUCHE			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
+LEFTB			= GAUCHEB			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
+LEN			= NBCAR				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
+LENB			= LENB				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
+LOWER			= MINUSCULE			##	Convertit le texte en minuscules.
+MID			= STXT				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
+MIDB			= STXTB				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
+PHONETIC		= PHONETIQUE			##	Extrait les caractères phonétiques (furigana) d’une chaîne de texte.
+PROPER			= NOMPROPRE			##	Met en majuscules la première lettre de chaque mot dans une chaîne textuelle.
+REPLACE			= REMPLACER			##	Remplace des caractères dans un texte.
+REPLACEB		= REMPLACERB			##	Remplace des caractères dans un texte.
+REPT			= REPT				##	Répète un texte un certain nombre de fois.
+RIGHT			= DROITE			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
+RIGHTB			= DROITEB			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
+SEARCH			= CHERCHE			##	Trouve un texte dans un autre texte (sans respecter la casse).
+SEARCHB			= CHERCHERB			##	Trouve un texte dans un autre texte (sans respecter la casse).
+SUBSTITUTE		= SUBSTITUE			##	Remplace l’ancien texte d’une chaîne de caractères par un nouveau.
+T			= T				##	Convertit ses arguments en texte.
+TEXT			= TEXTE				##	Convertit un nombre au format texte.
+TRIM			= SUPPRESPACE			##	Supprime les espaces du texte.
+UPPER			= MAJUSCULE			##	Convertit le texte en majuscules.
+VALUE			= CNUM				##	Convertit un argument textuel en nombre
diff --git a/lib/PHPExcel/locale/hu/config b/lib/PHPExcel/locale/hu/config
new file mode 100644
index 000000000..080b2018f
--- /dev/null
+++ b/lib/PHPExcel/locale/hu/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= Ft
+
+
+##
+##	Excel Error Codes	(For future use)
+##
+NULL	= #NULLA!
+DIV0	= #ZÉRÓOSZTÓ!
+VALUE	= #ÉRTÉK!
+REF	= #HIV!
+NAME	= #NÉV?
+NUM	= #SZÁM!
+NA	= #HIÁNYZIK
diff --git a/lib/PHPExcel/locale/hu/functions b/lib/PHPExcel/locale/hu/functions
new file mode 100644
index 000000000..200d3f71f
--- /dev/null
+++ b/lib/PHPExcel/locale/hu/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Bővítmények és automatizálási függvények
+##
+GETPIVOTDATA		= KIMUTATÁSADATOT.VESZ		##	A kimutatásokban tárolt adatok visszaadására használható.
+
+
+##
+##	Cube functions Kockafüggvények   
+##
+CUBEKPIMEMBER		= KOCKA.FŐTELJMUT		##	Egy fő teljesítménymutató (KPI) nevét, tulajdonságát és mértékegységét adja eredményül, a nevet és a tulajdonságot megjeleníti a cellában. A KPI-k számszerűsíthető mérési lehetőséget jelentenek – ilyen mutató például a havi bruttó nyereség vagy az egy alkalmazottra jutó negyedéves forgalom –, egy szervezet teljesítményének nyomonkövetésére használhatók.
+CUBEMEMBER		= KOCKA.TAG			##	Kockahierachia tagját vagy rekordját adja eredményül. Ellenőrizhető vele, hogy szerepel-e a kockában az adott tag vagy rekord.
+CUBEMEMBERPROPERTY	= KOCKA.TAG.TUL			##	A kocka egyik tagtulajdonságának értékét adja eredményül. Használatával ellenőrizhető, hogy szerepel-e egy tagnév a kockában, eredménye pedig az erre a tagra vonatkozó, megadott tulajdonság.
+CUBERANKEDMEMBER	= KOCKA.HALM.ELEM		##	Egy halmaz rangsor szerinti n-edik tagját adja eredményül. Használatával egy halmaz egy vagy több elemét kaphatja meg, például a legnagyobb teljesítményű üzletkötőt vagy a 10 legjobb tanulót.
+CUBESET			= KOCKA.HALM			##	Számított tagok vagy rekordok halmazát adja eredményül, ehhez egy beállított kifejezést elküld a kiszolgálón található kockának, majd ezt a halmazt adja vissza a Microsoft Office Excel alkalmazásnak.
+CUBESETCOUNT		= KOCKA.HALM.DB			##	Egy halmaz elemszámát adja eredményül.
+CUBEVALUE		= KOCKA.ÉRTÉK			##	Kockából összesített értéket ad eredményül.
+
+
+##
+##	Database functions				Adatbázis-kezelő függvények
+##
+DAVERAGE		= AB.ÁTLAG			##	A kijelölt adatbáziselemek átlagát számítja ki.
+DCOUNT			= AB.DARAB			##	Megszámolja, hogy az adatbázisban hány cella tartalmaz számokat.
+DCOUNTA			= AB.DARAB2			##	Megszámolja az adatbázisban lévő nem üres cellákat.
+DGET			= AB.MEZŐ			##	Egy adatbázisból egyetlen olyan rekordot ad vissza, amely megfelel a megadott feltételeknek.
+DMAX			= AB.MAX			##	A kiválasztott adatbáziselemek közül a legnagyobb értéket adja eredményül.
+DMIN			= AB.MIN			##	A kijelölt adatbáziselemek közül a legkisebb értéket adja eredményül.
+DPRODUCT		= AB.SZORZAT			##	Az adatbázis megadott feltételeknek eleget tevő rekordjaira összeszorozza a megadott mezőben található számértékeket, és eredményül ezt a szorzatot adja.
+DSTDEV			= AB.SZÓRÁS			##	A kijelölt adatbáziselemek egy mintája alapján megbecsüli a szórást.
+DSTDEVP			= AB.SZÓRÁS2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórást.
+DSUM			= AB.SZUM			##	Összeadja a feltételnek megfelelő adatbázisrekordok mezőoszlopában a számokat.
+DVAR			= AB.VAR			##	A kijelölt adatbáziselemek mintája alapján becslést ad a szórásnégyzetre.
+DVARP			= AB.VAR2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórásnégyzetet.
+
+
+##
+##	Date and time functions				Dátumfüggvények
+##
+DATE			= DÁTUM				##	Adott dátum dátumértékét adja eredményül.
+DATEVALUE		= DÁTUMÉRTÉK			##	Szövegként megadott dátumot dátumértékké alakít át.
+DAY			= NAP				##	Dátumértéket a hónap egy napjává (0-31) alakít.
+DAYS360			= NAP360			##	Két dátum közé eső napok számát számítja ki a 360 napos év alapján.
+EDATE			= EDATE				##	Adott dátumnál adott számú hónappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
+EOMONTH			= EOMONTH			##	Adott dátumnál adott számú hónappal korábbi vagy későbbi hónap utolsó napjának dátumértékét adja eredményül.
+HOUR			= ÓRA				##	Időértéket órákká alakít.
+MINUTE			= PERC				##	Időértéket percekké alakít.
+MONTH			= HÓNAP				##	Időértéket hónapokká alakít.
+NETWORKDAYS		= NETWORKDAYS			##	Két dátum között a teljes munkanapok számát adja meg.
+NOW			= MOST				##	A napi dátum dátumértékét és a pontos idő időértékét adja eredményül.
+SECOND			= MPERC				##	Időértéket másodpercekké alakít át.
+TIME			= IDŐ				##	Adott időpont időértékét adja meg.
+TIMEVALUE		= IDŐÉRTÉK			##	Szövegként megadott időpontot időértékké alakít át.
+TODAY			= MA				##	A napi dátum dátumértékét adja eredményül.
+WEEKDAY			= HÉT.NAPJA			##	Dátumértéket a hét napjává alakítja át.
+WEEKNUM			= WEEKNUM			##	Visszatérési értéke egy szám, amely azt mutatja meg, hogy a megadott dátum az év hányadik hetére esik.
+WORKDAY			= WORKDAY			##	Adott dátumnál adott munkanappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
+YEAR			= ÉV				##	Sorszámot évvé alakít át.
+YEARFRAC		= YEARFRAC			##	Az adott dátumok közötti teljes napok számát törtévként adja meg.
+
+
+##
+##	Engineering functions				Mérnöki függvények
+##
+BESSELI			= BESSELI			##	Az In(x) módosított Bessel-függvény értékét adja eredményül.
+BESSELJ			= BESSELJ			##	A Jn(x) Bessel-függvény értékét adja eredményül.
+BESSELK			= BESSELK			##	A Kn(x) módosított Bessel-függvény értékét adja eredményül.
+BESSELY			= BESSELY			##	Az Yn(x) módosított Bessel-függvény értékét adja eredményül.
+BIN2DEC			= BIN2DEC			##	Bináris számot decimálissá alakít át.
+BIN2HEX			= BIN2HEX			##	Bináris számot hexadecimálissá alakít át.
+BIN2OCT			= BIN2OCT			##	Bináris számot oktálissá alakít át.
+COMPLEX			= COMPLEX			##	Valós és képzetes részből komplex számot képez.
+CONVERT			= CONVERT			##	Mértékegységeket vált át.
+DEC2BIN			= DEC2BIN			##	Decimális számot binárissá alakít át.
+DEC2HEX			= DEC2HEX			##	Decimális számot hexadecimálissá alakít át.
+DEC2OCT			= DEC2OCT			##	Decimális számot oktálissá alakít át.
+DELTA			= DELTA				##	Azt vizsgálja, hogy két érték egyenlő-e.
+ERF			= ERF				##	A hibafüggvény értékét adja eredményül.
+ERFC			= ERFC				##	A kiegészített hibafüggvény értékét adja eredményül.
+GESTEP			= GESTEP			##	Azt vizsgálja, hogy egy szám nagyobb-e adott küszöbértéknél.
+HEX2BIN			= HEX2BIN			##	Hexadecimális számot binárissá alakít át.
+HEX2DEC			= HEX2DEC			##	Hexadecimális számot decimálissá alakít át.
+HEX2OCT			= HEX2OCT			##	Hexadecimális számot oktálissá alakít át.
+IMABS			= IMABS				##	Komplex szám abszolút értékét (modulusát) adja eredményül.
+IMAGINARY		= IMAGINARY			##	Komplex szám képzetes részét adja eredményül.
+IMARGUMENT		= IMARGUMENT			##	A komplex szám radiánban kifejezett théta argumentumát adja eredményül.
+IMCONJUGATE		= IMCONJUGATE			##	Komplex szám komplex konjugáltját adja eredményül.
+IMCOS			= IMCOS				##	Komplex szám koszinuszát adja eredményül.
+IMDIV			= IMDIV				##	Két komplex szám hányadosát adja eredményül.
+IMEXP			= IMEXP				##	Az e szám komplex kitevőjű hatványát adja eredményül.
+IMLN			= IMLN				##	Komplex szám természetes logaritmusát adja eredményül.
+IMLOG10			= IMLOG10			##	Komplex szám tízes alapú logaritmusát adja eredményül.
+IMLOG2			= IMLOG2			##	Komplex szám kettes alapú logaritmusát adja eredményül.
+IMPOWER			= IMPOWER			##	Komplex szám hatványát adja eredményül.
+IMPRODUCT		= IMPRODUCT			##	Komplex számok szorzatát adja eredményül.
+IMREAL			= IMREAL			##	Komplex szám valós részét adja eredményül.
+IMSIN			= IMSIN				##	Komplex szám szinuszát adja eredményül.
+IMSQRT			= IMSQRT			##	Komplex szám négyzetgyökét adja eredményül.
+IMSUB			= IMSUB				##	Két komplex szám különbségét adja eredményül.
+IMSUM			= IMSUM				##	Komplex számok összegét adja eredményül.
+OCT2BIN			= OCT2BIN			##	Oktális számot binárissá alakít át.
+OCT2DEC			= OCT2DEC			##	Oktális számot decimálissá alakít át.
+OCT2HEX			= OCT2HEX			##	Oktális számot hexadecimálissá alakít át.
+
+
+##
+##	Financial functions				Pénzügyi függvények
+##
+ACCRINT			= ACCRINT			##	Periodikusan kamatozó értékpapír felszaporodott kamatát adja eredményül.
+ACCRINTM		= ACCRINTM			##	Lejáratkor kamatozó értékpapír felszaporodott kamatát adja eredményül.
+AMORDEGRC		= AMORDEGRC			##	Állóeszköz lineáris értékcsökkenését adja meg az egyes könyvelési időszakokra vonatkozóan.
+AMORLINC		= AMORLINC			##	Az egyes könyvelési időszakokban az értékcsökkenést adja meg.
+COUPDAYBS		= COUPDAYBS			##	A szelvényidőszak kezdetétől a kifizetés időpontjáig eltelt napokat adja vissza.
+COUPDAYS		= COUPDAYS			##	A kifizetés időpontját magában foglaló szelvényperiódus hosszát adja meg napokban.
+COUPDAYSNC		= COUPDAYSNC			##	A kifizetés időpontja és a legközelebbi szelvénydátum közötti napok számát adja meg.
+COUPNCD			= COUPNCD			##	A kifizetést követő legelső szelvénydátumot adja eredményül.
+COUPNUM			= COUPNUM			##	A kifizetés és a lejárat időpontja között kifizetendő szelvények számát adja eredményül.
+COUPPCD			= COUPPCD			##	A kifizetés előtti utolsó szelvénydátumot adja eredményül.
+CUMIPMT			= CUMIPMT			##	Két fizetési időszak között kifizetett kamat halmozott értékét adja eredményül.
+CUMPRINC		= CUMPRINC			##	Két fizetési időszak között kifizetett részletek halmozott (kamatot nem tartalmazó) értékét adja eredményül.
+DB			= KCS2				##	Eszköz adott időszak alatti értékcsökkenését számítja ki a lineáris leírási modell alkalmazásával.
+DDB			= KCSA				##	Eszköz értékcsökkenését számítja ki adott időszakra vonatkozóan a progresszív vagy egyéb megadott leírási modell alkalmazásával.
+DISC			= DISC				##	Értékpapír leszámítolási kamatlábát adja eredményül.
+DOLLARDE		= DOLLARDE			##	Egy közönséges törtként megadott számot tizedes törtté alakít át.
+DOLLARFR		= DOLLARFR			##	Tizedes törtként megadott számot közönséges törtté alakít át.
+DURATION		= DURATION			##	Periodikus kamatfizetésű értékpapír éves kamatérzékenységét adja eredményül.
+EFFECT			= EFFECT			##	Az éves tényleges kamatláb értékét adja eredményül.
+FV			= JBÉ				##	Befektetés jövőbeli értékét számítja ki.
+FVSCHEDULE		= FVSCHEDULE			##	A kezdőtőke adott kamatlábak szerint megnövelt jövőbeli értékét adja eredményül.
+INTRATE			= INTRATE			##	A lejáratig teljesen lekötött értékpapír kamatrátáját adja eredményül.
+IPMT			= RRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
+IRR			= BMR				##	A befektetés belső megtérülési rátáját számítja ki pénzáramláshoz.
+ISPMT			= LRÉSZLETKAMAT			##	A befektetés adott időszakára fizetett kamatot számítja ki.
+MDURATION		= MDURATION			##	Egy 100 Ft névértékű értékpapír Macauley-féle módosított kamatérzékenységét adja eredményül.
+MIRR			= MEGTÉRÜLÉS			##	A befektetés belső megtérülési rátáját számítja ki a költségek és a bevételek különböző kamatlába mellett.
+NOMINAL			= NOMINAL			##	Az éves névleges kamatláb értékét adja eredményül.
+NPER			= PER.SZÁM			##	A törlesztési időszakok számát adja meg.
+NPV			= NMÉ				##	Befektetéshez kapcsolódó pénzáramlás nettó jelenértékét számítja ki ismert pénzáramlás és kamatláb mellett.
+ODDFPRICE		= ODDFPRICE			##	Egy 100 Ft névértékű, a futamidő elején töredék-időszakos értékpapír árát adja eredményül.
+ODDFYIELD		= ODDFYIELD			##	A futamidő elején töredék-időszakos értékpapír hozamát adja eredményül.
+ODDLPRICE		= ODDLPRICE			##	Egy 100 Ft névértékű, a futamidő végén töredék-időszakos értékpapír árát adja eredményül.
+ODDLYIELD		= ODDLYIELD			##	A futamidő végén töredék-időszakos értékpapír hozamát adja eredményül.
+PMT			= RÉSZLET			##	A törlesztési időszakra vonatkozó törlesztési összeget számítja ki.
+PPMT			= PRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
+PRICE			= PRICE				##	Egy 100 Ft névértékű, periodikusan kamatozó értékpapír árát adja eredményül.
+PRICEDISC		= PRICEDISC			##	Egy 100 Ft névértékű leszámítolt értékpapír árát adja eredményül.
+PRICEMAT		= PRICEMAT			##	Egy 100 Ft névértékű, a lejáratkor kamatozó értékpapír árát adja eredményül.
+PV			= MÉ				##	Befektetés jelenlegi értékét számítja ki.
+RATE			= RÁTA				##	Egy törlesztési időszakban az egy időszakra eső kamatláb nagyságát számítja ki.
+RECEIVED		= RECEIVED			##	A lejáratig teljesen lekötött értékpapír lejáratakor kapott összegét adja eredményül.
+SLN			= LCSA				##	Tárgyi eszköz egy időszakra eső amortizációját adja meg bruttó érték szerinti lineáris leírási kulcsot alkalmazva.
+SYD			= SYD				##	Tárgyi eszköz értékcsökkenését számítja ki adott időszakra az évek számjegyösszegével dolgozó módszer alapján.
+TBILLEQ			= TBILLEQ			##	Kincstárjegy kötvény-egyenértékű hozamát adja eredményül.
+TBILLPRICE		= TBILLPRICE			##	Egy 100 Ft névértékű kincstárjegy árát adja eredményül.
+TBILLYIELD		= TBILLYIELD			##	Kincstárjegy hozamát adja eredményül.
+VDB			= ÉCSRI				##	Tárgyi eszköz amortizációját számítja ki megadott vagy részidőszakra a csökkenő egyenleg módszerének alkalmazásával.
+XIRR			= XIRR				##	Ütemezett készpénzforgalom (cash flow) belső megtérülési kamatrátáját adja eredményül.
+XNPV			= XNPV				##	Ütemezett készpénzforgalom (cash flow) nettó jelenlegi értékét adja eredményül.
+YIELD			= YIELD				##	Periodikusan kamatozó értékpapír hozamát adja eredményül.
+YIELDDISC		= YIELDDISC			##	Leszámítolt értékpapír (például kincstárjegy) éves hozamát adja eredményül.
+YIELDMAT		= YIELDMAT			##	Lejáratkor kamatozó értékpapír éves hozamát adja eredményül.
+
+
+##
+##	Information functions				Információs függvények
+##
+CELL			= CELLA				##	Egy cella formátumára, elhelyezkedésére vagy tartalmára vonatkozó adatokat ad eredményül.
+ERROR.TYPE		= HIBA.TÍPUS			##	Egy hibatípushoz tartozó számot ad eredményül.
+INFO			= INFÓ				##	A rendszer- és munkakörnyezet pillanatnyi állapotáról ad felvilágosítást.
+ISBLANK			= ÜRES				##	Eredménye IGAZ, ha az érték üres.
+ISERR			= HIBA				##	Eredménye IGAZ, ha az érték valamelyik hibaérték a #HIÁNYZIK kivételével.
+ISERROR			= HIBÁS				##	Eredménye IGAZ, ha az érték valamelyik hibaérték.
+ISEVEN			= ISEVEN			##	Eredménye IGAZ, ha argumentuma páros szám.
+ISLOGICAL		= LOGIKAI			##	Eredménye IGAZ, ha az érték logikai érték.
+ISNA			= NINCS				##	Eredménye IGAZ, ha az érték a #HIÁNYZIK hibaérték.
+ISNONTEXT		= NEM.SZÖVEG			##	Eredménye IGAZ, ha az érték nem szöveg.
+ISNUMBER		= SZÁM				##	Eredménye IGAZ, ha az érték szám.
+ISODD			= ISODD				##	Eredménye IGAZ, ha argumentuma páratlan szám.
+ISREF			= HIVATKOZÁS			##	Eredménye IGAZ, ha az érték hivatkozás.
+ISTEXT			= SZÖVEG.E			##	Eredménye IGAZ, ha az érték szöveg.
+N			= N				##	Argumentumának értékét számmá alakítja.
+NA			= HIÁNYZIK			##	Eredménye a #HIÁNYZIK hibaérték.
+TYPE			= TÍPUS				##	Érték adattípusának azonosítószámát adja eredményül.
+
+
+##
+##	Logical functions				Logikai függvények
+##
+AND			= ÉS				##	Eredménye IGAZ, ha minden argumentuma IGAZ.
+FALSE			= HAMIS				##	A HAMIS logikai értéket adja eredményül.
+IF			= HA				##	Logikai vizsgálatot hajt végre.
+IFERROR			= HAHIBA			##	A megadott értéket adja vissza, ha egy képlet hibához vezet; más esetben a képlet értékét adja eredményül.
+NOT			= NEM				##	Argumentuma értékének ellentettjét adja eredményül.
+OR			= VAGY				##	Eredménye IGAZ, ha bármely argumentuma IGAZ.
+TRUE			= IGAZ				##	Az IGAZ logikai értéket adja eredményül.
+
+
+##
+##	Lookup and reference functions			Keresési és hivatkozási függvények
+##
+ADDRESS			= CÍM				##	A munkalap egy cellájára való hivatkozást adja szövegként eredményül.
+AREAS			= TERÜLET			##	Hivatkozásban a területek számát adja eredményül.
+CHOOSE			= VÁLASZT			##	Értékek listájából választ ki egy elemet.
+COLUMN			= OSZLOP			##	Egy hivatkozás oszlopszámát adja eredményül.
+COLUMNS			= OSZLOPOK			##	A hivatkozásban található oszlopok számát adja eredményül.
+HLOOKUP			= VKERES			##	A megadott tömb felső sorában adott értékű elemet keres, és a megtalált elem oszlopából adott sorban elhelyezkedő értékkel tér vissza.
+HYPERLINK		= HIPERHIVATKOZÁS		##	Hálózati kiszolgálón, intraneten vagy az interneten tárolt dokumentumot megnyitó parancsikont vagy hivatkozást hoz létre.
+INDEX			= INDEX				##	Tömb- vagy hivatkozás indexszel megadott értékét adja vissza.
+INDIRECT		= INDIREKT			##	Szöveg megadott hivatkozást ad eredményül.
+LOOKUP			= KERES				##	Vektorban vagy tömbben keres meg értékeket.
+MATCH			= HOL.VAN			##	Hivatkozásban vagy tömbben értékeket keres.
+OFFSET			= OFSZET			##	Hivatkozás egy másik hivatkozástól számított távolságát adja meg.
+ROW			= SOR				##	Egy hivatkozás sorának számát adja meg.
+ROWS			= SOROK				##	Egy hivatkozás sorainak számát adja meg.
+RTD			= RTD				##	Valós idejű adatokat keres vissza a COM automatizmust (automatizálás: Egy alkalmazás objektumaival való munka másik alkalmazásból vagy fejlesztőeszközből. A korábban OLE automatizmusnak nevezett automatizálás iparági szabvány, a Component Object Model (COM) szolgáltatása.) támogató programból.
+TRANSPOSE		= TRANSZPONÁLÁS			##	Egy tömb transzponáltját adja eredményül.
+VLOOKUP			= FKERES			##	A megadott tömb bal szélső oszlopában megkeres egy értéket, majd annak sora és a megadott oszlop metszéspontjában levő értéked adja eredményül.
+
+
+##
+##	Math and trigonometry functions			Matematikai és trigonometrikus függvények
+##
+ABS			= ABS				##	Egy szám abszolút értékét adja eredményül.
+ACOS			= ARCCOS			##	Egy szám arkusz koszinuszát számítja ki.
+ACOSH			= ACOSH				##	Egy szám inverz koszinusz hiperbolikuszát számítja ki.
+ASIN			= ARCSIN			##	Egy szám arkusz szinuszát számítja ki.
+ASINH			= ASINH				##	Egy szám inverz szinusz hiperbolikuszát számítja ki.
+ATAN			= ARCTAN			##	Egy szám arkusz tangensét számítja ki.
+ATAN2			= ARCTAN2			##	X és y koordináták alapján számítja ki az arkusz tangens értéket.
+ATANH			= ATANH				##	A szám inverz tangens hiperbolikuszát számítja ki.
+CEILING			= PLAFON			##	Egy számot a legközelebbi egészre vagy a pontosságként megadott érték legközelebb eső többszörösére kerekít.
+COMBIN			= KOMBINÁCIÓK			##	Adott számú objektum összes lehetséges kombinációinak számát számítja ki.
+COS			= COS				##	Egy szám koszinuszát számítja ki.
+COSH			= COSH				##	Egy szám koszinusz hiperbolikuszát számítja ki.
+DEGREES			= FOK				##	Radiánt fokká alakít át.
+EVEN			= PÁROS				##	Egy számot a legközelebbi páros egész számra kerekít.
+EXP			= KITEVŐ			##	Az e adott kitevőjű hatványát adja eredményül.
+FACT			= FAKT				##	Egy szám faktoriálisát számítja ki.
+FACTDOUBLE		= FACTDOUBLE			##	Egy szám dupla faktoriálisát adja eredményül.
+FLOOR			= PADLÓ				##	Egy számot lefelé, a nulla felé kerekít.
+GCD			= GCD				##	A legnagyobb közös osztót adja eredményül.
+INT			= INT				##	Egy számot lefelé kerekít a legközelebbi egészre.
+LCM			= LCM				##	A legkisebb közös többszöröst adja eredményül.
+LN			= LN				##	Egy szám természetes logaritmusát számítja ki.
+LOG			= LOG				##	Egy szám adott alapú logaritmusát számítja ki.
+LOG10			= LOG10				##	Egy szám 10-es alapú logaritmusát számítja ki.
+MDETERM			= MDETERM			##	Egy tömb mátrix-determinánsát számítja ki.
+MINVERSE		= INVERZ.MÁTRIX			##	Egy tömb mátrix inverzét adja eredményül.
+MMULT			= MSZORZAT			##	Két tömb mátrix-szorzatát adja meg.
+MOD			= MARADÉK			##	Egy szám osztási maradékát adja eredményül.
+MROUND			= MROUND			##	A kívánt többszörösére kerekített értéket ad eredményül.
+MULTINOMIAL		= MULTINOMIAL			##	Számhalmaz multinomiálisát adja eredményül.
+ODD			= PÁRATLAN			##	Egy számot a legközelebbi páratlan számra kerekít.
+PI			= PI				##	A pi matematikai állandót adja vissza.
+POWER			= HATVÁNY			##	Egy szám adott kitevőjű hatványát számítja ki.
+PRODUCT			= SZORZAT			##	Argumentumai szorzatát számítja ki.
+QUOTIENT		= QUOTIENT			##	Egy hányados egész részét adja eredményül.
+RADIANS			= RADIÁN			##	Fokot radiánná alakít át.
+RAND			= VÉL				##	Egy 0 és 1 közötti véletlen számot ad eredményül.
+RANDBETWEEN		= RANDBETWEEN			##	Megadott számok közé eső véletlen számot állít elő.
+ROMAN			= RÓMAI				##	Egy számot római számokkal kifejezve szövegként ad eredményül.
+ROUND			= KEREKÍTÉS			##	Egy számot adott számú számjegyre kerekít.
+ROUNDDOWN		= KEREKÍTÉS.LE			##	Egy számot lefelé, a nulla felé kerekít.
+ROUNDUP			= KEREKÍTÉS.FEL			##	Egy számot felfelé, a nullától távolabbra kerekít.
+SERIESSUM		= SERIESSUM			##	Hatványsor összegét adja eredményül.
+SIGN			= ELŐJEL			##	Egy szám előjelét adja meg.
+SIN			= SIN				##	Egy szög szinuszát számítja ki.
+SINH			= SINH				##	Egy szám szinusz hiperbolikuszát számítja ki.
+SQRT			= GYÖK				##	Egy szám pozitív négyzetgyökét számítja ki.
+SQRTPI			= SQRTPI			##	A (szám*pi) négyzetgyökét adja eredményül.
+SUBTOTAL		= RÉSZÖSSZEG			##	Lista vagy adatbázis részösszegét adja eredményül.
+SUM			= SZUM				##	Összeadja az argumentumlistájában lévő számokat.
+SUMIF			= SZUMHA			##	A megadott feltételeknek eleget tevő cellákban található értékeket adja össze.
+SUMIFS			= SZUMHATÖBB			##	Több megadott feltételnek eleget tévő tartománycellák összegét adja eredményül.
+SUMPRODUCT		= SZORZATÖSSZEG			##	A megfelelő tömbelemek szorzatának összegét számítja ki.
+SUMSQ			= NÉGYZETÖSSZEG			##	Argumentumai négyzetének összegét számítja ki.
+SUMX2MY2		= SZUMX2BŐLY2			##	Két tömb megfelelő elemei négyzetének különbségét összegzi.
+SUMX2PY2		= SZUMX2MEGY2			##	Két tömb megfelelő elemei négyzetének összegét összegzi.
+SUMXMY2			= SZUMXBŐLY2			##	Két tömb megfelelő elemei különbségének négyzetösszegét számítja ki.
+TAN			= TAN				##	Egy szám tangensét számítja ki.
+TANH			= TANH				##	Egy szám tangens hiperbolikuszát számítja ki.
+TRUNC			= CSONK				##	Egy számot egésszé csonkít.
+
+
+##
+##	Statistical functions				Statisztikai függvények
+##
+AVEDEV			= ÁTL.ELTÉRÉS			##	Az adatpontoknak átlaguktól való átlagos abszolút eltérését számítja ki.
+AVERAGE			= ÁTLAG				##	Argumentumai átlagát számítja ki.
+AVERAGEA		= ÁTLAGA			##	Argumentumai átlagát számítja ki (beleértve a számokat, szöveget és logikai értékeket).
+AVERAGEIF		= ÁTLAGHA			##	A megadott feltételnek eleget tévő tartomány celláinak átlagát (számtani közepét) adja eredményül.
+AVERAGEIFS		= ÁTLAGHATÖBB			##	A megadott feltételeknek eleget tévő cellák átlagát (számtani közepét) adja eredményül.
+BETADIST		= BÉTA.ELOSZLÁS			##	A béta-eloszlás függvényt számítja ki.
+BETAINV			= INVERZ.BÉTA			##	Adott béta-eloszláshoz kiszámítja a béta eloszlásfüggvény inverzét.
+BINOMDIST		= BINOM.ELOSZLÁS		##	A diszkrét binomiális eloszlás valószínűségértékét számítja ki.
+CHIDIST			= KHI.ELOSZLÁS			##	A khi-négyzet-eloszlás egyszélű valószínűségértékét számítja ki.
+CHIINV			= INVERZ.KHI			##	A khi-négyzet-eloszlás egyszélű valószínűségértékének inverzét számítja ki.
+CHITEST			= KHI.PRÓBA			##	Függetlenségvizsgálatot hajt végre.
+CONFIDENCE		= MEGBÍZHATÓSÁG			##	Egy statisztikai sokaság várható értékének megbízhatósági intervallumát adja eredményül.
+CORREL			= KORREL			##	Két adathalmaz korrelációs együtthatóját számítja ki.
+COUNT			= DARAB				##	Megszámolja, hogy argumentumlistájában hány szám található.
+COUNTA			= DARAB2			##	Megszámolja, hogy argumentumlistájában hány érték található.
+COUNTBLANK		= DARABÜRES			##	Egy tartományban összeszámolja az üres cellákat.
+COUNTIF			= DARABTELI			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek a megadott feltételnek.
+COUNTIFS		= DARABHATÖBB			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek több feltételnek.
+COVAR			= KOVAR				##	A kovarianciát, azaz a páronkénti eltérések szorzatának átlagát számítja ki.
+CRITBINOM		= KRITBINOM			##	Azt a legkisebb számot adja eredményül, amelyre a binomiális eloszlásfüggvény értéke nem kisebb egy adott határértéknél.
+DEVSQ			= SQ				##	Az átlagtól való eltérések négyzetének összegét számítja ki.
+EXPONDIST		= EXP.ELOSZLÁS			##	Az exponenciális eloszlás értékét számítja ki.
+FDIST			= F.ELOSZLÁS			##	Az F-eloszlás értékét számítja ki.
+FINV			= INVERZ.F			##	Az F-eloszlás inverzének értékét számítja ki.
+FISHER			= FISHER			##	Fisher-transzformációt hajt végre.
+FISHERINV		= INVERZ.FISHER			##	A Fisher-transzformáció inverzét hajtja végre.
+FORECAST		= ELŐREJELZÉS			##	Az ismert értékek alapján lineáris regresszióval becsült értéket ad eredményül.
+FREQUENCY		= GYAKORISÁG			##	A gyakorisági vagy empirikus eloszlás értékét függőleges tömbként adja eredményül.
+FTEST			= F.PRÓBA			##	Az F-próba értékét adja eredményül.
+GAMMADIST		= GAMMA.ELOSZLÁS		##	A gamma-eloszlás értékét számítja ki.
+GAMMAINV		= INVERZ.GAMMA			##	A gamma-eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
+GAMMALN			= GAMMALN			##	A gamma-függvény természetes logaritmusát számítja ki.
+GEOMEAN			= MÉRTANI.KÖZÉP			##	Argumentumai mértani középértékét számítja ki.
+GROWTH			= NÖV				##	Exponenciális regresszió alapján ad becslést.
+HARMEAN			= HARM.KÖZÉP			##	Argumentumai harmonikus átlagát számítja ki.
+HYPGEOMDIST		= HIPERGEOM.ELOSZLÁS		##	A hipergeometriai eloszlás értékét számítja ki.
+INTERCEPT		= METSZ				##	A regressziós egyenes y tengellyel való metszéspontját határozza meg.
+KURT			= CSÚCSOSSÁG			##	Egy adathalmaz csúcsosságát számítja ki.
+LARGE			= NAGY				##	Egy adathalmaz k-adik legnagyobb elemét adja eredményül.
+LINEST			= LIN.ILL			##	A legkisebb négyzetek módszerével az adatokra illesztett egyenes paramétereit határozza meg.
+LOGEST			= LOG.ILL			##	Az adatokra illesztett exponenciális görbe paramétereit határozza meg.
+LOGINV			= INVERZ.LOG.ELOSZLÁS		##	A lognormális eloszlás inverzét számítja ki.
+LOGNORMDIST		= LOG.ELOSZLÁS			##	A lognormális eloszlásfüggvény értékét számítja ki.
+MAX			= MAX				##	Az argumentumai között szereplő legnagyobb számot adja meg.
+MAXA			= MAX2				##	Az argumentumai között szereplő legnagyobb számot adja meg (beleértve a számokat, szöveget és logikai értékeket).
+MEDIAN			= MEDIÁN			##	Adott számhalmaz mediánját számítja ki.
+MIN			= MIN				##	Az argumentumai között szereplő legkisebb számot adja meg.
+MINA			= MIN2				##	Az argumentumai között szereplő legkisebb számot adja meg, beleértve a számokat, szöveget és logikai értékeket.
+MODE			= MÓDUSZ			##	Egy adathalmazból kiválasztja a leggyakrabban előforduló számot.
+NEGBINOMDIST		= NEGBINOM.ELOSZL		##	A negatív binomiális eloszlás értékét számítja ki.
+NORMDIST		= NORM.ELOSZL			##	A normális eloszlás értékét számítja ki.
+NORMINV			= INVERZ.NORM			##	A normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
+NORMSDIST		= STNORMELOSZL			##	A standard normális eloszlás eloszlásfüggvényének értékét számítja ki.
+NORMSINV		= INVERZ.STNORM			##	A standard normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
+PEARSON			= PEARSON			##	A Pearson-féle korrelációs együtthatót számítja ki.
+PERCENTILE		= PERCENTILIS			##	Egy tartományban található értékek k-adik percentilisét, azaz százalékosztályát adja eredményül.
+PERCENTRANK		= SZÁZALÉKRANG			##	Egy értéknek egy adathalmazon belül vett százalékos rangját (elhelyezkedését) számítja ki.
+PERMUT			= VARIÁCIÓK			##	Adott számú objektum k-ad osztályú ismétlés nélküli variációinak számát számítja ki.
+POISSON			= POISSON			##	A Poisson-eloszlás értékét számítja ki.
+PROB			= VALÓSZÍNŰSÉG			##	Annak valószínűségét számítja ki, hogy adott értékek két határérték közé esnek.
+QUARTILE		= KVARTILIS			##	Egy adathalmaz kvartilisét (negyedszintjét) számítja ki.
+RANK			= SORSZÁM			##	Kiszámítja, hogy egy szám hányadik egy számsorozatban.
+RSQ			= RNÉGYZET			##	Kiszámítja a Pearson-féle szorzatmomentum korrelációs együtthatójának négyzetét.
+SKEW			= FERDESÉG			##	Egy eloszlás ferdeségét határozza meg.
+SLOPE			= MEREDEKSÉG			##	Egy lineáris regressziós egyenes meredekségét számítja ki.
+SMALL			= KICSI				##	Egy adathalmaz k-adik legkisebb elemét adja meg.
+STANDARDIZE		= NORMALIZÁLÁS			##	Normalizált értéket ad eredményül.
+STDEV			= SZÓRÁS			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását.
+STDEVA			= SZÓRÁSA			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását (beleértve a számokat, szöveget és logikai értékeket).
+STDEVP			= SZÓRÁSP			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását.
+STDEVPA			= SZÓRÁSPA			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását (beleértve számokat, szöveget és logikai értékeket).
+STEYX			= STHIBAYX			##	Egy regresszió esetén az egyes x-értékek alapján meghatározott y-értékek standard hibáját számítja ki.
+TDIST			= T.ELOSZLÁS			##	A Student-féle t-eloszlás értékét számítja ki.
+TINV			= INVERZ.T			##	A Student-féle t-eloszlás inverzét számítja ki.
+TREND			= TREND				##	Lineáris trend értékeit számítja ki.
+TRIMMEAN		= RÉSZÁTLAG			##	Egy adathalmaz középső részének átlagát számítja ki.
+TTEST			= T.PRÓBA			##	A Student-féle t-próbához tartozó valószínűséget számítja ki.
+VAR			= VAR				##	Minta alapján becslést ad a varianciára.
+VARA			= VARA				##	Minta alapján becslést ad a varianciára (beleértve számokat, szöveget és logikai értékeket).
+VARP			= VARP				##	Egy statisztikai sokaság varianciáját számítja ki.
+VARPA			= VARPA				##	Egy statisztikai sokaság varianciáját számítja ki (beleértve számokat, szöveget és logikai értékeket).
+WEIBULL			= WEIBULL			##	A Weibull-féle eloszlás értékét számítja ki.
+ZTEST			= Z.PRÓBA			##	Az egyszélű z-próbával kapott valószínűségértéket számítja ki.
+
+
+##
+##	Text functions					Szövegműveletekhez használható függvények
+##
+ASC			= ASC				##	Szöveg teljes szélességű (kétbájtos) latin és katakana karaktereit félszélességű (egybájtos) karakterekké alakítja.
+BAHTTEXT		= BAHTSZÖVEG			##	Számot szöveggé alakít a ß (baht) pénznemformátum használatával.
+CHAR			= KARAKTER			##	A kódszámmal meghatározott karaktert adja eredményül.
+CLEAN			= TISZTÍT			##	A szövegből eltávolítja az összes nem nyomtatható karaktert.
+CODE			= KÓD				##	Karaktersorozat első karakterének numerikus kódját adja eredményül.
+CONCATENATE		= ÖSSZEFŰZ			##	Több szövegelemet egyetlen szöveges elemmé fűz össze.
+DOLLAR			= FORINT			##	Számot pénznem formátumú szöveggé alakít át.
+EXACT			= AZONOS			##	Megvizsgálja, hogy két érték azonos-e.
+FIND			= SZÖVEG.TALÁL			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
+FINDB			= SZÖVEG.TALÁL2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
+FIXED			= FIX				##	Számot szöveges formátumúra alakít adott számú tizedesjegyre kerekítve.
+JIS			= JIS				##	A félszélességű (egybájtos) latin és a katakana karaktereket teljes szélességű (kétbájtos) karakterekké alakítja.
+LEFT			= BAL				##	Szöveg bal szélső karaktereit adja eredményül.
+LEFTB			= BAL2				##	Szöveg bal szélső karaktereit adja eredményül.
+LEN			= HOSSZ				##	Szöveg karakterekben mért hosszát adja eredményül.
+LENB			= HOSSZ2			##	Szöveg karakterekben mért hosszát adja eredményül.
+LOWER			= KISBETŰ			##	Szöveget kisbetűssé alakít át.
+MID			= KÖZÉP				##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
+MIDB			= KÖZÉP2			##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
+PHONETIC		= PHONETIC			##	Szöveg furigana (fonetikus) karaktereit adja vissza.
+PROPER			= TNÉV				##	Szöveg minden szavának kezdőbetűjét nagybetűsre cseréli.
+REPLACE			= CSERE				##	A szövegen belül karaktereket cserél.
+REPLACEB		= CSERE2			##	A szövegen belül karaktereket cserél.
+REPT			= SOKSZOR			##	Megadott számú alkalommal megismétel egy szövegrészt.
+RIGHT			= JOBB				##	Szövegrész jobb szélső karaktereit adja eredményül.
+RIGHTB			= JOBB2				##	Szövegrész jobb szélső karaktereit adja eredményül.
+SEARCH			= SZÖVEG.KERES			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
+SEARCHB			= SZÖVEG.KERES2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
+SUBSTITUTE		= HELYETTE			##	Szövegben adott karaktereket másikra cserél.
+T			= T				##	Argumentumát szöveggé alakítja át.
+TEXT			= SZÖVEG			##	Számértéket alakít át adott számformátumú szöveggé.
+TRIM			= TRIM				##	A szövegből eltávolítja a szóközöket.
+UPPER			= NAGYBETŰS			##	Szöveget nagybetűssé alakít át.
+VALUE			= ÉRTÉK				##	Szöveget számmá alakít át.
diff --git a/lib/PHPExcel/locale/it/config b/lib/PHPExcel/locale/it/config
new file mode 100644
index 000000000..c3afa754b
--- /dev/null
+++ b/lib/PHPExcel/locale/it/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= €
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NULLO!
+DIV0	= #DIV/0!
+VALUE	= #VALORE!
+REF	= #RIF!
+NAME	= #NOME?
+NUM	= #NUM!
+NA	= #N/D
diff --git a/lib/PHPExcel/locale/it/functions b/lib/PHPExcel/locale/it/functions
new file mode 100644
index 000000000..d371f3d72
--- /dev/null
+++ b/lib/PHPExcel/locale/it/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Funzioni di automazione e dei componenti aggiuntivi
+##
+GETPIVOTDATA		= INFO.DATI.TAB.PIVOT		##	Restituisce i dati memorizzati in un rapporto di tabella pivot
+
+
+##
+##	Cube functions					Funzioni cubo
+##
+CUBEKPIMEMBER		= MEMBRO.KPI.CUBO		##	Restituisce il nome, la proprietà e la misura di un indicatore di prestazioni chiave (KPI) e visualizza il nome e la proprietà nella cella. Un KPI è una misura quantificabile, ad esempio l'utile lordo mensile o il fatturato trimestrale dei dipendenti, utilizzata per il monitoraggio delle prestazioni di un'organizzazione.
+CUBEMEMBER		= MEMBRO.CUBO			##	Restituisce un membro o una tupla in una gerarchia di cubi. Consente di verificare l'esistenza del membro o della tupla nel cubo.
+CUBEMEMBERPROPERTY	= PROPRIETÀ.MEMBRO.CUBO		##	Restituisce il valore di una proprietà di un membro del cubo. Consente di verificare l'esistenza di un nome di membro all'interno del cubo e di restituire la proprietà specificata per tale membro.
+CUBERANKEDMEMBER	= MEMBRO.CUBO.CON.RANGO		##	Restituisce l'n-esimo membro o il membro ordinato di un insieme. Consente di restituire uno o più elementi in un insieme, ad esempio l'agente di vendita migliore o i primi 10 studenti.
+CUBESET			= SET.CUBO			##	Definisce un insieme di tuple o membri calcolati mediante l'invio di un'espressione di insieme al cubo sul server. In questo modo l'insieme viene creato e restituito a Microsoft Office Excel.
+CUBESETCOUNT		= CONTA.SET.CUBO		##	Restituisce il numero di elementi di un insieme.
+CUBEVALUE		= VALORE.CUBO			##	Restituisce un valore aggregato da un cubo.
+
+
+##
+##	Database functions				Funzioni di database
+##
+DAVERAGE		= DB.MEDIA			##	Restituisce la media di voci del database selezionate
+DCOUNT			= DB.CONTA.NUMERI		##	Conta le celle di un database contenenti numeri
+DCOUNTA			= DB.CONTA.VALORI		##	Conta le celle non vuote in un database
+DGET			= DB.VALORI			##	Estrae da un database un singolo record che soddisfa i criteri specificati
+DMAX			= DB.MAX			##	Restituisce il valore massimo dalle voci selezionate in un database
+DMIN			= DB.MIN			##	Restituisce il valore minimo dalle voci di un database selezionate
+DPRODUCT		= DB.PRODOTTO			##	Moltiplica i valori in un determinato campo di record che soddisfano i criteri del database
+DSTDEV			= DB.DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione di voci di un database selezionate
+DSTDEVP			= DB.DEV.ST.POP			##	Calcola la deviazione standard sulla base di tutte le voci di un database selezionate
+DSUM			= DB.SOMMA			##	Aggiunge i numeri nel campo colonna di record del database che soddisfa determinati criteri
+DVAR			= DB.VAR			##	Restituisce una stima della varianza sulla base di un campione da voci di un database selezionate
+DVARP			= DB.VAR.POP			##	Calcola la varianza sulla base di tutte le voci di un database selezionate
+
+
+##
+##	Date and time functions				Funzioni data e ora
+##
+DATE			= DATA				##	Restituisce il numero seriale di una determinata data
+DATEVALUE		= DATA.VALORE			##	Converte una data sotto forma di testo in un numero seriale
+DAY			= GIORNO			##	Converte un numero seriale in un giorno del mese
+DAYS360			= GIORNO360			##	Calcola il numero di giorni compreso tra due date basandosi su un anno di 360 giorni
+EDATE			= DATA.MESE			##	Restituisce il numero seriale della data che rappresenta il numero di mesi prima o dopo la data di inizio
+EOMONTH			= FINE.MESE			##	Restituisce il numero seriale dell'ultimo giorno del mese, prima o dopo un determinato numero di mesi
+HOUR			= ORA				##	Converte un numero seriale in un'ora
+MINUTE			= MINUTO			##	Converte un numero seriale in un minuto
+MONTH			= MESE				##	Converte un numero seriale in un mese
+NETWORKDAYS		= GIORNI.LAVORATIVI.TOT		##	Restituisce il numero di tutti i giorni lavorativi compresi fra due date
+NOW			= ADESSO			##	Restituisce il numero seriale della data e dell'ora corrente
+SECOND			= SECONDO			##	Converte un numero seriale in un secondo
+TIME			= ORARIO			##	Restituisce il numero seriale di una determinata ora
+TIMEVALUE		= ORARIO.VALORE			##	Converte un orario in forma di testo in un numero seriale
+TODAY			= OGGI				##	Restituisce il numero seriale relativo alla data odierna
+WEEKDAY			= GIORNO.SETTIMANA		##	Converte un numero seriale in un giorno della settimana
+WEEKNUM			= NUM.SETTIMANA			##	Converte un numero seriale in un numero che rappresenta la posizione numerica di una settimana nell'anno
+WORKDAY			= GIORNO.LAVORATIVO		##	Restituisce il numero della data prima o dopo un determinato numero di giorni lavorativi
+YEAR			= ANNO				##	Converte un numero seriale in un anno
+YEARFRAC		= FRAZIONE.ANNO			##	Restituisce la frazione dell'anno che rappresenta il numero dei giorni compresi tra una data_ iniziale e una data_finale
+
+
+##
+##	Engineering functions				Funzioni ingegneristiche
+##
+BESSELI			= BESSEL.I			##	Restituisce la funzione di Bessel modificata In(x)
+BESSELJ			= BESSEL.J			##	Restituisce la funzione di Bessel Jn(x)
+BESSELK			= BESSEL.K			##	Restituisce la funzione di Bessel modificata Kn(x)
+BESSELY			= BESSEL.Y			##	Restituisce la funzione di Bessel Yn(x)
+BIN2DEC			= BINARIO.DECIMALE		##	Converte un numero binario in decimale
+BIN2HEX			= BINARIO.HEX			##	Converte un numero binario in esadecimale
+BIN2OCT			= BINARIO.OCT			##	Converte un numero binario in ottale
+COMPLEX			= COMPLESSO			##	Converte i coefficienti reali e immaginari in numeri complessi
+CONVERT			= CONVERTI			##	Converte un numero da un sistema di misura in un altro
+DEC2BIN			= DECIMALE.BINARIO		##	Converte un numero decimale in binario
+DEC2HEX			= DECIMALE.HEX			##	Converte un numero decimale in esadecimale
+DEC2OCT			= DECIMALE.OCT			##	Converte un numero decimale in ottale
+DELTA			= DELTA				##	Verifica se due valori sono uguali
+ERF			= FUNZ.ERRORE			##	Restituisce la funzione di errore
+ERFC			= FUNZ.ERRORE.COMP		##	Restituisce la funzione di errore complementare
+GESTEP			= SOGLIA			##	Verifica se un numero è maggiore del valore di soglia
+HEX2BIN			= HEX.BINARIO			##	Converte un numero esadecimale in binario
+HEX2DEC			= HEX.DECIMALE			##	Converte un numero esadecimale in decimale
+HEX2OCT			= HEX.OCT			##	Converte un numero esadecimale in ottale
+IMABS			= COMP.MODULO			##	Restituisce il valore assoluto (modulo) di un numero complesso
+IMAGINARY		= COMP.IMMAGINARIO		##	Restituisce il coefficiente immaginario di un numero complesso
+IMARGUMENT		= COMP.ARGOMENTO		##	Restituisce l'argomento theta, un angolo espresso in radianti
+IMCONJUGATE		= COMP.CONIUGATO		##	Restituisce il complesso coniugato del numero complesso
+IMCOS			= COMP.COS			##	Restituisce il coseno di un numero complesso
+IMDIV			= COMP.DIV			##	Restituisce il quoziente di due numeri complessi
+IMEXP			= COMP.EXP			##	Restituisce il valore esponenziale di un numero complesso
+IMLN			= COMP.LN			##	Restituisce il logaritmo naturale di un numero complesso
+IMLOG10			= COMP.LOG10			##	Restituisce il logaritmo in base 10 di un numero complesso
+IMLOG2			= COMP.LOG2			##	Restituisce un logaritmo in base 2 di un numero complesso
+IMPOWER			= COMP.POTENZA			##	Restituisce il numero complesso elevato a una potenza intera
+IMPRODUCT		= COMP.PRODOTTO			##	Restituisce il prodotto di numeri complessi compresi tra 2 e 29
+IMREAL			= COMP.PARTE.REALE		##	Restituisce il coefficiente reale di un numero complesso
+IMSIN			= COMP.SEN			##	Restituisce il seno di un numero complesso
+IMSQRT			= COMP.RADQ			##	Restituisce la radice quadrata di un numero complesso
+IMSUB			= COMP.DIFF			##	Restituisce la differenza fra due numeri complessi
+IMSUM			= COMP.SOMMA			##	Restituisce la somma di numeri complessi
+OCT2BIN			= OCT.BINARIO			##	Converte un numero ottale in binario
+OCT2DEC			= OCT.DECIMALE			##	Converte un numero ottale in decimale
+OCT2HEX			= OCT.HEX			##	Converte un numero ottale in esadecimale
+
+
+##
+##	Financial functions				Funzioni finanziarie
+##
+ACCRINT			= INT.MATURATO.PER		##	Restituisce l'interesse maturato di un titolo che paga interessi periodici
+ACCRINTM		= INT.MATURATO.SCAD		##	Restituisce l'interesse maturato di un titolo che paga interessi alla scadenza
+AMORDEGRC		= AMMORT.DEGR			##	Restituisce l'ammortamento per ogni periodo contabile utilizzando un coefficiente di ammortamento
+AMORLINC		= AMMORT.PER			##	Restituisce l'ammortamento per ogni periodo contabile
+COUPDAYBS		= GIORNI.CED.INIZ.LIQ		##	Restituisce il numero dei giorni che vanno dall'inizio del periodo di durata della cedola alla data di liquidazione
+COUPDAYS		= GIORNI.CED			##	Restituisce il numero dei giorni relativi al periodo della cedola che contiene la data di liquidazione
+COUPDAYSNC		= GIORNI.CED.NUOVA		##	Restituisce il numero di giorni che vanno dalla data di liquidazione alla data della cedola successiva
+COUPNCD			= DATA.CED.SUCC			##	Restituisce un numero che rappresenta la data della cedola successiva alla data di liquidazione
+COUPNUM			= NUM.CED			##	Restituisce il numero di cedole pagabili fra la data di liquidazione e la data di scadenza
+COUPPCD			= DATA.CED.PREC			##	Restituisce un numero che rappresenta la data della cedola precedente alla data di liquidazione
+CUMIPMT			= INT.CUMUL			##	Restituisce l'interesse cumulativo pagato fra due periodi
+CUMPRINC		= CAP.CUM			##	Restituisce il capitale cumulativo pagato per estinguere un debito fra due periodi
+DB			= DB				##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a quote fisse decrescenti
+DDB			= AMMORT			##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a doppie quote decrescenti o altri metodi specificati
+DISC			= TASSO.SCONTO			##	Restituisce il tasso di sconto per un titolo
+DOLLARDE		= VALUTA.DEC			##	Converte un prezzo valuta, espresso come frazione, in prezzo valuta, espresso come numero decimale
+DOLLARFR		= VALUTA.FRAZ			##	Converte un prezzo valuta, espresso come numero decimale, in prezzo valuta, espresso come frazione
+DURATION		= DURATA			##	Restituisce la durata annuale di un titolo con i pagamenti di interesse periodico
+EFFECT			= EFFETTIVO			##	Restituisce l'effettivo tasso di interesse annuo
+FV			= VAL.FUT			##	Restituisce il valore futuro di un investimento
+FVSCHEDULE		= VAL.FUT.CAPITALE		##	Restituisce il valore futuro di un capitale iniziale dopo aver applicato una serie di tassi di interesse composti
+INTRATE			= TASSO.INT			##	Restituisce il tasso di interesse per un titolo interamente investito
+IPMT			= INTERESSI			##	Restituisce il valore degli interessi per un investimento relativo a un periodo specifico
+IRR			= TIR.COST			##	Restituisce il tasso di rendimento interno per una serie di flussi di cassa
+ISPMT			= INTERESSE.RATA		##	Calcola l'interesse di un investimento pagato durante un periodo specifico
+MDURATION		= DURATA.M			##	Restituisce la durata Macauley modificata per un titolo con un valore presunto di € 100
+MIRR			= TIR.VAR			##	Restituisce il tasso di rendimento interno in cui i flussi di cassa positivi e negativi sono finanziati a tassi differenti
+NOMINAL			= NOMINALE			##	Restituisce il tasso di interesse nominale annuale
+NPER			= NUM.RATE			##	Restituisce un numero di periodi relativi a un investimento
+NPV			= VAN				##	Restituisce il valore attuale netto di un investimento basato su una serie di flussi di cassa periodici e sul tasso di sconto
+ODDFPRICE		= PREZZO.PRIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente il primo periodo di durata irregolare
+ODDFYIELD		= REND.PRIMO.IRR		##	Restituisce il rendimento di un titolo avente il primo periodo di durata irregolare
+ODDLPRICE		= PREZZO.ULTIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente l'ultimo periodo di durata irregolare
+ODDLYIELD		= REND.ULTIMO.IRR		##	Restituisce il rendimento di un titolo avente l'ultimo periodo di durata irregolare
+PMT			= RATA				##	Restituisce il pagamento periodico di una rendita annua
+PPMT			= P.RATA			##	Restituisce il pagamento sul capitale di un investimento per un dato periodo
+PRICE			= PREZZO			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga interessi periodici
+PRICEDISC		= PREZZO.SCONT			##	Restituisce il prezzo di un titolo scontato dal valore nominale di € 100
+PRICEMAT		= PREZZO.SCAD			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga gli interessi alla scadenza
+PV			= VA				##	Restituisce il valore attuale di un investimento
+RATE			= TASSO				##	Restituisce il tasso di interesse per un periodo di un'annualità
+RECEIVED		= RICEV.SCAD			##	Restituisce l'ammontare ricevuto alla scadenza di un titolo interamente investito
+SLN			= AMMORT.COST			##	Restituisce l'ammortamento a quote costanti di un bene per un singolo periodo
+SYD			= AMMORT.ANNUO			##	Restituisce l'ammortamento a somma degli anni di un bene per un periodo specificato
+TBILLEQ			= BOT.EQUIV			##	Restituisce il rendimento equivalente ad un'obbligazione per un Buono ordinario del Tesoro
+TBILLPRICE		= BOT.PREZZO			##	Restituisce il prezzo di un Buono del Tesoro dal valore nominale di € 100
+TBILLYIELD		= BOT.REND			##	Restituisce il rendimento di un Buono del Tesoro
+VDB			= AMMORT.VAR			##	Restituisce l'ammortamento di un bene per un periodo specificato o parziale utilizzando il metodo a doppie quote proporzionali ai valori residui
+XIRR			= TIR.X				##	Restituisce il tasso di rendimento interno di un impiego di flussi di cassa
+XNPV			= VAN.X				##	Restituisce il valore attuale netto di un impiego di flussi di cassa non necessariamente periodici
+YIELD			= REND				##	Restituisce il rendimento di un titolo che frutta interessi periodici
+YIELDDISC		= REND.TITOLI.SCONT		##	Restituisce il rendimento annuale di un titolo scontato, ad esempio un Buono del Tesoro
+YIELDMAT		= REND.SCAD			##	Restituisce il rendimento annuo di un titolo che paga interessi alla scadenza
+
+
+##
+##	Information functions				Funzioni relative alle informazioni
+##
+CELL			= CELLA				##	Restituisce le informazioni sulla formattazione, la posizione o i contenuti di una cella
+ERROR.TYPE		= ERRORE.TIPO			##	Restituisce un numero che corrisponde a un tipo di errore
+INFO			= INFO				##	Restituisce le informazioni sull'ambiente operativo corrente
+ISBLANK			= VAL.VUOTO			##	Restituisce VERO se il valore è vuoto
+ISERR			= VAL.ERR			##	Restituisce VERO se il valore è un valore di errore qualsiasi tranne #N/D
+ISERROR			= VAL.ERRORE			##	Restituisce VERO se il valore è un valore di errore qualsiasi
+ISEVEN			= VAL.PARI			##	Restituisce VERO se il numero è pari
+ISLOGICAL		= VAL.LOGICO			##	Restituisce VERO se il valore è un valore logico
+ISNA			= VAL.NON.DISP			##	Restituisce VERO se il valore è un valore di errore #N/D
+ISNONTEXT		= VAL.NON.TESTO			##	Restituisce VERO se il valore non è in formato testo
+ISNUMBER		= VAL.NUMERO			##	Restituisce VERO se il valore è un numero
+ISODD			= VAL.DISPARI			##	Restituisce VERO se il numero è dispari
+ISREF			= VAL.RIF			##	Restituisce VERO se il valore è un riferimento
+ISTEXT			= VAL.TESTO			##	Restituisce VERO se il valore è in formato testo
+N			= NUM				##	Restituisce un valore convertito in numero
+NA			= NON.DISP			##	Restituisce il valore di errore #N/D
+TYPE			= TIPO				##	Restituisce un numero che indica il tipo di dati relativi a un valore
+
+
+##
+##	Logical functions				Funzioni logiche
+##
+AND			= E				##	Restituisce VERO se tutti gli argomenti sono VERO
+FALSE			= FALSO				##	Restituisce il valore logico FALSO
+IF			= SE				##	Specifica un test logico da eseguire
+IFERROR			= SE.ERRORE			##	Restituisce un valore specificato se una formula fornisce un errore come risultato; in caso contrario, restituisce il risultato della formula
+NOT			= NON				##	Inverte la logica degli argomenti
+OR			= O				##	Restituisce VERO se un argomento qualsiasi è VERO
+TRUE			= VERO				##	Restituisce il valore logico VERO
+
+
+##
+##	Lookup and reference functions			Funzioni di ricerca e di riferimento
+##
+ADDRESS			= INDIRIZZO			##	Restituisce un riferimento come testo in una singola cella di un foglio di lavoro
+AREAS			= AREE				##	Restituisce il numero di aree in un riferimento
+CHOOSE			= SCEGLI			##	Sceglie un valore da un elenco di valori
+COLUMN			= RIF.COLONNA			##	Restituisce il numero di colonna di un riferimento
+COLUMNS			= COLONNE			##	Restituisce il numero di colonne in un riferimento
+HLOOKUP			= CERCA.ORIZZ			##	Effettua una ricerca nella riga superiore di una matrice e restituisce il valore della cella specificata
+HYPERLINK		= COLLEG.IPERTESTUALE		##	Crea un collegamento che apre un documento memorizzato in un server di rete, una rete Intranet o Internet
+INDEX			= INDICE			##	Utilizza un indice per scegliere un valore da un riferimento o da una matrice
+INDIRECT		= INDIRETTO			##	Restituisce un riferimento specificato da un valore testo
+LOOKUP			= CERCA				##	Ricerca i valori in un vettore o in una matrice
+MATCH			= CONFRONTA			##	Ricerca i valori in un riferimento o in una matrice
+OFFSET			= SCARTO			##	Restituisce uno scarto di riferimento da un riferimento dato
+ROW			= RIF.RIGA			##	Restituisce il numero di riga di un riferimento
+ROWS			= RIGHE				##	Restituisce il numero delle righe in un riferimento
+RTD			= DATITEMPOREALE		##	Recupera dati in tempo reale da un programma che supporta l'automazione COM (automazione: Metodo per utilizzare gli oggetti di un'applicazione da un'altra applicazione o da un altro strumento di sviluppo. Precedentemente nota come automazione OLE, l'automazione è uno standard del settore e una caratteristica del modello COM (Component Object Model).)
+TRANSPOSE		= MATR.TRASPOSTA		##	Restituisce la trasposizione di una matrice
+VLOOKUP			= CERCA.VERT			##	Effettua una ricerca nella prima colonna di una matrice e si sposta attraverso la riga per restituire il valore di una cella
+
+
+##
+##	Math and trigonometry functions			Funzioni matematiche e trigonometriche
+##
+ABS			= ASS				##	Restituisce il valore assoluto di un numero.
+ACOS			= ARCCOS			##	Restituisce l'arcocoseno di un numero
+ACOSH			= ARCCOSH			##	Restituisce l'inverso del coseno iperbolico di un numero
+ASIN			= ARCSEN			##	Restituisce l'arcoseno di un numero
+ASINH			= ARCSENH			##	Restituisce l'inverso del seno iperbolico di un numero
+ATAN			= ARCTAN			##	Restituisce l'arcotangente di un numero
+ATAN2			= ARCTAN.2			##	Restituisce l'arcotangente delle coordinate x e y specificate
+ATANH			= ARCTANH			##	Restituisce l'inverso della tangente iperbolica di un numero
+CEILING			= ARROTONDA.ECCESSO		##	Arrotonda un numero per eccesso all'intero più vicino o al multiplo più vicino a peso
+COMBIN			= COMBINAZIONE			##	Restituisce il numero di combinazioni possibili per un numero assegnato di elementi
+COS			= COS				##	Restituisce il coseno dell'angolo specificato
+COSH			= COSH				##	Restituisce il coseno iperbolico di un numero
+DEGREES			= GRADI				##	Converte i radianti in gradi
+EVEN			= PARI				##	Arrotonda il valore assoluto di un numero per eccesso al più vicino intero pari
+EXP			= ESP				##	Restituisce il numero e elevato alla potenza di num
+FACT			= FATTORIALE			##	Restituisce il fattoriale di un numero
+FACTDOUBLE		= FATT.DOPPIO			##	Restituisce il fattoriale doppio di un numero
+FLOOR			= ARROTONDA.DIFETTO		##	Arrotonda un numero per difetto al multiplo più vicino a zero
+GCD			= MCD				##	Restituisce il massimo comune divisore
+INT			= INT				##	Arrotonda un numero per difetto al numero intero più vicino
+LCM			= MCM				##	Restituisce il minimo comune multiplo
+LN			= LN				##	Restituisce il logaritmo naturale di un numero
+LOG			= LOG				##	Restituisce il logaritmo di un numero in una specificata base
+LOG10			= LOG10				##	Restituisce il logaritmo in base 10 di un numero
+MDETERM			= MATR.DETERM			##	Restituisce il determinante di una matrice
+MINVERSE		= MATR.INVERSA			##	Restituisce l'inverso di una matrice
+MMULT			= MATR.PRODOTTO			##	Restituisce il prodotto di due matrici
+MOD			= RESTO				##	Restituisce il resto della divisione
+MROUND			= ARROTONDA.MULTIPLO		##	Restituisce un numero arrotondato al multiplo desiderato
+MULTINOMIAL		= MULTINOMIALE			##	Restituisce il multinomiale di un insieme di numeri
+ODD			= DISPARI			##	Arrotonda un numero per eccesso al più vicino intero dispari
+PI			= PI.GRECO			##	Restituisce il valore di pi greco
+POWER			= POTENZA			##	Restituisce il risultato di un numero elevato a potenza
+PRODUCT			= PRODOTTO			##	Moltiplica i suoi argomenti
+QUOTIENT		= QUOZIENTE			##	Restituisce la parte intera di una divisione
+RADIANS			= RADIANTI			##	Converte i gradi in radianti
+RAND			= CASUALE			##	Restituisce un numero casuale compreso tra 0 e 1
+RANDBETWEEN		= CASUALE.TRA			##	Restituisce un numero casuale compreso tra i numeri specificati
+ROMAN			= ROMANO			##	Restituisce il numero come numero romano sotto forma di testo
+ROUND			= ARROTONDA			##	Arrotonda il numero al numero di cifre specificato
+ROUNDDOWN		= ARROTONDA.PER.DIF		##	Arrotonda il valore assoluto di un numero per difetto
+ROUNDUP			= ARROTONDA.PER.ECC		##	Arrotonda il valore assoluto di un numero per eccesso
+SERIESSUM		= SOMMA.SERIE			##	Restituisce la somma di una serie di potenze in base alla formula
+SIGN			= SEGNO				##	Restituisce il segno di un numero
+SIN			= SEN				##	Restituisce il seno di un dato angolo
+SINH			= SENH				##	Restituisce il seno iperbolico di un numero
+SQRT			= RADQ				##	Restituisce una radice quadrata
+SQRTPI			= RADQ.PI.GRECO			##	Restituisce la radice quadrata di un numero (numero * pi greco)
+SUBTOTAL		= SUBTOTALE			##	Restituisce un subtotale in un elenco o in un database
+SUM			= SOMMA				##	Somma i suoi argomenti
+SUMIF			= SOMMA.SE			##	Somma le celle specificate da un dato criterio
+SUMIFS			= SOMMA.PIÙ.SE			##	Somma le celle in un intervallo che soddisfano più criteri
+SUMPRODUCT		= MATR.SOMMA.PRODOTTO		##	Restituisce la somma dei prodotti dei componenti corrispondenti della matrice
+SUMSQ			= SOMMA.Q			##	Restituisce la somma dei quadrati degli argomenti
+SUMX2MY2		= SOMMA.DIFF.Q			##	Restituisce la somma della differenza dei quadrati dei corrispondenti elementi in due matrici
+SUMX2PY2		= SOMMA.SOMMA.Q			##	Restituisce la somma della somma dei quadrati dei corrispondenti elementi in due matrici
+SUMXMY2			= SOMMA.Q.DIFF			##	Restituisce la somma dei quadrati delle differenze dei corrispondenti elementi in due matrici
+TAN			= TAN				##	Restituisce la tangente di un numero
+TANH			= TANH				##	Restituisce la tangente iperbolica di un numero
+TRUNC			= TRONCA			##	Tronca la parte decimale di un numero
+
+
+##
+##	Statistical functions				Funzioni statistiche
+##
+AVEDEV			= MEDIA.DEV			##	Restituisce la media delle deviazioni assolute delle coordinate rispetto alla loro media
+AVERAGE			= MEDIA				##	Restituisce la media degli argomenti
+AVERAGEA		= MEDIA.VALORI			##	Restituisce la media degli argomenti, inclusi i numeri, il testo e i valori logici
+AVERAGEIF		= MEDIA.SE			##	Restituisce la media aritmetica di tutte le celle in un intervallo che soddisfano un determinato criterio
+AVERAGEIFS		= MEDIA.PIÙ.SE			##	Restituisce la media aritmetica di tutte le celle che soddisfano più criteri
+BETADIST		= DISTRIB.BETA			##	Restituisce la funzione di distribuzione cumulativa beta
+BETAINV			= INV.BETA			##	Restituisce l'inverso della funzione di distribuzione cumulativa per una distribuzione beta specificata
+BINOMDIST		= DISTRIB.BINOM			##	Restituisce la distribuzione binomiale per il termine individuale
+CHIDIST			= DISTRIB.CHI			##	Restituisce la probabilità a una coda per la distribuzione del chi quadrato
+CHIINV			= INV.CHI			##	Restituisce l'inverso della probabilità ad una coda per la distribuzione del chi quadrato
+CHITEST			= TEST.CHI			##	Restituisce il test per l'indipendenza
+CONFIDENCE		= CONFIDENZA			##	Restituisce l'intervallo di confidenza per una popolazione
+CORREL			= CORRELAZIONE			##	Restituisce il coefficiente di correlazione tra due insiemi di dati
+COUNT			= CONTA.NUMERI			##	Conta la quantità di numeri nell'elenco di argomenti
+COUNTA			= CONTA.VALORI			##	Conta il numero di valori nell'elenco di argomenti
+COUNTBLANK		= CONTA.VUOTE			##	Conta il numero di celle vuote all'interno di un intervallo
+COUNTIF			= CONTA.SE			##	Conta il numero di celle all'interno di un intervallo che soddisfa i criteri specificati
+COUNTIFS		= CONTA.PIÙ.SE			##	Conta il numero di celle in un intervallo che soddisfano più criteri.
+COVAR			= COVARIANZA			##	Calcola la covarianza, la media dei prodotti delle deviazioni accoppiate
+CRITBINOM		= CRIT.BINOM			##	Restituisce il più piccolo valore per il quale la distribuzione cumulativa binomiale risulta maggiore o uguale ad un valore di criterio
+DEVSQ			= DEV.Q				##	Restituisce la somma dei quadrati delle deviazioni
+EXPONDIST		= DISTRIB.EXP			##	Restituisce la distribuzione esponenziale
+FDIST			= DISTRIB.F			##	Restituisce la distribuzione di probabilità F
+FINV			= INV.F				##	Restituisce l'inverso della distribuzione della probabilità F
+FISHER			= FISHER			##	Restituisce la trasformazione di Fisher
+FISHERINV		= INV.FISHER			##	Restituisce l'inverso della trasformazione di Fisher
+FORECAST		= PREVISIONE			##	Restituisce i valori lungo una tendenza lineare
+FREQUENCY		= FREQUENZA			##	Restituisce la distribuzione di frequenza come matrice verticale
+FTEST			= TEST.F			##	Restituisce il risultato di un test F
+GAMMADIST		= DISTRIB.GAMMA			##	Restituisce la distribuzione gamma
+GAMMAINV		= INV.GAMMA			##	Restituisce l'inverso della distribuzione cumulativa gamma
+GAMMALN			= LN.GAMMA			##	Restituisce il logaritmo naturale della funzione gamma, G(x)
+GEOMEAN			= MEDIA.GEOMETRICA		##	Restituisce la media geometrica
+GROWTH			= CRESCITA			##	Restituisce i valori lungo una linea di tendenza esponenziale
+HARMEAN			= MEDIA.ARMONICA		##	Restituisce la media armonica
+HYPGEOMDIST		= DISTRIB.IPERGEOM		##	Restituisce la distribuzione ipergeometrica
+INTERCEPT		= INTERCETTA			##	Restituisce l'intercetta della retta di regressione lineare
+KURT			= CURTOSI			##	Restituisce la curtosi di un insieme di dati
+LARGE			= GRANDE			##	Restituisce il k-esimo valore più grande in un insieme di dati
+LINEST			= REGR.LIN			##	Restituisce i parametri di una tendenza lineare
+LOGEST			= REGR.LOG			##	Restituisce i parametri di una linea di tendenza esponenziale
+LOGINV			= INV.LOGNORM			##	Restituisce l'inverso di una distribuzione lognormale
+LOGNORMDIST		= DISTRIB.LOGNORM		##	Restituisce la distribuzione lognormale cumulativa
+MAX			= MAX				##	Restituisce il valore massimo in un elenco di argomenti
+MAXA			= MAX.VALORI			##	Restituisce il valore massimo in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
+MEDIAN			= MEDIANA			##	Restituisce la mediana dei numeri specificati
+MIN			= MIN				##	Restituisce il valore minimo in un elenco di argomenti
+MINA			= MIN.VALORI			##	Restituisce il più piccolo valore in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
+MODE			= MODA				##	Restituisce il valore più comune in un insieme di dati
+NEGBINOMDIST		= DISTRIB.BINOM.NEG		##	Restituisce la distribuzione binomiale negativa
+NORMDIST		= DISTRIB.NORM			##	Restituisce la distribuzione cumulativa normale
+NORMINV			= INV.NORM			##	Restituisce l'inverso della distribuzione cumulativa normale standard
+NORMSDIST		= DISTRIB.NORM.ST		##	Restituisce la distribuzione cumulativa normale standard
+NORMSINV		= INV.NORM.ST			##	Restituisce l'inverso della distribuzione cumulativa normale
+PEARSON			= PEARSON			##	Restituisce il coefficiente del momento di correlazione di Pearson
+PERCENTILE		= PERCENTILE			##	Restituisce il k-esimo dato percentile di valori in un intervallo
+PERCENTRANK		= PERCENT.RANGO			##	Restituisce il rango di un valore in un insieme di dati come percentuale
+PERMUT			= PERMUTAZIONE			##	Restituisce il numero delle permutazioni per un determinato numero di oggetti
+POISSON			= POISSON			##	Restituisce la distribuzione di Poisson
+PROB			= PROBABILITÀ			##	Calcola la probabilità che dei valori in un intervallo siano compresi tra due limiti
+QUARTILE		= QUARTILE			##	Restituisce il quartile di un insieme di dati
+RANK			= RANGO				##	Restituisce il rango di un numero in un elenco di numeri
+RSQ			= RQ				##	Restituisce la radice quadrata del coefficiente di momento di correlazione di Pearson
+SKEW			= ASIMMETRIA			##	Restituisce il grado di asimmetria di una distribuzione
+SLOPE			= PENDENZA			##	Restituisce la pendenza di una retta di regressione lineare
+SMALL			= PICCOLO			##	Restituisce il k-esimo valore più piccolo in un insieme di dati
+STANDARDIZE		= NORMALIZZA			##	Restituisce un valore normalizzato
+STDEV			= DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione
+STDEVA			= DEV.ST.VALORI			##	Restituisce una stima della deviazione standard sulla base di un campione, inclusi i numeri, il testo e i valori logici
+STDEVP			= DEV.ST.POP			##	Calcola la deviazione standard sulla base di un'intera popolazione
+STDEVPA			= DEV.ST.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
+STEYX			= ERR.STD.YX			##	Restituisce l'errore standard del valore previsto per y per ogni valore x nella regressione
+TDIST			= DISTRIB.T			##	Restituisce la distribuzione t di Student
+TINV			= INV.T				##	Restituisce l'inversa della distribuzione t di Student
+TREND			= TENDENZA			##	Restituisce i valori lungo una linea di tendenza lineare
+TRIMMEAN		= MEDIA.TRONCATA		##	Restituisce la media della parte interna di un insieme di dati
+TTEST			= TEST.T			##	Restituisce la probabilità associata ad un test t di Student
+VAR			= VAR				##	Stima la varianza sulla base di un campione
+VARA			= VAR.VALORI			##	Stima la varianza sulla base di un campione, inclusi i numeri, il testo e i valori logici
+VARP			= VAR.POP			##	Calcola la varianza sulla base dell'intera popolazione
+VARPA			= VAR.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
+WEIBULL			= WEIBULL			##	Restituisce la distribuzione di Weibull
+ZTEST			= TEST.Z			##	Restituisce il valore di probabilità a una coda per un test z
+
+
+##
+##	Text functions					Funzioni di testo
+##
+ASC			= ASC				##	Modifica le lettere inglesi o il katakana a doppio byte all'interno di una stringa di caratteri in caratteri a singolo byte
+BAHTTEXT		= BAHTTESTO			##	Converte un numero in testo, utilizzando il formato valuta ß (baht)
+CHAR			= CODICE.CARATT			##	Restituisce il carattere specificato dal numero di codice
+CLEAN			= LIBERA			##	Elimina dal testo tutti i caratteri che non è possibile stampare
+CODE			= CODICE			##	Restituisce il codice numerico del primo carattere di una stringa di testo
+CONCATENATE		= CONCATENA			##	Unisce diversi elementi di testo in un unico elemento di testo
+DOLLAR			= VALUTA			##	Converte un numero in testo, utilizzando il formato valuta € (euro)
+EXACT			= IDENTICO			##	Verifica se due valori di testo sono uguali
+FIND			= TROVA				##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
+FINDB			= TROVA.B			##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
+FIXED			= FISSO				##	Formatta un numero come testo con un numero fisso di decimali
+JIS			= ORDINAMENTO.JIS		##	Modifica le lettere inglesi o i caratteri katakana a byte singolo all'interno di una stringa di caratteri in caratteri a byte doppio.
+LEFT			= SINISTRA			##	Restituisce il carattere più a sinistra di un valore di testo
+LEFTB			= SINISTRA.B			##	Restituisce il carattere più a sinistra di un valore di testo
+LEN			= LUNGHEZZA			##	Restituisce il numero di caratteri di una stringa di testo
+LENB			= LUNB				##	Restituisce il numero di caratteri di una stringa di testo
+LOWER			= MINUSC			##	Converte il testo in lettere minuscole
+MID			= MEDIA				##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
+MIDB			= MEDIA.B			##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
+PHONETIC		= FURIGANA			##	Estrae i caratteri fonetici (furigana) da una stringa di testo.
+PROPER			= MAIUSC.INIZ			##	Converte in maiuscolo la prima lettera di ogni parola di un valore di testo
+REPLACE			= RIMPIAZZA			##	Sostituisce i caratteri all'interno di un testo
+REPLACEB		= SOSTITUISCI.B			##	Sostituisce i caratteri all'interno di un testo
+REPT			= RIPETI			##	Ripete un testo per un dato numero di volte
+RIGHT			= DESTRA			##	Restituisce il carattere più a destra di un valore di testo
+RIGHTB			= DESTRA.B			##	Restituisce il carattere più a destra di un valore di testo
+SEARCH			= RICERCA			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
+SEARCHB			= CERCA.B			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
+SUBSTITUTE		= SOSTITUISCI			##	Sostituisce il nuovo testo al testo contenuto in una stringa
+T			= T				##	Converte gli argomenti in testo
+TEXT			= TESTO				##	Formatta un numero e lo converte in testo
+TRIM			= ANNULLA.SPAZI			##	Elimina gli spazi dal testo
+UPPER			= MAIUSC			##	Converte il testo in lettere maiuscole
+VALUE			= VALORE			##	Converte un argomento di testo in numero
diff --git a/lib/PHPExcel/locale/nl/config b/lib/PHPExcel/locale/nl/config
new file mode 100644
index 000000000..48dcc15b5
--- /dev/null
+++ b/lib/PHPExcel/locale/nl/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= €
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #LEEG!
+DIV0	= #DEEL/0!
+VALUE	= #WAARDE!
+REF	= #VERW!
+NAME	= #NAAM?
+NUM	= #GETAL!
+NA	= #N/B
diff --git a/lib/PHPExcel/locale/nl/functions b/lib/PHPExcel/locale/nl/functions
new file mode 100644
index 000000000..573600aca
--- /dev/null
+++ b/lib/PHPExcel/locale/nl/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Automatiseringsfuncties en functies in invoegtoepassingen
+##
+GETPIVOTDATA		= DRAAITABEL.OPHALEN		##	Geeft gegevens uit een draaitabelrapport als resultaat
+
+
+##
+##	Cube functions					Kubusfuncties
+##
+CUBEKPIMEMBER		= KUBUSKPILID			##	Retourneert de naam, eigenschap en waarde van een KPI (prestatie-indicator) en geeft de naam en de eigenschap in de cel weer. Een KPI is een meetbare waarde, zoals de maandelijkse brutowinst of de omzet per kwartaal per werknemer, die wordt gebruikt om de prestaties van een organisatie te bewaken
+CUBEMEMBER		= KUBUSLID			##	Retourneert een lid of tupel in een kubushiërarchie. Wordt gebruikt om te controleren of het lid of de tupel in de kubus aanwezig is
+CUBEMEMBERPROPERTY	= KUBUSLIDEIGENSCHAP		##	Retourneert de waarde van een lideigenschap in de kubus. Wordt gebruikt om te controleren of de lidnaam in de kubus bestaat en retourneert de opgegeven eigenschap voor dit lid
+CUBERANKEDMEMBER	= KUBUSGERANGCHIKTLID		##	Retourneert het zoveelste, gerangschikte lid in een set. Wordt gebruikt om een of meer elementen in een set te retourneren, zoals de tien beste verkopers of de tien beste studenten
+CUBESET			= KUBUSSET			##	Definieert een berekende set leden of tupels door een ingestelde expressie naar de kubus op de server te sturen, alwaar de set wordt gemaakt en vervolgens wordt geretourneerd naar Microsoft Office Excel
+CUBESETCOUNT		= KUBUSSETAANTAL		##	Retourneert het aantal onderdelen in een set
+CUBEVALUE		= KUBUSWAARDE			##	Retourneert een samengestelde waarde van een kubus
+
+
+##
+##	Database functions				Databasefuncties
+##
+DAVERAGE		= DBGEMIDDELDE			##	Berekent de gemiddelde waarde in geselecteerde databasegegevens
+DCOUNT			= DBAANTAL			##	Telt de cellen met getallen in een database
+DCOUNTA			= DBAANTALC			##	Telt de niet-lege cellen in een database
+DGET			= DBLEZEN			##	Retourneert één record dat voldoet aan de opgegeven criteria uit een database
+DMAX			= DBMAX				##	Retourneert de maximumwaarde in de geselecteerde databasegegevens
+DMIN			= DBMIN				##	Retourneert de minimumwaarde in de geselecteerde databasegegevens
+DPRODUCT		= DBPRODUCT			##	Vermenigvuldigt de waarden in een bepaald veld van de records die voldoen aan de criteria in een database
+DSTDEV			= DBSTDEV			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef uit geselecteerde databasegegevens
+DSTDEVP			= DBSTDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie van geselecteerde databasegegevens
+DSUM			= DBSOM				##	Telt de getallen uit een kolom records in de database op die voldoen aan de criteria
+DVAR			= DBVAR				##	Maakt een schatting van de variantie op basis van een steekproef uit geselecteerde databasegegevens
+DVARP			= DBVARP			##	Berekent de variantie op basis van de volledige populatie van geselecteerde databasegegevens
+
+
+##
+##	Date and time functions				Datum- en tijdfuncties
+##
+DATE			= DATUM				##	Geeft als resultaat het seriële getal van een opgegeven datum
+DATEVALUE		= DATUMWAARDE			##	Converteert een datum in de vorm van tekst naar een serieel getal
+DAY			= DAG				##	Converteert een serieel getal naar een dag van de maand
+DAYS360			= DAGEN360			##	Berekent het aantal dagen tussen twee datums op basis van een jaar met 360 dagen
+EDATE			= ZELFDE.DAG			##	Geeft als resultaat het seriële getal van een datum die het opgegeven aantal maanden voor of na de begindatum ligt
+EOMONTH			= LAATSTE.DAG			##	Geeft als resultaat het seriële getal van de laatste dag van de maand voor of na het opgegeven aantal maanden
+HOUR			= UUR				##	Converteert een serieel getal naar uren
+MINUTE			= MINUUT			##	Converteert een serieel naar getal minuten
+MONTH			= MAAND				##	Converteert een serieel getal naar een maand
+NETWORKDAYS		= NETTO.WERKDAGEN		##	Geeft als resultaat het aantal hele werkdagen tussen twee datums
+NOW			= NU				##	Geeft als resultaat het seriële getal van de huidige datum en tijd
+SECOND			= SECONDE			##	Converteert een serieel getal naar seconden
+TIME			= TIJD				##	Geeft als resultaat het seriële getal van een bepaald tijdstip
+TIMEVALUE		= TIJDWAARDE			##	Converteert de tijd in de vorm van tekst naar een serieel getal
+TODAY			= VANDAAG			##	Geeft als resultaat het seriële getal van de huidige datum
+WEEKDAY			= WEEKDAG			##	Converteert een serieel getal naar een weekdag
+WEEKNUM			= WEEKNUMMER			##	Converteert een serieel getal naar een weeknummer
+WORKDAY			= WERKDAG			##	Geeft als resultaat het seriële getal van de datum voor of na een bepaald aantal werkdagen
+YEAR			= JAAR				##	Converteert een serieel getal naar een jaar
+YEARFRAC		= JAAR.DEEL			##	Geeft als resultaat het gedeelte van het jaar, uitgedrukt in het aantal hele dagen tussen begindatum en einddatum
+
+
+##
+##	Engineering functions				Technische functies
+##
+BESSELI			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie In(x)
+BESSELJ			= BESSEL.J			##	Geeft als resultaat de Bessel-functie Jn(x)
+BESSELK			= BESSEL.K			##	Geeft als resultaat de gewijzigde Bessel-functie Kn(x)
+BESSELY			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie Yn(x)
+BIN2DEC			= BIN.N.DEC			##	Converteert een binair getal naar een decimaal getal
+BIN2HEX			= BIN.N.HEX			##	Converteert een binair getal naar een hexadecimaal getal
+BIN2OCT			= BIN.N.OCT			##	Converteert een binair getal naar een octaal getal
+COMPLEX			= COMPLEX			##	Converteert reële en imaginaire coëfficiënten naar een complex getal
+CONVERT			= CONVERTEREN			##	Converteert een getal in de ene maateenheid naar een getal in een andere maateenheid
+DEC2BIN			= DEC.N.BIN			##	Converteert een decimaal getal naar een binair getal
+DEC2HEX			= DEC.N.HEX			##	Converteert een decimaal getal naar een hexadecimaal getal
+DEC2OCT			= DEC.N.OCT			##	Converteert een decimaal getal naar een octaal getal
+DELTA			= DELTA				##	Test of twee waarden gelijk zijn
+ERF			= FOUTFUNCTIE			##	Geeft als resultaat de foutfunctie
+ERFC			= FOUT.COMPLEMENT		##	Geeft als resultaat de complementaire foutfunctie
+GESTEP			= GROTER.DAN			##	Test of een getal groter is dan de drempelwaarde
+HEX2BIN			= HEX.N.BIN			##	Converteert een hexadecimaal getal naar een binair getal
+HEX2DEC			= HEX.N.DEC			##	Converteert een hexadecimaal getal naar een decimaal getal
+HEX2OCT			= HEX.N.OCT			##	Converteert een hexadecimaal getal naar een octaal getal
+IMABS			= C.ABS				##	Geeft als resultaat de absolute waarde (modulus) van een complex getal
+IMAGINARY		= C.IM.DEEL			##	Geeft als resultaat de imaginaire coëfficiënt van een complex getal
+IMARGUMENT		= C.ARGUMENT			##	Geeft als resultaat het argument thèta, een hoek uitgedrukt in radialen
+IMCONJUGATE		= C.TOEGEVOEGD			##	Geeft als resultaat het complexe toegevoegde getal van een complex getal
+IMCOS			= C.COS				##	Geeft als resultaat de cosinus van een complex getal
+IMDIV			= C.QUOTIENT			##	Geeft als resultaat het quotiënt van twee complexe getallen
+IMEXP			= C.EXP				##	Geeft als resultaat de exponent van een complex getal
+IMLN			= C.LN				##	Geeft als resultaat de natuurlijke logaritme van een complex getal
+IMLOG10			= C.LOG10			##	Geeft als resultaat de logaritme met grondtal 10 van een complex getal
+IMLOG2			= C.LOG2			##	Geeft als resultaat de logaritme met grondtal 2 van een complex getal
+IMPOWER			= C.MACHT			##	Geeft als resultaat een complex getal dat is verheven tot de macht van een geheel getal
+IMPRODUCT		= C.PRODUCT			##	Geeft als resultaat het product van complexe getallen
+IMREAL			= C.REEEL.DEEL			##	Geeft als resultaat de reële coëfficiënt van een complex getal
+IMSIN			= C.SIN				##	Geeft als resultaat de sinus van een complex getal
+IMSQRT			= C.WORTEL			##	Geeft als resultaat de vierkantswortel van een complex getal
+IMSUB			= C.VERSCHIL			##	Geeft als resultaat het verschil tussen twee complexe getallen
+IMSUM			= C.SOM				##	Geeft als resultaat de som van complexe getallen
+OCT2BIN			= OCT.N.BIN			##	Converteert een octaal getal naar een binair getal
+OCT2DEC			= OCT.N.DEC			##	Converteert een octaal getal naar een decimaal getal
+OCT2HEX			= OCT.N.HEX			##	Converteert een octaal getal naar een hexadecimaal getal
+
+
+##
+##	Financial functions				Financiële functies
+##
+ACCRINT			= SAMENG.RENTE			##	Berekent de opgelopen rente voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
+ACCRINTM		= SAMENG.RENTE.V		##	Berekent de opgelopen rente voor een waardepapier waarvan de rente op de vervaldatum wordt uitgekeerd
+AMORDEGRC		= AMORDEGRC			##	Geeft als resultaat de afschrijving voor elke boekingsperiode door een afschrijvingscoëfficiënt toe te passen
+AMORLINC		= AMORLINC			##	Berekent de afschrijving voor elke boekingsperiode
+COUPDAYBS		= COUP.DAGEN.BB			##	Berekent het aantal dagen vanaf het begin van de coupontermijn tot de stortingsdatum
+COUPDAYS		= COUP.DAGEN			##	Geeft als resultaat het aantal dagen in de coupontermijn waarin de stortingsdatum valt
+COUPDAYSNC		= COUP.DAGEN.VV			##	Geeft als resultaat het aantal dagen vanaf de stortingsdatum tot de volgende couponvervaldatum
+COUPNCD			= COUP.DATUM.NB			##	Geeft als resultaat de volgende coupondatum na de stortingsdatum
+COUPNUM			= COUP.AANTAL			##	Geeft als resultaat het aantal coupons dat nog moet worden uitbetaald tussen de stortingsdatum en de vervaldatum
+COUPPCD			= COUP.DATUM.VB			##	Geeft als resultaat de vorige couponvervaldatum vóór de stortingsdatum
+CUMIPMT			= CUM.RENTE			##	Geeft als resultaat de cumulatieve rente die tussen twee termijnen is uitgekeerd
+CUMPRINC		= CUM.HOOFDSOM			##	Geeft als resultaat de cumulatieve hoofdsom van een lening die tussen twee termijnen is terugbetaald
+DB			= DB				##	Geeft als resultaat de afschrijving van activa voor een bepaalde periode met behulp van de 'fixed declining balance'-methode
+DDB			= DDB				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'double declining balance'-methode of een andere methode die u opgeeft
+DISC			= DISCONTO			##	Geeft als resultaat het discontopercentage voor een waardepapier
+DOLLARDE		= EURO.DE			##	Converteert een prijs in euro's, uitgedrukt in een breuk, naar een prijs in euro's, uitgedrukt in een decimaal getal
+DOLLARFR		= EURO.BR			##	Converteert een prijs in euro's, uitgedrukt in een decimaal getal, naar een prijs in euro's, uitgedrukt in een breuk
+DURATION		= DUUR				##	Geeft als resultaat de gewogen gemiddelde looptijd voor een waardepapier met periodieke rentebetalingen
+EFFECT			= EFFECT.RENTE			##	Geeft als resultaat het effectieve jaarlijkse rentepercentage
+FV			= TW				##	Geeft als resultaat de toekomstige waarde van een investering
+FVSCHEDULE		= TOEK.WAARDE2			##	Geeft als resultaat de toekomstige waarde van een bepaalde hoofdsom na het toepassen van een reeks samengestelde rentepercentages
+INTRATE			= RENTEPERCENTAGE		##	Geeft als resultaat het rentepercentage voor een volgestort waardepapier
+IPMT			= IBET				##	Geeft als resultaat de te betalen rente voor een investering over een bepaalde termijn
+IRR			= IR				##	Geeft als resultaat de interne rentabiliteit voor een reeks cashflows
+ISPMT			= ISBET				##	Geeft als resultaat de rente die is betaald tijdens een bepaalde termijn van een investering
+MDURATION		= AANG.DUUR			##	Geeft als resultaat de aangepaste Macauley-looptijd voor een waardepapier, aangenomen dat de nominale waarde € 100 bedraagt
+MIRR			= GIR				##	Geeft als resultaat de interne rentabiliteit voor een serie cashflows, waarbij voor betalingen een ander rentepercentage geldt dan voor inkomsten
+NOMINAL			= NOMINALE.RENTE		##	Geeft als resultaat het nominale jaarlijkse rentepercentage
+NPER			= NPER				##	Geeft als resultaat het aantal termijnen van een investering
+NPV			= NHW				##	Geeft als resultaat de netto huidige waarde van een investering op basis van een reeks periodieke cashflows en een discontopercentage
+ODDFPRICE		= AFW.ET.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende eerste termijn
+ODDFYIELD		= AFW.ET.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende eerste termijn
+ODDLPRICE		= AFW.LT.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende laatste termijn
+ODDLYIELD		= AFW.LT.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende laatste termijn
+PMT			= BET				##	Geeft als resultaat de periodieke betaling voor een annuïteit
+PPMT			= PBET				##	Geeft als resultaat de afbetaling op de hoofdsom voor een bepaalde termijn
+PRICE			= PRIJS.NOM			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
+PRICEDISC		= PRIJS.DISCONTO		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een verdisconteerd waardepapier
+PRICEMAT		= PRIJS.VERVALDAG		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
+PV			= HW				##	Geeft als resultaat de huidige waarde van een investering
+RATE			= RENTE				##	Geeft als resultaat het periodieke rentepercentage voor een annuïteit
+RECEIVED		= OPBRENGST			##	Geeft als resultaat het bedrag dat op de vervaldatum wordt uitgekeerd voor een volgestort waardepapier
+SLN			= LIN.AFSCHR			##	Geeft als resultaat de lineaire afschrijving van activa over één termijn
+SYD			= SYD				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'Sum-Of-Years-Digits'-methode
+TBILLEQ			= SCHATK.OBL			##	Geeft als resultaat het rendement op schatkistpapier, dat op dezelfde manier wordt berekend als het rendement op obligaties
+TBILLPRICE		= SCHATK.PRIJS			##	Bepaalt de prijs per € 100 nominale waarde voor schatkistpapier
+TBILLYIELD		= SCHATK.REND			##	Berekent het rendement voor schatkistpapier
+VDB			= VDB				##	Geeft als resultaat de afschrijving van activa over een gehele of gedeeltelijke termijn met behulp van de 'declining balance'-methode
+XIRR			= IR.SCHEMA			##	Berekent de interne rentabiliteit voor een betalingsschema van cashflows
+XNPV			= NHW2				##	Berekent de huidige nettowaarde voor een betalingsschema van cashflows
+YIELD			= RENDEMENT			##	Geeft als resultaat het rendement voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
+YIELDDISC		= REND.DISCONTO			##	Geeft als resultaat het jaarlijkse rendement voor een verdisconteerd waardepapier, bijvoorbeeld schatkistpapier
+YIELDMAT		= REND.VERVAL			##	Geeft als resultaat het jaarlijkse rendement voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
+
+
+##
+##	Information functions				Informatiefuncties
+##
+CELL			= CEL				##	Geeft als resultaat informatie over de opmaak, locatie of inhoud van een cel
+ERROR.TYPE		= TYPE.FOUT			##	Geeft als resultaat een getal dat overeenkomt met een van de foutwaarden van Microsoft Excel
+INFO			= INFO				##	Geeft als resultaat informatie over de huidige besturingsomgeving
+ISBLANK			= ISLEEG			##	Geeft als resultaat WAAR als de waarde leeg is
+ISERR			= ISFOUT2			##	Geeft als resultaat WAAR als de waarde een foutwaarde is, met uitzondering van #N/B
+ISERROR			= ISFOUT			##	Geeft als resultaat WAAR als de waarde een foutwaarde is
+ISEVEN			= IS.EVEN			##	Geeft als resultaat WAAR als het getal even is
+ISLOGICAL		= ISLOGISCH			##	Geeft als resultaat WAAR als de waarde een logische waarde is
+ISNA			= ISNB				##	Geeft als resultaat WAAR als de waarde de foutwaarde #N/B is
+ISNONTEXT		= ISGEENTEKST			##	Geeft als resultaat WAAR als de waarde geen tekst is
+ISNUMBER		= ISGETAL			##	Geeft als resultaat WAAR als de waarde een getal is
+ISODD			= IS.ONEVEN			##	Geeft als resultaat WAAR als het getal oneven is
+ISREF			= ISVERWIJZING			##	Geeft als resultaat WAAR als de waarde een verwijzing is
+ISTEXT			= ISTEKST			##	Geeft als resultaat WAAR als de waarde tekst is
+N			= N				##	Geeft als resultaat een waarde die is geconverteerd naar een getal
+NA			= NB				##	Geeft als resultaat de foutwaarde #N/B
+TYPE			= TYPE				##	Geeft als resultaat een getal dat het gegevenstype van een waarde aangeeft
+
+
+##
+##	Logical functions				Logische functies
+##
+AND			= EN				##	Geeft als resultaat WAAR als alle argumenten WAAR zijn
+FALSE			= ONWAAR			##	Geeft als resultaat de logische waarde ONWAAR
+IF			= ALS				##	Geeft een logische test aan
+IFERROR			= ALS.FOUT			##	Retourneert een waarde die u opgeeft als een formule een fout oplevert, anders wordt het resultaat van de formule geretourneerd
+NOT			= NIET				##	Keert de logische waarde van het argument om
+OR			= OF				##	Geeft als resultaat WAAR als minimaal een van de argumenten WAAR is
+TRUE			= WAAR				##	Geeft als resultaat de logische waarde WAAR
+
+
+##
+##	Lookup and reference functions			Zoek- en verwijzingsfuncties
+##
+ADDRESS			= ADRES				##	Geeft als resultaat een verwijzing, in de vorm van tekst, naar één bepaalde cel in een werkblad
+AREAS			= BEREIKEN			##	Geeft als resultaat het aantal bereiken in een verwijzing
+CHOOSE			= KIEZEN			##	Kiest een waarde uit een lijst met waarden
+COLUMN			= KOLOM				##	Geeft als resultaat het kolomnummer van een verwijzing
+COLUMNS			= KOLOMMEN			##	Geeft als resultaat het aantal kolommen in een verwijzing
+HLOOKUP			= HORIZ.ZOEKEN			##	Zoekt in de bovenste rij van een matrix naar een bepaalde waarde en geeft als resultaat de gevonden waarde in de opgegeven cel
+HYPERLINK		= HYPERLINK			##	Maakt een snelkoppeling of een sprong waarmee een document wordt geopend dat is opgeslagen op een netwerkserver, een intranet of op internet
+INDEX			= INDEX				##	Kiest met een index een waarde uit een verwijzing of een matrix
+INDIRECT		= INDIRECT			##	Geeft als resultaat een verwijzing die wordt aangegeven met een tekstwaarde
+LOOKUP			= ZOEKEN			##	Zoekt naar bepaalde waarden in een vector of een matrix
+MATCH			= VERGELIJKEN			##	Zoekt naar bepaalde waarden in een verwijzing of een matrix
+OFFSET			= VERSCHUIVING			##	Geeft als resultaat een nieuwe verwijzing die is verschoven ten opzichte van een bepaalde verwijzing
+ROW			= RIJ				##	Geeft als resultaat het rijnummer van een verwijzing
+ROWS			= RIJEN				##	Geeft als resultaat het aantal rijen in een verwijzing
+RTD			= RTG				##	Haalt realtimegegevens op uit een programma dat COM-automatisering (automatisering: een methode waarmee de ene toepassing objecten van een andere toepassing of ontwikkelprogramma kan besturen. Automatisering werd vroeger OLE-automatisering genoemd. Automatisering is een industrienorm die deel uitmaakt van het Component Object Model (COM).) ondersteunt
+TRANSPOSE		= TRANSPONEREN			##	Geeft als resultaat de getransponeerde van een matrix
+VLOOKUP			= VERT.ZOEKEN			##	Zoekt in de meest linkse kolom van een matrix naar een bepaalde waarde en geeft als resultaat de waarde in de opgegeven cel
+
+
+##
+##	Math and trigonometry functions			Wiskundige en trigonometrische functies
+##
+ABS			= ABS				##	Geeft als resultaat de absolute waarde van een getal
+ACOS			= BOOGCOS			##	Geeft als resultaat de boogcosinus van een getal
+ACOSH			= BOOGCOSH			##	Geeft als resultaat de inverse cosinus hyperbolicus van een getal
+ASIN			= BOOGSIN			##	Geeft als resultaat de boogsinus van een getal
+ASINH			= BOOGSINH			##	Geeft als resultaat de inverse sinus hyperbolicus van een getal
+ATAN			= BOOGTAN			##	Geeft als resultaat de boogtangens van een getal
+ATAN2			= BOOGTAN2			##	Geeft als resultaat de boogtangens van de x- en y-coördinaten
+ATANH			= BOOGTANH			##	Geeft als resultaat de inverse tangens hyperbolicus van een getal
+CEILING			= AFRONDEN.BOVEN		##	Rondt de absolute waarde van een getal naar boven af op het dichtstbijzijnde gehele getal of het dichtstbijzijnde significante veelvoud
+COMBIN			= COMBINATIES			##	Geeft als resultaat het aantal combinaties voor een bepaald aantal objecten
+COS			= COS				##	Geeft als resultaat de cosinus van een getal
+COSH			= COSH				##	Geeft als resultaat de cosinus hyperbolicus van een getal
+DEGREES			= GRADEN			##	Converteert radialen naar graden
+EVEN			= EVEN				##	Rondt het getal af op het dichtstbijzijnde gehele even getal
+EXP			= EXP				##	Verheft e tot de macht van een bepaald getal
+FACT			= FACULTEIT			##	Geeft als resultaat de faculteit van een getal
+FACTDOUBLE		= DUBBELE.FACULTEIT		##	Geeft als resultaat de dubbele faculteit van een getal
+FLOOR			= AFRONDEN.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
+GCD			= GGD				##	Geeft als resultaat de grootste gemene deler
+INT			= INTEGER			##	Rondt een getal naar beneden af op het dichtstbijzijnde gehele getal
+LCM			= KGV				##	Geeft als resultaat het kleinste gemene veelvoud
+LN			= LN				##	Geeft als resultaat de natuurlijke logaritme van een getal
+LOG			= LOG				##	Geeft als resultaat de logaritme met het opgegeven grondtal van een getal
+LOG10			= LOG10				##	Geeft als resultaat de logaritme met grondtal 10 van een getal
+MDETERM			= DETERMINANTMAT		##	Geeft als resultaat de determinant van een matrix
+MINVERSE		= INVERSEMAT			##	Geeft als resultaat de inverse van een matrix
+MMULT			= PRODUCTMAT			##	Geeft als resultaat het product van twee matrices
+MOD			= REST				##	Geeft als resultaat het restgetal van een deling
+MROUND			= AFRONDEN.N.VEELVOUD		##	Geeft als resultaat een getal afgerond op het gewenste veelvoud
+MULTINOMIAL		= MULTINOMIAAL			##	Geeft als resultaat de multinomiaalcoëfficiënt van een reeks getallen
+ODD			= ONEVEN			##	Rondt de absolute waarde van het getal naar boven af op het dichtstbijzijnde gehele oneven getal
+PI			= PI				##	Geeft als resultaat de waarde van pi
+POWER			= MACHT				##	Verheft een getal tot een macht
+PRODUCT			= PRODUCT			##	Vermenigvuldigt de argumenten met elkaar
+QUOTIENT		= QUOTIENT			##	Geeft als resultaat de uitkomst van een deling als geheel getal
+RADIANS			= RADIALEN			##	Converteert graden naar radialen
+RAND			= ASELECT			##	Geeft als resultaat een willekeurig getal tussen 0 en 1
+RANDBETWEEN		= ASELECTTUSSEN			##	Geeft een willekeurig getal tussen de getallen die u hebt opgegeven
+ROMAN			= ROMEINS			##	Converteert een Arabisch getal naar een Romeins getal en geeft het resultaat weer in de vorm van tekst
+ROUND			= AFRONDEN			##	Rondt een getal af op het opgegeven aantal decimalen
+ROUNDDOWN		= AFRONDEN.NAAR.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
+ROUNDUP			= AFRONDEN.NAAR.BOVEN		##	Rondt de absolute waarde van een getal naar boven af
+SERIESSUM		= SOM.MACHTREEKS		##	Geeft als resultaat de som van een machtreeks die is gebaseerd op de formule
+SIGN			= POS.NEG			##	Geeft als resultaat het teken van een getal
+SIN			= SIN				##	Geeft als resultaat de sinus van de opgegeven hoek
+SINH			= SINH				##	Geeft als resultaat de sinus hyperbolicus van een getal
+SQRT			= WORTEL			##	Geeft als resultaat de positieve vierkantswortel van een getal
+SQRTPI			= WORTEL.PI			##	Geeft als resultaat de vierkantswortel van (getal * pi)
+SUBTOTAL		= SUBTOTAAL			##	Geeft als resultaat een subtotaal voor een bereik
+SUM			= SOM				##	Telt de argumenten op
+SUMIF			= SOM.ALS			##	Telt de getallen bij elkaar op die voldoen aan een bepaald criterium
+SUMIFS			= SOMMEN.ALS			##	Telt de cellen in een bereik op die aan meerdere criteria voldoen
+SUMPRODUCT		= SOMPRODUCT			##	Geeft als resultaat de som van de producten van de corresponderende matrixelementen
+SUMSQ			= KWADRATENSOM			##	Geeft als resultaat de som van de kwadraten van de argumenten
+SUMX2MY2		= SOM.X2MINY2			##	Geeft als resultaat de som van het verschil tussen de kwadraten van corresponderende waarden in twee matrices
+SUMX2PY2		= SOM.X2PLUSY2			##	Geeft als resultaat de som van de kwadratensom van corresponderende waarden in twee matrices
+SUMXMY2			= SOM.XMINY.2			##	Geeft als resultaat de som van de kwadraten van de verschillen tussen de corresponderende waarden in twee matrices
+TAN			= TAN				##	Geeft als resultaat de tangens van een getal
+TANH			= TANH				##	Geeft als resultaat de tangens hyperbolicus van een getal
+TRUNC			= GEHEEL			##	Kapt een getal af tot een geheel getal
+
+
+##
+##	Statistical functions				Statistische functies
+##
+AVEDEV			= GEM.DEVIATIE			##	Geeft als resultaat het gemiddelde van de absolute deviaties van gegevenspunten ten opzichte van hun gemiddelde waarde
+AVERAGE			= GEMIDDELDE			##	Geeft als resultaat het gemiddelde van de argumenten
+AVERAGEA		= GEMIDDELDEA			##	Geeft als resultaat het gemiddelde van de argumenten, inclusief getallen, tekst en logische waarden
+AVERAGEIF		= GEMIDDELDE.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen in een bereik die voldoen aan de opgegeven criteria
+AVERAGEIFS		= GEMIDDELDEN.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen die aan meerdere criteria voldoen
+BETADIST		= BETA.VERD			##	Geeft als resultaat de cumulatieve bèta-verdelingsfunctie
+BETAINV			= BETA.INV			##	Geeft als resultaat de inverse van de cumulatieve verdelingsfunctie voor een gegeven bèta-verdeling
+BINOMDIST		= BINOMIALE.VERD		##	Geeft als resultaat de binomiale verdeling
+CHIDIST			= CHI.KWADRAAT			##	Geeft als resultaat de eenzijdige kans van de chi-kwadraatverdeling
+CHIINV			= CHI.KWADRAAT.INV		##	Geeft als resultaat de inverse van een eenzijdige kans van de chi-kwadraatverdeling
+CHITEST			= CHI.TOETS			##	Geeft als resultaat de onafhankelijkheidstoets
+CONFIDENCE		= BETROUWBAARHEID		##	Geeft als resultaat het betrouwbaarheidsinterval van een gemiddelde waarde voor de elementen van een populatie
+CORREL			= CORRELATIE			##	Geeft als resultaat de correlatiecoëfficiënt van twee gegevensverzamelingen
+COUNT			= AANTAL			##	Telt het aantal getallen in de argumentenlijst
+COUNTA			= AANTALARG			##	Telt het aantal waarden in de argumentenlijst
+COUNTBLANK		= AANTAL.LEGE.CELLEN		##	Telt het aantal lege cellen in een bereik
+COUNTIF			= AANTAL.ALS			##	Telt in een bereik het aantal cellen die voldoen aan een bepaald criterium
+COUNTIFS		= AANTALLEN.ALS			##	Telt in een bereik het aantal cellen die voldoen aan meerdere criteria
+COVAR			= COVARIANTIE			##	Geeft als resultaat de covariantie, het gemiddelde van de producten van de gepaarde deviaties
+CRITBINOM		= CRIT.BINOM			##	Geeft als resultaat de kleinste waarde waarvoor de binomiale verdeling kleiner is dan of gelijk is aan het criterium
+DEVSQ			= DEV.KWAD			##	Geeft als resultaat de som van de deviaties in het kwadraat
+EXPONDIST		= EXPON.VERD			##	Geeft als resultaat de exponentiële verdeling
+FDIST			= F.VERDELING			##	Geeft als resultaat de F-verdeling
+FINV			= F.INVERSE			##	Geeft als resultaat de inverse van de F-verdeling
+FISHER			= FISHER			##	Geeft als resultaat de Fisher-transformatie
+FISHERINV		= FISHER.INV			##	Geeft als resultaat de inverse van de Fisher-transformatie
+FORECAST		= VOORSPELLEN			##	Geeft als resultaat een waarde op basis van een lineaire trend
+FREQUENCY		= FREQUENTIE			##	Geeft als resultaat een frequentieverdeling in de vorm van een verticale matrix
+FTEST			= F.TOETS			##	Geeft als resultaat een F-toets
+GAMMADIST		= GAMMA.VERD			##	Geeft als resultaat de gamma-verdeling
+GAMMAINV		= GAMMA.INV			##	Geeft als resultaat de inverse van de cumulatieve gamma-verdeling
+GAMMALN			= GAMMA.LN			##	Geeft als resultaat de natuurlijke logaritme van de gamma-functie, G(x)
+GEOMEAN			= MEETK.GEM			##	Geeft als resultaat het meetkundige gemiddelde
+GROWTH			= GROEI				##	Geeft als resultaat de waarden voor een exponentiële trend
+HARMEAN			= HARM.GEM			##	Geeft als resultaat het harmonische gemiddelde
+HYPGEOMDIST		= HYPERGEO.VERD			##	Geeft als resultaat de hypergeometrische verdeling
+INTERCEPT		= SNIJPUNT			##	Geeft als resultaat het snijpunt van de lineaire regressielijn met de y-as
+KURT			= KURTOSIS			##	Geeft als resultaat de kurtosis van een gegevensverzameling
+LARGE			= GROOTSTE			##	Geeft als resultaat de op k-1 na grootste waarde in een gegevensverzameling
+LINEST			= LIJNSCH			##	Geeft als resultaat de parameters van een lineaire trend
+LOGEST			= LOGSCH			##	Geeft als resultaat de parameters van een exponentiële trend
+LOGINV			= LOG.NORM.INV			##	Geeft als resultaat de inverse van de logaritmische normale verdeling
+LOGNORMDIST		= LOG.NORM.VERD			##	Geeft als resultaat de cumulatieve logaritmische normale verdeling
+MAX			= MAX				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten
+MAXA			= MAXA				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
+MEDIAN			= MEDIAAN			##	Geeft als resultaat de mediaan van de opgegeven getallen
+MIN			= MIN				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten
+MINA			= MINA				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
+MODE			= MODUS				##	Geeft als resultaat de meest voorkomende waarde in een gegevensverzameling
+NEGBINOMDIST		= NEG.BINOM.VERD		##	Geeft als resultaat de negatieve binomiaalverdeling
+NORMDIST		= NORM.VERD			##	Geeft als resultaat de cumulatieve normale verdeling
+NORMINV			= NORM.INV			##	Geeft als resultaat de inverse van de cumulatieve standaardnormale verdeling
+NORMSDIST		= STAND.NORM.VERD		##	Geeft als resultaat de cumulatieve standaardnormale verdeling
+NORMSINV		= STAND.NORM.INV		##	Geeft als resultaat de inverse van de cumulatieve normale verdeling
+PEARSON			= PEARSON			##	Geeft als resultaat de correlatiecoëfficiënt van Pearson
+PERCENTILE		= PERCENTIEL			##	Geeft als resultaat het k-de percentiel van waarden in een bereik
+PERCENTRANK		= PERCENT.RANG			##	Geeft als resultaat de positie, in procenten uitgedrukt, van een waarde in de rangorde van een gegevensverzameling
+PERMUT			= PERMUTATIES			##	Geeft als resultaat het aantal permutaties voor een gegeven aantal objecten
+POISSON			= POISSON			##	Geeft als resultaat de Poisson-verdeling
+PROB			= KANS				##	Geeft als resultaat de kans dat waarden zich tussen twee grenzen bevinden
+QUARTILE		= KWARTIEL			##	Geeft als resultaat het kwartiel van een gegevensverzameling
+RANK			= RANG				##	Geeft als resultaat het rangnummer van een getal in een lijst getallen
+RSQ			= R.KWADRAAT			##	Geeft als resultaat het kwadraat van de Pearson-correlatiecoëfficiënt
+SKEW			= SCHEEFHEID			##	Geeft als resultaat de mate van asymmetrie van een verdeling
+SLOPE			= RICHTING			##	Geeft als resultaat de richtingscoëfficiënt van een lineaire regressielijn
+SMALL			= KLEINSTE			##	Geeft als resultaat de op k-1 na kleinste waarde in een gegevensverzameling
+STANDARDIZE		= NORMALISEREN			##	Geeft als resultaat een genormaliseerde waarde
+STDEV			= STDEV				##	Maakt een schatting van de standaarddeviatie op basis van een steekproef
+STDEVA			= STDEVA			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef, inclusief getallen, tekst en logische waarden
+STDEVP			= STDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie
+STDEVPA			= STDEVPA			##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
+STEYX			= STAND.FOUT.YX			##	Geeft als resultaat de standaardfout in de voorspelde y-waarde voor elke x in een regressie
+TDIST			= T.VERD			##	Geeft als resultaat de Student T-verdeling
+TINV			= T.INV				##	Geeft als resultaat de inverse van de Student T-verdeling
+TREND			= TREND				##	Geeft als resultaat de waarden voor een lineaire trend
+TRIMMEAN		= GETRIMD.GEM			##	Geeft als resultaat het gemiddelde van waarden in een gegevensverzameling
+TTEST			= T.TOETS			##	Geeft als resultaat de kans met behulp van de Student T-toets
+VAR			= VAR				##	Maakt een schatting van de variantie op basis van een steekproef
+VARA			= VARA				##	Maakt een schatting van de variantie op basis van een steekproef, inclusief getallen, tekst en logische waarden
+VARP			= VARP				##	Berekent de variantie op basis van de volledige populatie
+VARPA			= VARPA				##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
+WEIBULL			= WEIBULL			##	Geeft als resultaat de Weibull-verdeling
+ZTEST			= Z.TOETS			##	Geeft als resultaat de eenzijdige kanswaarde van een Z-toets
+
+
+##
+##	Text functions					Tekstfuncties
+##
+ASC			= ASC				##	Wijzigt Nederlandse letters of katakanatekens over de volle breedte (dubbel-bytetekens) binnen een tekenreeks in tekens over de halve breedte (enkel-bytetekens)
+BAHTTEXT		= BAHT.TEKST			##	Converteert een getal naar tekst met de valutanotatie ß (baht)
+CHAR			= TEKEN				##	Geeft als resultaat het teken dat hoort bij de opgegeven code
+CLEAN			= WISSEN.CONTROL		##	Verwijdert alle niet-afdrukbare tekens uit een tekst
+CODE			= CODE				##	Geeft als resultaat de numerieke code voor het eerste teken in een tekenreeks
+CONCATENATE		= TEKST.SAMENVOEGEN		##	Voegt verschillende tekstfragmenten samen tot één tekstfragment
+DOLLAR			= EURO				##	Converteert een getal naar tekst met de valutanotatie € (euro)
+EXACT			= GELIJK			##	Controleert of twee tekenreeksen identiek zijn
+FIND			= VIND.ALLES			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
+FINDB			= VIND.ALLES.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
+FIXED			= VAST				##	Maakt een getal als tekst met een vast aantal decimalen op
+JIS			= JIS				##	Wijzigt Nederlandse letters of katakanatekens over de halve breedte (enkel-bytetekens) binnen een tekenreeks in tekens over de volle breedte (dubbel-bytetekens)
+LEFT			= LINKS				##	Geeft als resultaat de meest linkse tekens in een tekenreeks
+LEFTB			= LINKSB			##	Geeft als resultaat de meest linkse tekens in een tekenreeks
+LEN			= LENGTE			##	Geeft als resultaat het aantal tekens in een tekenreeks
+LENB			= LENGTEB			##	Geeft als resultaat het aantal tekens in een tekenreeks
+LOWER			= KLEINE.LETTERS		##	Zet tekst om in kleine letters
+MID			= MIDDEN			##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
+MIDB			= DEELB				##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
+PHONETIC		= FONETISCH			##	Haalt de fonetische tekens (furigana) uit een tekenreeks op
+PROPER			= BEGINLETTERS			##	Zet de eerste letter van elk woord in een tekst om in een hoofdletter
+REPLACE			= VERVANG			##	Vervangt tekens binnen een tekst
+REPLACEB		= VERVANGENB			##	Vervangt tekens binnen een tekst
+REPT			= HERHALING			##	Herhaalt een tekst een aantal malen
+RIGHT			= RECHTS			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
+RIGHTB			= RECHTSB			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
+SEARCH			= VIND.SPEC			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
+SEARCHB			= VIND.SPEC.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
+SUBSTITUTE		= SUBSTITUEREN			##	Vervangt oude tekst door nieuwe tekst in een tekenreeks
+T			= T				##	Converteert de argumenten naar tekst
+TEXT			= TEKST				##	Maakt een getal op en converteert het getal naar tekst
+TRIM			= SPATIES.WISSEN		##	Verwijdert de spaties uit een tekst
+UPPER			= HOOFDLETTERS			##	Zet tekst om in hoofdletters
+VALUE			= WAARDE			##	Converteert tekst naar een getal
diff --git a/lib/PHPExcel/locale/no/config b/lib/PHPExcel/locale/no/config
new file mode 100644
index 000000000..bf2d34a7f
--- /dev/null
+++ b/lib/PHPExcel/locale/no/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= kr
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NULL!
+DIV0	= #DIV/0!
+VALUE	= #VERDI!
+REF	= #REF!
+NAME	= #NAVN?
+NUM	= #NUM!
+NA	= #I/T
diff --git a/lib/PHPExcel/locale/no/functions b/lib/PHPExcel/locale/no/functions
new file mode 100644
index 000000000..10d0a2076
--- /dev/null
+++ b/lib/PHPExcel/locale/no/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions				Funksjonene Tillegg og Automatisering
+##
+GETPIVOTDATA		= HENTPIVOTDATA				##	Returnerer data som er lagret i en pivottabellrapport
+
+
+##
+##	Cube functions						Kubefunksjoner
+##
+CUBEKPIMEMBER		= KUBEKPIMEDLEM				##	Returnerer navnet, egenskapen og målet for en viktig ytelsesindikator (KPI), og viser navnet og egenskapen i cellen. En KPI er en målbar enhet, for eksempel månedlig bruttoinntjening eller kvartalsvis inntjening per ansatt, og brukes til å overvåke ytelsen i en organisasjon.
+CUBEMEMBER		= KUBEMEDLEM				##	Returnerer et medlem eller en tuppel i et kubehierarki. Brukes til å validere at medlemmet eller tuppelen finnes i kuben.
+CUBEMEMBERPROPERTY	= KUBEMEDLEMEGENSKAP			##	Returnerer verdien til en medlemsegenskap i kuben. Brukes til å validere at et medlemsnavn finnes i kuben, og til å returnere den angitte egenskapen for dette medlemmet.
+CUBERANKEDMEMBER	= KUBERANGERTMEDLEM			##	Returnerer det n-te, eller rangerte, medlemmet i et sett. Brukes til å returnere ett eller flere elementer i et sett, for eksempel de 10 beste studentene.
+CUBESET			= KUBESETT				##	Definerer et beregnet sett av medlemmer eller tuppeler ved å sende et settuttrykk til kuben på serveren, noe som oppretter settet og deretter returnerer dette settet til Microsoft Office Excel.
+CUBESETCOUNT		= KUBESETTANTALL			##	Returnerer antallet elementer i et sett.
+CUBEVALUE		= KUBEVERDI				##	Returnerer en aggregert verdi fra en kube.
+
+
+##
+##	Database functions					Databasefunksjoner
+##
+DAVERAGE		= DGJENNOMSNITT				##	Returnerer gjennomsnittet av merkede databaseposter
+DCOUNT			= DANTALL				##	Teller celler som inneholder tall i en database
+DCOUNTA			= DANTALLA				##	Teller celler som ikke er tomme i en database
+DGET			= DHENT					##	Trekker ut fra en database en post som oppfyller angitte vilkår
+DMAX			= DMAKS					##	Returnerer maksimumsverdien fra merkede databaseposter
+DMIN			= DMIN					##	Returnerer minimumsverdien fra merkede databaseposter
+DPRODUCT		= DPRODUKT				##	Multipliserer verdiene i et bestemt felt med poster som oppfyller vilkårene i en database
+DSTDEV			= DSTDAV				##	Estimerer standardavviket basert på et utvalg av merkede databaseposter
+DSTDEVP			= DSTAVP				##	Beregner standardavviket basert på at merkede databaseposter utgjør hele populasjonen
+DSUM			= DSUMMER				##	Legger til tallene i feltkolonnen med poster, i databasen som oppfyller vilkårene
+DVAR			= DVARIANS				##	Estimerer variansen basert på et utvalg av merkede databaseposter
+DVARP			= DVARIANSP				##	Beregner variansen basert på at merkede databaseposter utgjør hele populasjonen
+
+
+##
+##	Date and time functions					Dato- og tidsfunksjoner
+##
+DATE			= DATO					##	Returnerer serienummeret som svarer til en bestemt dato
+DATEVALUE		= DATOVERDI				##	Konverterer en dato med tekstformat til et serienummer
+DAY			= DAG					##	Konverterer et serienummer til en dag i måneden
+DAYS360			= DAGER360				##	Beregner antall dager mellom to datoer basert på et år med 360 dager
+EDATE			= DAG.ETTER				##	Returnerer serienummeret som svarer til datoen som er det indikerte antall måneder før eller etter startdatoen
+EOMONTH			= MÅNEDSSLUTT				##	Returnerer serienummeret som svarer til siste dag i måneden, før eller etter et angitt antall måneder
+HOUR			= TIME					##	Konverterer et serienummer til en time
+MINUTE			= MINUTT				##	Konverterer et serienummer til et minutt
+MONTH			= MÅNED					##	Konverterer et serienummer til en måned
+NETWORKDAYS		= NETT.ARBEIDSDAGER			##	Returnerer antall hele arbeidsdager mellom to datoer
+NOW			= NÅ					##	Returnerer serienummeret som svarer til gjeldende dato og klokkeslett
+SECOND			= SEKUND				##	Konverterer et serienummer til et sekund
+TIME			= TID					##	Returnerer serienummeret som svarer til et bestemt klokkeslett
+TIMEVALUE		= TIDSVERDI				##	Konverterer et klokkeslett i tekstformat til et serienummer
+TODAY			= IDAG					##	Returnerer serienummeret som svarer til dagens dato
+WEEKDAY			= UKEDAG				##	Konverterer et serienummer til en ukedag
+WEEKNUM			= UKENR					##	Konverterer et serienummer til et tall som representerer hvilket nummer uken har i et år
+WORKDAY			= ARBEIDSDAG				##	Returnerer serienummeret som svarer til datoen før eller etter et angitt antall arbeidsdager
+YEAR			= ÅR					##	Konverterer et serienummer til et år
+YEARFRAC		= ÅRDEL					##	Returnerer brøkdelen for året, som svarer til antall hele dager mellom startdato og sluttdato
+
+
+##
+##	Engineering functions					Tekniske funksjoner
+##
+BESSELI			= BESSELI				##	Returnerer den endrede Bessel-funksjonen In(x)
+BESSELJ			= BESSELJ				##	Returnerer Bessel-funksjonen Jn(x)
+BESSELK			= BESSELK				##	Returnerer den endrede Bessel-funksjonen Kn(x)
+BESSELY			= BESSELY				##	Returnerer Bessel-funksjonen Yn(x)
+BIN2DEC			= BINTILDES				##	Konverterer et binært tall til et desimaltall
+BIN2HEX			= BINTILHEKS				##	Konverterer et binært tall til et heksadesimaltall
+BIN2OCT			= BINTILOKT				##	Konverterer et binært tall til et oktaltall
+COMPLEX			= KOMPLEKS				##	Konverterer reelle og imaginære koeffisienter til et komplekst tall
+CONVERT			= KONVERTER				##	Konverterer et tall fra ett målsystem til et annet
+DEC2BIN			= DESTILBIN				##	Konverterer et desimaltall til et binærtall
+DEC2HEX			= DESTILHEKS				##	Konverterer et heltall i 10-tallsystemet til et heksadesimalt tall
+DEC2OCT			= DESTILOKT				##	Konverterer et heltall i 10-tallsystemet til et oktaltall
+DELTA			= DELTA					##	Undersøker om to verdier er like
+ERF			= FEILF					##	Returnerer feilfunksjonen
+ERFC			= FEILFK				##	Returnerer den komplementære feilfunksjonen
+GESTEP			= GRENSEVERDI				##	Tester om et tall er større enn en terskelverdi
+HEX2BIN			= HEKSTILBIN				##	Konverterer et heksadesimaltall til et binært tall
+HEX2DEC			= HEKSTILDES				##	Konverterer et heksadesimalt tall til et heltall i 10-tallsystemet
+HEX2OCT			= HEKSTILOKT				##	Konverterer et heksadesimalt tall til et oktaltall
+IMABS			= IMABS					##	Returnerer absoluttverdien (koeffisienten) til et komplekst tall
+IMAGINARY		= IMAGINÆR				##	Returnerer den imaginære koeffisienten til et komplekst tall
+IMARGUMENT		= IMARGUMENT				##	Returnerer argumentet theta, som er en vinkel uttrykt i radianer
+IMCONJUGATE		= IMKONJUGERT				##	Returnerer den komplekse konjugaten til et komplekst tall
+IMCOS			= IMCOS					##	Returnerer cosinus til et komplekst tall
+IMDIV			= IMDIV					##	Returnerer kvotienten til to komplekse tall
+IMEXP			= IMEKSP				##	Returnerer eksponenten til et komplekst tall
+IMLN			= IMLN					##	Returnerer den naturlige logaritmen for et komplekst tall
+IMLOG10			= IMLOG10				##	Returnerer logaritmen med grunntall 10 for et komplekst tall
+IMLOG2			= IMLOG2				##	Returnerer logaritmen med grunntall 2 for et komplekst tall
+IMPOWER			= IMOPPHØY				##	Returnerer et komplekst tall opphøyd til en heltallspotens
+IMPRODUCT		= IMPRODUKT				##	Returnerer produktet av komplekse tall
+IMREAL			= IMREELL				##	Returnerer den reelle koeffisienten til et komplekst tall
+IMSIN			= IMSIN					##	Returnerer sinus til et komplekst tall
+IMSQRT			= IMROT					##	Returnerer kvadratroten av et komplekst tall
+IMSUB			= IMSUB					##	Returnerer differansen mellom to komplekse tall
+IMSUM			= IMSUMMER				##	Returnerer summen av komplekse tall
+OCT2BIN			= OKTTILBIN				##	Konverterer et oktaltall til et binært tall
+OCT2DEC			= OKTTILDES				##	Konverterer et oktaltall til et desimaltall
+OCT2HEX			= OKTTILHEKS				##	Konverterer et oktaltall til et heksadesimaltall
+
+
+##
+##	Financial functions					Økonomiske funksjoner
+##
+ACCRINT			= PÅLØPT.PERIODISK.RENTE		##	Returnerer påløpte renter for et verdipapir som betaler periodisk rente
+ACCRINTM		= PÅLØPT.FORFALLSRENTE			##	Returnerer den påløpte renten for et verdipapir som betaler rente ved forfall
+AMORDEGRC		= AMORDEGRC				##	Returnerer avskrivningen for hver regnskapsperiode ved hjelp av en avskrivingskoeffisient
+AMORLINC		= AMORLINC				##	Returnerer avskrivingen for hver regnskapsperiode
+COUPDAYBS		= OBLIG.DAGER.FF			##	Returnerer antall dager fra begynnelsen av den rentebærende perioden til innløsningsdatoen
+COUPDAYS		= OBLIG.DAGER				##	Returnerer antall dager i den rentebærende perioden som inneholder innløsningsdatoen
+COUPDAYSNC		= OBLIG.DAGER.NF			##	Returnerer antall dager fra betalingsdato til neste renteinnbetalingsdato
+COUPNCD			= OBLIG.DAGER.EF			##	Returnerer obligasjonsdatoen som kommer etter oppgjørsdatoen
+COUPNUM			= OBLIG.ANTALL				##	Returnerer antall obligasjoner som skal betales mellom oppgjørsdatoen og forfallsdatoen
+COUPPCD			= OBLIG.DAG.FORRIGE			##	Returnerer obligasjonsdatoen som kommer før oppgjørsdatoen
+CUMIPMT			= SAMLET.RENTE				##	Returnerer den kumulative renten som er betalt mellom to perioder
+CUMPRINC		= SAMLET.HOVEDSTOL			##	Returnerer den kumulative hovedstolen som er betalt for et lån mellom to perioder
+DB			= DAVSKR				##	Returnerer avskrivningen for et aktivum i en angitt periode, foretatt med fast degressiv avskrivning
+DDB			= DEGRAVS				##	Returnerer avskrivningen for et aktivum for en gitt periode, ved hjelp av dobbel degressiv avskrivning eller en metode som du selv angir
+DISC			= DISKONTERT				##	Returnerer diskonteringsraten for et verdipapir
+DOLLARDE		= DOLLARDE				##	Konverterer en valutapris uttrykt som en brøk, til en valutapris uttrykt som et desimaltall
+DOLLARFR		= DOLLARBR				##	Konverterer en valutapris uttrykt som et desimaltall, til en valutapris uttrykt som en brøk
+DURATION		= VARIGHET				##	Returnerer årlig varighet for et verdipapir med renter som betales periodisk
+EFFECT			= EFFEKTIV.RENTE			##	Returnerer den effektive årlige rentesatsen
+FV			= SLUTTVERDI				##	Returnerer fremtidig verdi for en investering
+FVSCHEDULE		= SVPLAN				##	Returnerer den fremtidige verdien av en inngående hovedstol etter å ha anvendt en serie med sammensatte rentesatser
+INTRATE			= RENTESATS				##	Returnerer rentefoten av et fullfinansiert verdipapir
+IPMT			= RAVDRAG				##	Returnerer betalte renter på en investering for en gitt periode
+IRR			= IR					##	Returnerer internrenten for en serie kontantstrømmer
+ISPMT			= ER.AVDRAG				##	Beregner renten som er betalt for en investering i løpet av en bestemt periode
+MDURATION		= MVARIGHET				##	Returnerer Macauleys modifiserte varighet for et verdipapir med en antatt pålydende verdi på kr 100,00
+MIRR			= MODIR					##	Returnerer internrenten der positive og negative kontantstrømmer finansieres med forskjellige satser
+NOMINAL			= NOMINELL				##	Returnerer årlig nominell rentesats
+NPER			= PERIODER				##	Returnerer antall perioder for en investering
+NPV			= NNV					##	Returnerer netto nåverdi for en investering, basert på en serie periodiske kontantstrømmer og en rentesats
+ODDFPRICE		= AVVIKFP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde første periode
+ODDFYIELD		= AVVIKFP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde første periode
+ODDLPRICE		= AVVIKSP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde siste periode
+ODDLYIELD		= AVVIKSP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde siste periode
+PMT			= AVDRAG				##	Returnerer periodisk betaling for en annuitet
+PPMT			= AMORT					##	Returnerer betalingen på hovedstolen for en investering i en gitt periode
+PRICE			= PRIS					##	Returnerer prisen per pålydende kr 100 for et verdipapir som gir periodisk avkastning
+PRICEDISC		= PRIS.DISKONTERT			##	Returnerer prisen per pålydende kr 100 for et diskontert verdipapir
+PRICEMAT		= PRIS.FORFALL				##	Returnerer prisen per pålydende kr 100 av et verdipapir som betaler rente ved forfall
+PV			= NÅVERDI				##	Returnerer nåverdien av en investering
+RATE			= RENTE					##	Returnerer rentesatsen per periode for en annuitet
+RECEIVED		= MOTTATT.AVKAST			##	Returnerer summen som mottas ved forfallsdato for et fullinvestert verdipapir
+SLN			= LINAVS				##	Returnerer den lineære avskrivningen for et aktivum i én periode
+SYD			= ÅRSAVS				##	Returnerer årsavskrivningen for et aktivum i en angitt periode
+TBILLEQ			= TBILLEKV				##	Returnerer den obligasjonsekvivalente avkastningen for en statsobligasjon
+TBILLPRICE		= TBILLPRIS				##	Returnerer prisen per pålydende kr 100 for en statsobligasjon
+TBILLYIELD		= TBILLAVKASTNING			##	Returnerer avkastningen til en statsobligasjon
+VDB			= VERDIAVS				##	Returnerer avskrivningen for et aktivum i en angitt periode eller delperiode, ved hjelp av degressiv avskrivning
+XIRR			= XIR					##	Returnerer internrenten for en serie kontantstrømmer som ikke nødvendigvis er periodiske
+XNPV			= XNNV					##	Returnerer netto nåverdi for en serie kontantstrømmer som ikke nødvendigvis er periodiske
+YIELD			= AVKAST				##	Returnerer avkastningen på et verdipapir som betaler periodisk rente
+YIELDDISC		= AVKAST.DISKONTERT			##	Returnerer årlig avkastning for et diskontert verdipapir, for eksempel en statskasseveksel
+YIELDMAT		= AVKAST.FORFALL			##	Returnerer den årlige avkastningen for et verdipapir som betaler rente ved forfallsdato
+
+
+##
+##	Information functions					Informasjonsfunksjoner
+##
+CELL			= CELLE					##	Returnerer informasjon om formatering, plassering eller innholdet til en celle
+ERROR.TYPE		= FEIL.TYPE				##	Returnerer et tall som svarer til en feiltype
+INFO			= INFO					##	Returnerer informasjon om gjeldende operativmiljø
+ISBLANK			= ERTOM					##	Returnerer SANN hvis verdien er tom
+ISERR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst annen feilverdi enn #I/T
+ISERROR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst feilverdi
+ISEVEN			= ERPARTALL				##	Returnerer SANN hvis tallet er et partall
+ISLOGICAL		= ERLOGISK				##	Returnerer SANN hvis verdien er en logisk verdi
+ISNA			= ERIT					##	Returnerer SANN hvis verdien er feilverdien #I/T
+ISNONTEXT		= ERIKKETEKST				##	Returnerer SANN hvis verdien ikke er tekst
+ISNUMBER		= ERTALL				##	Returnerer SANN hvis verdien er et tall
+ISODD			= ERODDETALL				##	Returnerer SANN hvis tallet er et oddetall
+ISREF			= ERREF					##	Returnerer SANN hvis verdien er en referanse
+ISTEXT			= ERTEKST				##	Returnerer SANN hvis verdien er tekst
+N			= N					##	Returnerer en verdi som er konvertert til et tall
+NA			= IT					##	Returnerer feilverdien #I/T
+TYPE			= VERDITYPE				##	Returnerer et tall som indikerer datatypen til en verdi
+
+
+##
+##	Logical functions					Logiske funksjoner
+##
+AND			= OG					##	Returnerer SANN hvis alle argumentene er lik SANN
+FALSE			= USANN					##	Returnerer den logiske verdien USANN
+IF			= HVIS					##	Angir en logisk test som skal utføres
+IFERROR			= HVISFEIL				##	Returnerer en verdi du angir hvis en formel evaluerer til en feil. Ellers returnerer den resultatet av formelen.
+NOT			= IKKE					##	Reverserer logikken til argumentet
+OR			= ELLER					##	Returnerer SANN hvis ett eller flere argumenter er lik SANN
+TRUE			= SANN					##	Returnerer den logiske verdien SANN
+
+
+##
+##	Lookup and reference functions				Oppslag- og referansefunksjoner
+##
+ADDRESS			= ADRESSE				##	Returnerer en referanse som tekst til en enkelt celle i et regneark
+AREAS			= OMRÅDER				##	Returnerer antall områder i en referanse
+CHOOSE			= VELG					##	Velger en verdi fra en liste med verdier
+COLUMN			= KOLONNE				##	Returnerer kolonnenummeret for en referanse
+COLUMNS			= KOLONNER				##	Returnerer antall kolonner i en referanse
+HLOOKUP			= FINN.KOLONNE				##	Leter i den øverste raden i en matrise og returnerer verdien for den angitte cellen
+HYPERLINK		= HYPERKOBLING				##	Oppretter en snarvei eller et hopp som åpner et dokument som er lagret på en nettverksserver, et intranett eller Internett
+INDEX			= INDEKS				##	Bruker en indeks til å velge en verdi fra en referanse eller matrise
+INDIRECT		= INDIREKTE				##	Returnerer en referanse angitt av en tekstverdi
+LOOKUP			= SLÅ.OPP				##	Slår opp verdier i en vektor eller matrise
+MATCH			= SAMMENLIGNE				##	Slår opp verdier i en referanse eller matrise
+OFFSET			= FORSKYVNING				##	Returnerer en referanseforskyvning fra en gitt referanse
+ROW			= RAD					##	Returnerer radnummeret for en referanse
+ROWS			= RADER					##	Returnerer antall rader i en referanse
+RTD			= RTD					##	Henter sanntidsdata fra et program som støtter COM-automatisering (automatisering: En måte å arbeide på med programobjekter fra et annet program- eller utviklingsverktøy. Tidligere kalt OLE-automatisering. Automatisering er en bransjestandard og en funksjon i Component Object Model (COM).)
+TRANSPOSE		= TRANSPONER				##	Returnerer transponeringen av en matrise
+VLOOKUP			= FINN.RAD				##	Leter i den første kolonnen i en matrise og flytter bortover raden for å returnere verdien til en celle
+
+
+##
+##	Math and trigonometry functions				Matematikk- og trigonometrifunksjoner
+##
+ABS			= ABS					##	Returnerer absoluttverdien til et tall
+ACOS			= ARCCOS				##	Returnerer arcus cosinus til et tall
+ACOSH			= ARCCOSH				##	Returnerer den inverse hyperbolske cosinus til et tall
+ASIN			= ARCSIN				##	Returnerer arcus sinus til et tall
+ASINH			= ARCSINH				##	Returnerer den inverse hyperbolske sinus til et tall
+ATAN			= ARCTAN				##	Returnerer arcus tangens til et tall
+ATAN2			= ARCTAN2				##	Returnerer arcus tangens fra x- og y-koordinater
+ATANH			= ARCTANH				##	Returnerer den inverse hyperbolske tangens til et tall
+CEILING			= AVRUND.GJELDENDE.MULTIPLUM		##	Runder av et tall til nærmeste heltall eller til nærmeste signifikante multiplum
+COMBIN			= KOMBINASJON				##	Returnerer antall kombinasjoner for ett gitt antall objekter
+COS			= COS					##	Returnerer cosinus til et tall
+COSH			= COSH					##	Returnerer den hyperbolske cosinus til et tall
+DEGREES			= GRADER				##	Konverterer radianer til grader
+EVEN			= AVRUND.TIL.PARTALL			##	Runder av et tall oppover til nærmeste heltall som er et partall
+EXP			= EKSP					##	Returnerer e opphøyd i en angitt potens
+FACT			= FAKULTET				##	Returnerer fakultet til et tall
+FACTDOUBLE		= DOBBELFAKT				##	Returnerer et talls doble fakultet
+FLOOR			= AVRUND.GJELDENDE.MULTIPLUM.NED	##	Avrunder et tall nedover, mot null
+GCD			= SFF					##	Returnerer høyeste felles divisor
+INT			= HELTALL				##	Avrunder et tall nedover til nærmeste heltall
+LCM			= MFM					##	Returnerer minste felles multiplum
+LN			= LN					##	Returnerer den naturlige logaritmen til et tall
+LOG			= LOG					##	Returnerer logaritmen for et tall til et angitt grunntall
+LOG10			= LOG10					##	Returnerer logaritmen med grunntall 10 for et tall
+MDETERM			= MDETERM				##	Returnerer matrisedeterminanten til en matrise
+MINVERSE		= MINVERS				##	Returnerer den inverse matrisen til en matrise
+MMULT			= MMULT					##	Returnerer matriseproduktet av to matriser
+MOD			= REST					##	Returnerer resten fra en divisjon
+MROUND			= MRUND					##	Returnerer et tall avrundet til det ønskede multiplum
+MULTINOMIAL		= MULTINOMINELL				##	Returnerer det multinominelle for et sett med tall
+ODD			= AVRUND.TIL.ODDETALL			##	Runder av et tall oppover til nærmeste heltall som er et oddetall
+PI			= PI					##	Returnerer verdien av pi
+POWER			= OPPHØYD.I				##	Returnerer resultatet av et tall opphøyd i en potens
+PRODUCT			= PRODUKT				##	Multipliserer argumentene
+QUOTIENT		= KVOTIENT				##	Returnerer heltallsdelen av en divisjon
+RADIANS			= RADIANER				##	Konverterer grader til radianer
+RAND			= TILFELDIG				##	Returnerer et tilfeldig tall mellom 0 og 1
+RANDBETWEEN		= TILFELDIGMELLOM			##	Returnerer et tilfeldig tall innenfor et angitt område
+ROMAN			= ROMERTALL				##	Konverterer vanlige tall til romertall, som tekst
+ROUND			= AVRUND				##	Avrunder et tall til et angitt antall sifre
+ROUNDDOWN		= AVRUND.NED				##	Avrunder et tall nedover, mot null
+ROUNDUP			= AVRUND.OPP				##	Runder av et tall oppover, bort fra null
+SERIESSUM		= SUMMER.REKKE				##	Returnerer summen av en geometrisk rekke, basert på formelen
+SIGN			= FORTEGN				##	Returnerer fortegnet for et tall
+SIN			= SIN					##	Returnerer sinus til en gitt vinkel
+SINH			= SINH					##	Returnerer den hyperbolske sinus til et tall
+SQRT			= ROT					##	Returnerer en positiv kvadratrot
+SQRTPI			= ROTPI					##	Returnerer kvadratroten av (tall * pi)
+SUBTOTAL		= DELSUM				##	Returnerer en delsum i en liste eller database
+SUM			= SUMMER				##	Legger sammen argumentene
+SUMIF			= SUMMERHVIS				##	Legger sammen cellene angitt ved et gitt vilkår
+SUMIFS			= SUMMER.HVIS.SETT			##	Legger sammen cellene i et område som oppfyller flere vilkår
+SUMPRODUCT		= SUMMERPRODUKT				##	Returnerer summen av produktene av tilsvarende matrisekomponenter
+SUMSQ			= SUMMERKVADRAT				##	Returnerer kvadratsummen av argumentene
+SUMX2MY2		= SUMMERX2MY2				##	Returnerer summen av differansen av kvadratene for tilsvarende verdier i to matriser
+SUMX2PY2		= SUMMERX2PY2				##	Returnerer summen av kvadratsummene for tilsvarende verdier i to matriser
+SUMXMY2			= SUMMERXMY2				##	Returnerer summen av kvadratene av differansen for tilsvarende verdier i to matriser
+TAN			= TAN					##	Returnerer tangens for et tall
+TANH			= TANH					##	Returnerer den hyperbolske tangens for et tall
+TRUNC			= AVKORT				##	Korter av et tall til et heltall
+
+
+##
+##	Statistical functions					Statistiske funksjoner
+##
+AVEDEV			= GJENNOMSNITTSAVVIK			##	Returnerer datapunktenes gjennomsnittlige absoluttavvik fra middelverdien
+AVERAGE			= GJENNOMSNITT				##	Returnerer gjennomsnittet for argumentene
+AVERAGEA		= GJENNOMSNITTA				##	Returnerer gjennomsnittet for argumentene, inkludert tall, tekst og logiske verdier
+AVERAGEIF		= GJENNOMSNITTHVIS			##	Returnerer gjennomsnittet (aritmetisk gjennomsnitt) av alle cellene i et område som oppfyller et bestemt vilkår
+AVERAGEIFS		= GJENNOMSNITT.HVIS.SETT		##	Returnerer gjennomsnittet (aritmetisk middelverdi) av alle celler som oppfyller flere vilkår.
+BETADIST		= BETA.FORDELING			##	Returnerer den kumulative betafordelingsfunksjonen
+BETAINV			= INVERS.BETA.FORDELING			##	Returnerer den inverse verdien til fordelingsfunksjonen for en angitt betafordeling
+BINOMDIST		= BINOM.FORDELING			##	Returnerer den individuelle binomiske sannsynlighetsfordelingen
+CHIDIST			= KJI.FORDELING				##	Returnerer den ensidige sannsynligheten for en kjikvadrert fordeling
+CHIINV			= INVERS.KJI.FORDELING			##	Returnerer den inverse av den ensidige sannsynligheten for den kjikvadrerte fordelingen
+CHITEST			= KJI.TEST				##	Utfører testen for uavhengighet
+CONFIDENCE		= KONFIDENS				##	Returnerer konfidensintervallet til gjennomsnittet for en populasjon
+CORREL			= KORRELASJON				##	Returnerer korrelasjonskoeffisienten mellom to datasett
+COUNT			= ANTALL				##	Teller hvor mange tall som er i argumentlisten
+COUNTA			= ANTALLA				##	Teller hvor mange verdier som er i argumentlisten
+COUNTBLANK		= TELLBLANKE				##	Teller antall tomme celler i et område.
+COUNTIF			= ANTALL.HVIS				##	Teller antall celler i et område som oppfyller gitte vilkår
+COUNTIFS		= ANTALL.HVIS.SETT			##	Teller antallet ikke-tomme celler i et område som oppfyller flere vilkår
+COVAR			= KOVARIANS				##	Returnerer kovariansen, gjennomsnittet av produktene av parvise avvik
+CRITBINOM		= GRENSE.BINOM				##	Returnerer den minste verdien der den kumulative binomiske fordelingen er mindre enn eller lik en vilkårsverdi
+DEVSQ			= AVVIK.KVADRERT			##	Returnerer summen av kvadrerte avvik
+EXPONDIST		= EKSP.FORDELING			##	Returnerer eksponentialfordelingen
+FDIST			= FFORDELING				##	Returnerer F-sannsynlighetsfordelingen
+FINV			= FFORDELING.INVERS			##	Returnerer den inverse av den sannsynlige F-fordelingen
+FISHER			= FISHER				##	Returnerer Fisher-transformasjonen
+FISHERINV		= FISHERINV				##	Returnerer den inverse av Fisher-transformasjonen
+FORECAST		= PROGNOSE				##	Returnerer en verdi langs en lineær trend
+FREQUENCY		= FREKVENS				##	Returnerer en frekvensdistribusjon som en loddrett matrise
+FTEST			= FTEST					##	Returnerer resultatet av en F-test
+GAMMADIST		= GAMMAFORDELING			##	Returnerer gammafordelingen
+GAMMAINV		= GAMMAINV				##	Returnerer den inverse av den gammakumulative fordelingen
+GAMMALN			= GAMMALN				##	Returnerer den naturlige logaritmen til gammafunksjonen G(x)
+GEOMEAN			= GJENNOMSNITT.GEOMETRISK		##	Returnerer den geometriske middelverdien
+GROWTH			= VEKST					##	Returnerer verdier langs en eksponentiell trend
+HARMEAN			= GJENNOMSNITT.HARMONISK		##	Returnerer den harmoniske middelverdien
+HYPGEOMDIST		= HYPGEOM.FORDELING			##	Returnerer den hypergeometriske fordelingen
+INTERCEPT		= SKJÆRINGSPUNKT			##	Returnerer skjæringspunktet til den lineære regresjonslinjen
+KURT			= KURT					##	Returnerer kurtosen til et datasett
+LARGE			= N.STØRST				##	Returnerer den n-te største verdien i et datasett
+LINEST			= RETTLINJE				##	Returnerer parameterne til en lineær trend
+LOGEST			= KURVE					##	Returnerer parameterne til en eksponentiell trend
+LOGINV			= LOGINV				##	Returnerer den inverse lognormale fordelingen
+LOGNORMDIST		= LOGNORMFORD				##	Returnerer den kumulative lognormale fordelingen
+MAX			= STØRST				##	Returnerer maksimumsverdien i en argumentliste
+MAXA			= MAKSA					##	Returnerer maksimumsverdien i en argumentliste, inkludert tall, tekst og logiske verdier
+MEDIAN			= MEDIAN				##	Returnerer medianen til tallene som er gitt
+MIN			= MIN					##	Returnerer minimumsverdien i en argumentliste
+MINA			= MINA					##	Returnerer den minste verdien i en argumentliste, inkludert tall, tekst og logiske verdier
+MODE			= MODUS					##	Returnerer den vanligste verdien i et datasett
+NEGBINOMDIST		= NEGBINOM.FORDELING			##	Returnerer den negative binomiske fordelingen
+NORMDIST		= NORMALFORDELING			##	Returnerer den kumulative normalfordelingen
+NORMINV			= NORMINV				##	Returnerer den inverse kumulative normalfordelingen
+NORMSDIST		= NORMSFORDELING			##	Returnerer standard kumulativ normalfordeling
+NORMSINV		= NORMSINV				##	Returnerer den inverse av den den kumulative standard normalfordelingen
+PEARSON			= PEARSON				##	Returnerer produktmomentkorrelasjonskoeffisienten, Pearson
+PERCENTILE		= PERSENTIL				##	Returnerer den n-te persentil av verdiene i et område
+PERCENTRANK		= PROSENTDEL				##	Returnerer prosentrangeringen av en verdi i et datasett
+PERMUT			= PERMUTER				##	Returnerer antall permutasjoner for et gitt antall objekter
+POISSON			= POISSON				##	Returnerer Poissons sannsynlighetsfordeling
+PROB			= SANNSYNLIG				##	Returnerer sannsynligheten for at verdier i et område ligger mellom to grenser
+QUARTILE		= KVARTIL				##	Returnerer kvartilen til et datasett
+RANK			= RANG					##	Returnerer rangeringen av et tall, eller plassen tallet har i en rekke
+RSQ			= RKVADRAT				##	Returnerer kvadratet av produktmomentkorrelasjonskoeffisienten (Pearsons r)
+SKEW			= SKJEVFORDELING			##	Returnerer skjevheten i en fordeling
+SLOPE			= STIGNINGSTALL				##	Returnerer stigningtallet for den lineære regresjonslinjen
+SMALL			= N.MINST				##	Returnerer den n-te minste verdien i et datasett
+STANDARDIZE		= NORMALISER				##	Returnerer en normalisert verdi
+STDEV			= STDAV					##	Estimere standardavvik på grunnlag av et utvalg
+STDEVA			= STDAVVIKA				##	Estimerer standardavvik basert på et utvalg, inkludert tall, tekst og logiske verdier
+STDEVP			= STDAVP				##	Beregner standardavvik basert på hele populasjonen
+STDEVPA			= STDAVVIKPA				##	Beregner standardavvik basert på hele populasjonen, inkludert tall, tekst og logiske verdier
+STEYX			= STANDARDFEIL				##	Returnerer standardfeilen for den predikerte y-verdien for hver x i regresjonen
+TDIST			= TFORDELING				##	Returnerer en Student t-fordeling
+TINV			= TINV					##	Returnerer den inverse Student t-fordelingen
+TREND			= TREND					##	Returnerer verdier langs en lineær trend
+TRIMMEAN		= TRIMMET.GJENNOMSNITT			##	Returnerer den interne middelverdien til et datasett
+TTEST			= TTEST					##	Returnerer sannsynligheten assosiert med en Student t-test
+VAR			= VARIANS				##	Estimerer varians basert på et utvalg
+VARA			= VARIANSA				##	Estimerer varians basert på et utvalg, inkludert tall, tekst og logiske verdier
+VARP			= VARIANSP				##	Beregner varians basert på hele populasjonen
+VARPA			= VARIANSPA				##	Beregner varians basert på hele populasjonen, inkludert tall, tekst og logiske verdier
+WEIBULL			= WEIBULL.FORDELING			##	Returnerer Weibull-fordelingen
+ZTEST			= ZTEST					##	Returnerer den ensidige sannsynlighetsverdien for en z-test
+
+
+##
+##	Text functions						Tekstfunksjoner
+##
+ASC			= STIGENDE				##	Endrer fullbreddes (dobbeltbyte) engelske bokstaver eller katakana i en tegnstreng, til halvbreddes (enkeltbyte) tegn
+BAHTTEXT		= BAHTTEKST				##	Konverterer et tall til tekst, og bruker valutaformatet ß (baht)
+CHAR			= TEGNKODE				##	Returnerer tegnet som svarer til kodenummeret
+CLEAN			= RENSK					##	Fjerner alle tegn som ikke kan skrives ut, fra teksten
+CODE			= KODE					##	Returnerer en numerisk kode for det første tegnet i en tekststreng
+CONCATENATE		= KJEDE.SAMMEN				##	Slår sammen flere tekstelementer til ett tekstelement
+DOLLAR			= VALUTA				##	Konverterer et tall til tekst, og bruker valutaformatet $ (dollar)
+EXACT			= EKSAKT				##	Kontrollerer om to tekstverdier er like
+FIND			= FINN					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
+FINDB			= FINNB					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
+FIXED			= FASTSATT				##	Formaterer et tall som tekst med et bestemt antall desimaler
+JIS			= JIS					##	Endrer halvbreddes (enkeltbyte) engelske bokstaver eller katakana i en tegnstreng, til fullbreddes (dobbeltbyte) tegn
+LEFT			= VENSTRE				##	Returnerer tegnene lengst til venstre i en tekstverdi
+LEFTB			= VENSTREB				##	Returnerer tegnene lengst til venstre i en tekstverdi
+LEN			= LENGDE				##	Returnerer antall tegn i en tekststreng
+LENB			= LENGDEB				##	Returnerer antall tegn i en tekststreng
+LOWER			= SMÅ					##	Konverterer tekst til små bokstaver
+MID			= DELTEKST				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
+MIDB			= DELTEKSTB				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
+PHONETIC		= FURIGANA				##	Trekker ut fonetiske tegn (furigana) fra en tekststreng
+PROPER			= STOR.FORBOKSTAV			##	Gir den første bokstaven i hvert ord i en tekstverdi stor forbokstav
+REPLACE			= ERSTATT				##	Erstatter tegn i en tekst
+REPLACEB		= ERSTATTB				##	Erstatter tegn i en tekst
+REPT			= GJENTA				##	Gjentar tekst et gitt antall ganger
+RIGHT			= HØYRE					##	Returnerer tegnene lengst til høyre i en tekstverdi
+RIGHTB			= HØYREB				##	Returnerer tegnene lengst til høyre i en tekstverdi
+SEARCH			= SØK					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
+SEARCHB			= SØKB					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
+SUBSTITUTE		= BYTT.UT				##	Bytter ut gammel tekst med ny tekst i en tekststreng
+T			= T					##	Konverterer argumentene til tekst
+TEXT			= TEKST					##	Formaterer et tall og konverterer det til tekst
+TRIM			= TRIMME				##	Fjerner mellomrom fra tekst
+UPPER			= STORE					##	Konverterer tekst til store bokstaver
+VALUE			= VERDI					##	Konverterer et tekstargument til et tall
diff --git a/lib/PHPExcel/locale/pl/config b/lib/PHPExcel/locale/pl/config
new file mode 100644
index 000000000..4dd75bee6
--- /dev/null
+++ b/lib/PHPExcel/locale/pl/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= zł
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #ZERO!
+DIV0	= #DZIEL/0!
+VALUE	= #ARG!
+REF	= #ADR!
+NAME	= #NAZWA?
+NUM	= #LICZBA!
+NA	= #N/D!
diff --git a/lib/PHPExcel/locale/pl/functions b/lib/PHPExcel/locale/pl/functions
new file mode 100644
index 000000000..1881a71e5
--- /dev/null
+++ b/lib/PHPExcel/locale/pl/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Funkcje dodatków i automatyzacji
+##
+GETPIVOTDATA		= WEŹDANETABELI			##	Zwraca dane przechowywane w raporcie tabeli przestawnej.
+
+
+##
+##	Cube functions					Funkcje modułów
+##
+CUBEKPIMEMBER		= ELEMENT.KPI.MODUŁU		##	Zwraca nazwę, właściwość i miarę kluczowego wskaźnika wydajności (KPI) oraz wyświetla nazwę i właściwość w komórce. Wskaźnik KPI jest miarą ilościową, taką jak miesięczny zysk brutto lub kwartalna fluktuacja pracowników, używaną do monitorowania wydajności organizacji.
+CUBEMEMBER		= ELEMENT.MODUŁU		##	Zwraca element lub krotkę z hierarchii modułu. Służy do sprawdzania, czy element lub krotka istnieje w module.
+CUBEMEMBERPROPERTY	= WŁAŚCIWOŚĆ.ELEMENTU.MODUŁU	##	Zwraca wartość właściwości elementu w module. Służy do sprawdzania, czy nazwa elementu istnieje w module, i zwracania określonej właściwości dla tego elementu.
+CUBERANKEDMEMBER	= USZEREGOWANY.ELEMENT.MODUŁU	##	Zwraca n-ty (albo uszeregowany) element zestawu. Służy do zwracania elementu lub elementów zestawu, na przykład najlepszego sprzedawcy lub 10 najlepszych studentów.
+CUBESET			= ZESTAW.MODUŁÓW		##	Definiuje obliczony zestaw elementów lub krotek, wysyłając wyrażenie zestawu do serwera modułu, który tworzy zestaw i zwraca go do programu Microsoft Office Excel.
+CUBESETCOUNT		= LICZNIK.MODUŁÓW.ZESTAWU	##	Zwraca liczbę elementów zestawu.
+CUBEVALUE		= WARTOŚĆ.MODUŁU		##	Zwraca zagregowaną wartość z modułu.
+
+
+##
+##	Database functions				Funkcje baz danych
+##
+DAVERAGE		= BD.ŚREDNIA			##	Zwraca wartość średniej wybranych wpisów bazy danych.
+DCOUNT			= BD.ILE.REKORDÓW		##	Zlicza komórki zawierające liczby w bazie danych.
+DCOUNTA			= BD.ILE.REKORDÓW.A		##	Zlicza niepuste komórki w bazie danych.
+DGET			= BD.POLE			##	Wyodrębnia z bazy danych jeden rekord spełniający określone kryteria.
+DMAX			= BD.MAX			##	Zwraca wartość maksymalną z wybranych wpisów bazy danych.
+DMIN			= BD.MIN			##	Zwraca wartość minimalną z wybranych wpisów bazy danych.
+DPRODUCT		= BD.ILOCZYN			##	Mnoży wartości w konkretnym, spełniającym kryteria polu rekordów bazy danych.
+DSTDEV			= BD.ODCH.STANDARD		##	Szacuje odchylenie standardowe na podstawie próbki z wybranych wpisów bazy danych.
+DSTDEVP			= BD.ODCH.STANDARD.POPUL	##	Oblicza odchylenie standardowe na podstawie całej populacji wybranych wpisów bazy danych.
+DSUM			= BD.SUMA			##	Dodaje liczby w kolumnie pól rekordów bazy danych, które spełniają kryteria.
+DVAR			= BD.WARIANCJA			##	Szacuje wariancję na podstawie próbki z wybranych wpisów bazy danych.
+DVARP			= BD.WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji wybranych wpisów bazy danych.
+
+
+##
+##	Date and time functions				Funkcje dat, godzin i czasu
+##
+DATE			= DATA				##	Zwraca liczbę seryjną dla wybranej daty.
+DATEVALUE		= DATA.WARTOŚĆ			##	Konwertuje datę w formie tekstu na liczbę seryjną.
+DAY			= DZIEŃ				##	Konwertuje liczbę seryjną na dzień miesiąca.
+DAYS360			= DNI.360			##	Oblicza liczbę dni między dwiema datami na podstawie roku 360-dniowego.
+EDATE			= UPŁDNI			##	Zwraca liczbę seryjną daty jako wskazaną liczbę miesięcy przed określoną datą początkową lub po niej.
+EOMONTH			= EOMONTH			##	Zwraca liczbę seryjną ostatniego dnia miesiąca przed określoną liczbą miesięcy lub po niej.
+HOUR			= GODZINA			##	Konwertuje liczbę seryjną na godzinę.
+MINUTE			= MINUTA			##	Konwertuje liczbę seryjną na minutę.
+MONTH			= MIESIĄC			##	Konwertuje liczbę seryjną na miesiąc.
+NETWORKDAYS		= NETWORKDAYS			##	Zwraca liczbę pełnych dni roboczych między dwiema datami.
+NOW			= TERAZ				##	Zwraca liczbę seryjną bieżącej daty i godziny.
+SECOND			= SEKUNDA			##	Konwertuje liczbę seryjną na sekundę.
+TIME			= CZAS				##	Zwraca liczbę seryjną określonego czasu.
+TIMEVALUE		= CZAS.WARTOŚĆ			##	Konwertuje czas w formie tekstu na liczbę seryjną.
+TODAY			= DZIŚ				##	Zwraca liczbę seryjną dla daty bieżącej.
+WEEKDAY			= DZIEŃ.TYG			##	Konwertuje liczbę seryjną na dzień tygodnia.
+WEEKNUM			= WEEKNUM			##	Konwertuje liczbę seryjną na liczbę reprezentującą numer tygodnia w roku.
+WORKDAY			= WORKDAY			##	Zwraca liczbę seryjną dla daty przed określoną liczbą dni roboczych lub po niej.
+YEAR			= ROK				##	Konwertuje liczbę seryjną na rok.
+YEARFRAC		= YEARFRAC			##	Zwraca część roku reprezentowaną przez pełną liczbę dni między datą początkową a datą końcową.
+
+
+##
+##	Engineering functions				Funkcje inżynierskie
+##
+BESSELI			= BESSELI			##	Zwraca wartość zmodyfikowanej funkcji Bessela In(x).
+BESSELJ			= BESSELJ			##	Zwraca wartość funkcji Bessela Jn(x).
+BESSELK			= BESSELK			##	Zwraca wartość zmodyfikowanej funkcji Bessela Kn(x).
+BESSELY			= BESSELY			##	Zwraca wartość funkcji Bessela Yn(x).
+BIN2DEC			= BIN2DEC			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci dziesiętnej.
+BIN2HEX			= BIN2HEX			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci szesnastkowej.
+BIN2OCT			= BIN2OCT			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci ósemkowej.
+COMPLEX			= COMPLEX			##	Konwertuje część rzeczywistą i urojoną na liczbę zespoloną.
+CONVERT			= CONVERT			##	Konwertuje liczbę z jednego systemu miar na inny.
+DEC2BIN			= DEC2BIN			##	Konwertuje liczbę w postaci dziesiętnej na postać dwójkową.
+DEC2HEX			= DEC2HEX			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci szesnastkowej.
+DEC2OCT			= DEC2OCT			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci ósemkowej.
+DELTA			= DELTA				##	Sprawdza, czy dwie wartości są równe.
+ERF			= ERF				##	Zwraca wartość funkcji błędu.
+ERFC			= ERFC				##	Zwraca wartość komplementarnej funkcji błędu.
+GESTEP			= GESTEP			##	Sprawdza, czy liczba jest większa niż wartość progowa.
+HEX2BIN			= HEX2BIN			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dwójkowej.
+HEX2DEC			= HEX2DEC			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dziesiętnej.
+HEX2OCT			= HEX2OCT			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci ósemkowej.
+IMABS			= IMABS				##	Zwraca wartość bezwzględną (moduł) liczby zespolonej.
+IMAGINARY		= IMAGINARY			##	Zwraca wartość części urojonej liczby zespolonej.
+IMARGUMENT		= IMARGUMENT			##	Zwraca wartość argumentu liczby zespolonej, przy czym kąt wyrażony jest w radianach.
+IMCONJUGATE		= IMCONJUGATE			##	Zwraca wartość liczby sprzężonej danej liczby zespolonej.
+IMCOS			= IMCOS				##	Zwraca wartość cosinusa liczby zespolonej.
+IMDIV			= IMDIV				##	Zwraca wartość ilorazu dwóch liczb zespolonych.
+IMEXP			= IMEXP				##	Zwraca postać wykładniczą liczby zespolonej.
+IMLN			= IMLN				##	Zwraca wartość logarytmu naturalnego liczby zespolonej.
+IMLOG10			= IMLOG10			##	Zwraca wartość logarytmu dziesiętnego liczby zespolonej.
+IMLOG2			= IMLOG2			##	Zwraca wartość logarytmu liczby zespolonej przy podstawie 2.
+IMPOWER			= IMPOWER			##	Zwraca wartość liczby zespolonej podniesionej do potęgi całkowitej.
+IMPRODUCT		= IMPRODUCT			##	Zwraca wartość iloczynu liczb zespolonych.
+IMREAL			= IMREAL			##	Zwraca wartość części rzeczywistej liczby zespolonej.
+IMSIN			= IMSIN				##	Zwraca wartość sinusa liczby zespolonej.
+IMSQRT			= IMSQRT			##	Zwraca wartość pierwiastka kwadratowego z liczby zespolonej.
+IMSUB			= IMSUB				##	Zwraca wartość różnicy dwóch liczb zespolonych.
+IMSUM			= IMSUM				##	Zwraca wartość sumy liczb zespolonych.
+OCT2BIN			= OCT2BIN			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dwójkowej.
+OCT2DEC			= OCT2DEC			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dziesiętnej.
+OCT2HEX			= OCT2HEX			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci szesnastkowej.
+
+
+##
+##	Financial functions				Funkcje finansowe
+##
+ACCRINT			= ACCRINT			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem okresowym.
+ACCRINTM		= ACCRINTM			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem w terminie wykupu.
+AMORDEGRC		= AMORDEGRC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego z wykorzystaniem współczynnika amortyzacji.
+AMORLINC		= AMORLINC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego.
+COUPDAYBS		= COUPDAYBS			##	Zwraca liczbę dni od początku okresu dywidendy do dnia rozliczeniowego.
+COUPDAYS		= COUPDAYS			##	Zwraca liczbę dni w okresie dywidendy, z uwzględnieniem dnia rozliczeniowego.
+COUPDAYSNC		= COUPDAYSNC			##	Zwraca liczbę dni od dnia rozliczeniowego do daty następnego dnia dywidendy.
+COUPNCD			= COUPNCD			##	Zwraca dzień następnej dywidendy po dniu rozliczeniowym.
+COUPNUM			= COUPNUM			##	Zwraca liczbę dywidend płatnych między dniem rozliczeniowym a dniem wykupu.
+COUPPCD			= COUPPCD			##	Zwraca dzień poprzedniej dywidendy przed dniem rozliczeniowym.
+CUMIPMT			= CUMIPMT			##	Zwraca wartość procentu składanego płatnego między dwoma okresami.
+CUMPRINC		= CUMPRINC			##	Zwraca wartość kapitału skumulowanego spłaty pożyczki między dwoma okresami.
+DB			= DB				##	Zwraca amortyzację środka trwałego w danym okresie metodą degresywną z zastosowaniem stałej bazowej.
+DDB			= DDB				##	Zwraca amortyzację środka trwałego za podany okres metodą degresywną z zastosowaniem podwójnej bazowej lub metodą określoną przez użytkownika.
+DISC			= DISC				##	Zwraca wartość stopy dyskontowej papieru wartościowego.
+DOLLARDE		= DOLLARDE			##	Konwertuje cenę w postaci ułamkowej na cenę wyrażoną w postaci dziesiętnej.
+DOLLARFR		= DOLLARFR			##	Konwertuje cenę wyrażoną w postaci dziesiętnej na cenę wyrażoną w postaci ułamkowej.
+DURATION		= DURATION			##	Zwraca wartość rocznego przychodu z papieru wartościowego o okresowych wypłatach oprocentowania.
+EFFECT			= EFFECT			##	Zwraca wartość efektywnej rocznej stopy procentowej.
+FV			= FV				##	Zwraca przyszłą wartość lokaty.
+FVSCHEDULE		= FVSCHEDULE			##	Zwraca przyszłą wartość kapitału początkowego wraz z szeregiem procentów składanych.
+INTRATE			= INTRATE			##	Zwraca wartość stopy procentowej papieru wartościowego całkowicie ulokowanego.
+IPMT			= IPMT				##	Zwraca wysokość spłaty oprocentowania lokaty za dany okres.
+IRR			= IRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii przepływów gotówkowych.
+ISPMT			= ISPMT				##	Oblicza wysokość spłaty oprocentowania za dany okres lokaty.
+MDURATION		= MDURATION			##	Zwraca wartość zmodyfikowanego okresu Macauleya dla papieru wartościowego o założonej wartości nominalnej 100 zł.
+MIRR			= MIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla przypadku, gdy dodatnie i ujemne przepływy gotówkowe mają różne stopy.
+NOMINAL			= NOMINAL			##	Zwraca wysokość nominalnej rocznej stopy procentowej.
+NPER			= NPER				##	Zwraca liczbę okresów dla lokaty.
+NPV			= NPV				##	Zwraca wartość bieżącą netto lokaty na podstawie szeregu okresowych przepływów gotówkowych i stopy dyskontowej.
+ODDFPRICE		= ODDFPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym pierwszym okresem.
+ODDFYIELD		= ODDFYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym pierwszym okresem.
+ODDLPRICE		= ODDLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym ostatnim okresem.
+ODDLYIELD		= ODDLYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym ostatnim okresem.
+PMT			= PMT				##	Zwraca wartość okresowej płatności raty rocznej.
+PPMT			= PPMT				##	Zwraca wysokość spłaty kapitału w przypadku lokaty dla danego okresu.
+PRICE			= PRICE				##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem okresowym.
+PRICEDISC		= PRICEDISC			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego zdyskontowanego.
+PRICEMAT		= PRICEMAT			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem w terminie wykupu.
+PV			= PV				##	Zwraca wartość bieżącą lokaty.
+RATE			= RATE				##	Zwraca wysokość stopy procentowej w okresie raty rocznej.
+RECEIVED		= RECEIVED			##	Zwraca wartość kapitału otrzymanego przy wykupie papieru wartościowego całkowicie ulokowanego.
+SLN			= SLN				##	Zwraca amortyzację środka trwałego za jeden okres metodą liniową.
+SYD			= SYD				##	Zwraca amortyzację środka trwałego za dany okres metodą sumy cyfr lat amortyzacji.
+TBILLEQ			= TBILLEQ			##	Zwraca rentowność ekwiwalentu obligacji dla bonu skarbowego.
+TBILLPRICE		= TBILLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej bonu skarbowego.
+TBILLYIELD		= TBILLYIELD			##	Zwraca rentowność bonu skarbowego.
+VDB			= VDB				##	Oblicza amortyzację środka trwałego w danym okresie lub jego części metodą degresywną.
+XIRR			= XIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
+XNPV			= XNPV				##	Zwraca wartość bieżącą netto dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
+YIELD			= YIELD				##	Zwraca rentowność papieru wartościowego z oprocentowaniem okresowym.
+YIELDDISC		= YIELDDISC			##	Zwraca roczną rentowność zdyskontowanego papieru wartościowego, na przykład bonu skarbowego.
+YIELDMAT		= YIELDMAT			##	Zwraca roczną rentowność papieru wartościowego oprocentowanego przy wykupie.
+
+
+##
+##	Information functions				Funkcje informacyjne
+##
+CELL			= KOMÓRKA			##	Zwraca informacje o formacie, położeniu lub zawartości komórki.
+ERROR.TYPE		= NR.BŁĘDU			##	Zwraca liczbę odpowiadającą typowi błędu.
+INFO			= INFO				##	Zwraca informację o aktualnym środowisku pracy.
+ISBLANK			= CZY.PUSTA			##	Zwraca wartość PRAWDA, jeśli wartość jest pusta.
+ISERR			= CZY.BŁ			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu, z wyjątkiem #N/D!.
+ISERROR			= CZY.BŁĄD			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu.
+ISEVEN			= ISEVEN			##	Zwraca wartość PRAWDA, jeśli liczba jest parzysta.
+ISLOGICAL		= CZY.LOGICZNA			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością logiczną.
+ISNA			= CZY.BRAK			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością błędu #N/D!.
+ISNONTEXT		= CZY.NIE.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość nie jest tekstem.
+ISNUMBER		= CZY.LICZBA			##	Zwraca wartość PRAWDA, jeśli wartość jest liczbą.
+ISODD			= ISODD				##	Zwraca wartość PRAWDA, jeśli liczba jest nieparzysta.
+ISREF			= CZY.ADR			##	Zwraca wartość PRAWDA, jeśli wartość jest odwołaniem.
+ISTEXT			= CZY.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość jest tekstem.
+N			= L				##	Zwraca wartość przekonwertowaną na postać liczbową.
+NA			= BRAK				##	Zwraca wartość błędu #N/D!.
+TYPE			= TYP				##	Zwraca liczbę wskazującą typ danych wartości.
+
+
+##
+##	Logical functions				Funkcje logiczne
+##
+AND			= ORAZ				##	Zwraca wartość PRAWDA, jeśli wszystkie argumenty mają wartość PRAWDA.
+FALSE			= FAŁSZ				##	Zwraca wartość logiczną FAŁSZ.
+IF			= JEŻELI			##	Określa warunek logiczny do sprawdzenia.
+IFERROR			= JEŻELI.BŁĄD			##	Zwraca określoną wartość, jeśli wynikiem obliczenia formuły jest błąd; w przeciwnym przypadku zwraca wynik formuły.
+NOT			= NIE				##	Odwraca wartość logiczną argumentu.
+OR			= LUB				##	Zwraca wartość PRAWDA, jeśli co najmniej jeden z argumentów ma wartość PRAWDA.
+TRUE			= PRAWDA			##	Zwraca wartość logiczną PRAWDA.
+
+
+##
+##	Lookup and reference functions			Funkcje wyszukiwania i odwołań
+##
+ADDRESS			= ADRES				##	Zwraca odwołanie do jednej komórki w arkuszu jako wartość tekstową.
+AREAS			= OBSZARY			##	Zwraca liczbę obszarów występujących w odwołaniu.
+CHOOSE			= WYBIERZ			##	Wybiera wartość z listy wartości.
+COLUMN			= NR.KOLUMNY			##	Zwraca numer kolumny z odwołania.
+COLUMNS			= LICZBA.KOLUMN			##	Zwraca liczbę kolumn dla danego odwołania.
+HLOOKUP			= WYSZUKAJ.POZIOMO		##	Przegląda górny wiersz tablicy i zwraca wartość wskazanej komórki.
+HYPERLINK		= HIPERŁĄCZE			##	Tworzy skrót lub skok, który pozwala otwierać dokument przechowywany na serwerze sieciowym, w sieci intranet lub w Internecie.
+INDEX			= INDEKS			##	Używa indeksu do wybierania wartości z odwołania lub tablicy.
+INDIRECT		= ADR.POŚR			##	Zwraca odwołanie określone przez wartość tekstową.
+LOOKUP			= WYSZUKAJ			##	Wyszukuje wartości w wektorze lub tablicy.
+MATCH			= PODAJ.POZYCJĘ			##	Wyszukuje wartości w odwołaniu lub w tablicy.
+OFFSET			= PRZESUNIĘCIE			##	Zwraca adres przesunięty od danego odwołania.
+ROW			= WIERSZ			##	Zwraca numer wiersza odwołania.
+ROWS			= ILE.WIERSZY			##	Zwraca liczbę wierszy dla danego odwołania.
+RTD			= RTD				##	Pobiera dane w czasie rzeczywistym z programu obsługującego automatyzację COM (Automatyzacja: Sposób pracy z obiektami aplikacji pochodzącymi z innej aplikacji lub narzędzia projektowania. Nazywana wcześniej Automatyzacją OLE, Automatyzacja jest standardem przemysłowym i funkcją obiektowego modelu składników (COM, Component Object Model).).
+TRANSPOSE		= TRANSPONUJ			##	Zwraca transponowaną tablicę.
+VLOOKUP			= WYSZUKAJ.PIONOWO		##	Przeszukuje pierwszą kolumnę tablicy i przechodzi wzdłuż wiersza, aby zwrócić wartość komórki.
+
+
+##
+##	Math and trigonometry functions			Funkcje matematyczne i trygonometryczne
+##
+ABS			= MODUŁ.LICZBY			##	Zwraca wartość absolutną liczby.
+ACOS			= ACOS				##	Zwraca arcus cosinus liczby.
+ACOSH			= ACOSH				##	Zwraca arcus cosinus hiperboliczny liczby.
+ASIN			= ASIN				##	Zwraca arcus sinus liczby.
+ASINH			= ASINH				##	Zwraca arcus sinus hiperboliczny liczby.
+ATAN			= ATAN				##	Zwraca arcus tangens liczby.
+ATAN2			= ATAN2				##	Zwraca arcus tangens liczby na podstawie współrzędnych x i y.
+ATANH			= ATANH				##	Zwraca arcus tangens hiperboliczny liczby.
+CEILING			= ZAOKR.W.GÓRĘ			##	Zaokrągla liczbę do najbliższej liczby całkowitej lub do najbliższej wielokrotności dokładności.
+COMBIN			= KOMBINACJE			##	Zwraca liczbę kombinacji dla danej liczby obiektów.
+COS			= COS				##	Zwraca cosinus liczby.
+COSH			= COSH				##	Zwraca cosinus hiperboliczny liczby.
+DEGREES			= STOPNIE			##	Konwertuje radiany na stopnie.
+EVEN			= ZAOKR.DO.PARZ			##	Zaokrągla liczbę w górę do najbliższej liczby parzystej.
+EXP			= EXP				##	Zwraca wartość liczby e podniesionej do potęgi określonej przez podaną liczbę.
+FACT			= SILNIA			##	Zwraca silnię liczby.
+FACTDOUBLE		= FACTDOUBLE			##	Zwraca podwójną silnię liczby.
+FLOOR			= ZAOKR.W.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
+GCD			= GCD				##	Zwraca największy wspólny dzielnik.
+INT			= ZAOKR.DO.CAŁK			##	Zaokrągla liczbę w dół do najbliższej liczby całkowitej.
+LCM			= LCM				##	Zwraca najmniejszą wspólną wielokrotność.
+LN			= LN				##	Zwraca logarytm naturalny podanej liczby.
+LOG			= LOG				##	Zwraca logarytm danej liczby przy zadanej podstawie.
+LOG10			= LOG10				##	Zwraca logarytm dziesiętny liczby.
+MDETERM			= WYZNACZNIK.MACIERZY		##	Zwraca wyznacznik macierzy tablicy.
+MINVERSE		= MACIERZ.ODW			##	Zwraca odwrotność macierzy tablicy.
+MMULT			= MACIERZ.ILOCZYN		##	Zwraca iloczyn macierzy dwóch tablic.
+MOD			= MOD				##	Zwraca resztę z dzielenia.
+MROUND			= MROUND			##	Zwraca liczbę zaokrągloną do żądanej wielokrotności.
+MULTINOMIAL		= MULTINOMIAL			##	Zwraca wielomian dla zbioru liczb.
+ODD			= ZAOKR.DO.NPARZ		##	Zaokrągla liczbę w górę do najbliższej liczby nieparzystej.
+PI			= PI				##	Zwraca wartość liczby Pi.
+POWER			= POTĘGA			##	Zwraca liczbę podniesioną do potęgi.
+PRODUCT			= ILOCZYN			##	Mnoży argumenty.
+QUOTIENT		= QUOTIENT			##	Zwraca iloraz (całkowity).
+RADIANS			= RADIANY			##	Konwertuje stopnie na radiany.
+RAND			= LOS				##	Zwraca liczbę pseudolosową z zakresu od 0 do 1.
+RANDBETWEEN		= RANDBETWEEN			##	Zwraca liczbę pseudolosową z zakresu określonego przez podane argumenty.
+ROMAN			= RZYMSKIE			##	Konwertuje liczbę arabską na rzymską jako tekst.
+ROUND			= ZAOKR				##	Zaokrągla liczbę do określonej liczby cyfr.
+ROUNDDOWN		= ZAOKR.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
+ROUNDUP			= ZAOKR.GÓRA			##	Zaokrągla liczbę w górę, w kierunku od zera.
+SERIESSUM		= SERIESSUM			##	Zwraca sumę szeregu potęgowego na podstawie wzoru.
+SIGN			= ZNAK.LICZBY			##	Zwraca znak liczby.
+SIN			= SIN				##	Zwraca sinus danego kąta.
+SINH			= SINH				##	Zwraca sinus hiperboliczny liczby.
+SQRT			= PIERWIASTEK			##	Zwraca dodatni pierwiastek kwadratowy.
+SQRTPI			= SQRTPI			##	Zwraca pierwiastek kwadratowy iloczynu (liczba * Pi).
+SUBTOTAL		= SUMY.POŚREDNIE		##	Zwraca sumę częściową listy lub bazy danych.
+SUM			= SUMA				##	Dodaje argumenty.
+SUMIF			= SUMA.JEŻELI			##	Dodaje komórki określone przez podane kryterium.
+SUMIFS			= SUMA.WARUNKÓW			##	Dodaje komórki w zakresie, które spełniają wiele kryteriów.
+SUMPRODUCT		= SUMA.ILOCZYNÓW		##	Zwraca sumę iloczynów odpowiednich elementów tablicy.
+SUMSQ			= SUMA.KWADRATÓW		##	Zwraca sumę kwadratów argumentów.
+SUMX2MY2		= SUMA.X2.M.Y2			##	Zwraca sumę różnic kwadratów odpowiednich wartości w dwóch tablicach.
+SUMX2PY2		= SUMA.X2.P.Y2			##	Zwraca sumę sum kwadratów odpowiednich wartości w dwóch tablicach.
+SUMXMY2			= SUMA.XMY.2			##	Zwraca sumę kwadratów różnic odpowiednich wartości w dwóch tablicach.
+TAN			= TAN				##	Zwraca tangens liczby.
+TANH			= TANH				##	Zwraca tangens hiperboliczny liczby.
+TRUNC			= LICZBA.CAŁK			##	Przycina liczbę do wartości całkowitej.
+
+
+##
+##	Statistical functions				Funkcje statystyczne
+##
+AVEDEV			= ODCH.ŚREDNIE			##	Zwraca średnią wartość odchyleń absolutnych punktów danych od ich wartości średniej.
+AVERAGE			= ŚREDNIA			##	Zwraca wartość średnią argumentów.
+AVERAGEA		= ŚREDNIA.A			##	Zwraca wartość średnią argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
+AVERAGEIF		= ŚREDNIA.JEŻELI		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek w zakresie, które spełniają podane kryteria.
+AVERAGEIFS		= ŚREDNIA.WARUNKÓW		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek, które spełniają jedno lub więcej kryteriów.
+BETADIST		= ROZKŁAD.BETA			##	Zwraca skumulowaną funkcję gęstości prawdopodobieństwa beta.
+BETAINV			= ROZKŁAD.BETA.ODW		##	Zwraca odwrotność skumulowanej funkcji gęstości prawdopodobieństwa beta.
+BINOMDIST		= ROZKŁAD.DWUM			##	Zwraca pojedynczy składnik dwumianowego rozkładu prawdopodobieństwa.
+CHIDIST			= ROZKŁAD.CHI			##	Zwraca wartość jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
+CHIINV			= ROZKŁAD.CHI.ODW		##	Zwraca odwrotność wartości jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
+CHITEST			= TEST.CHI			##	Zwraca test niezależności.
+CONFIDENCE		= UFNOŚĆ			##	Zwraca interwał ufności dla średniej populacji.
+CORREL			= WSP.KORELACJI			##	Zwraca współczynnik korelacji dwóch zbiorów danych.
+COUNT			= ILE.LICZB			##	Zlicza liczby znajdujące się na liście argumentów.
+COUNTA			= ILE.NIEPUSTYCH		##	Zlicza wartości znajdujące się na liście argumentów.
+COUNTBLANK		= LICZ.PUSTE			##	Zwraca liczbę pustych komórek w pewnym zakresie.
+COUNTIF			= LICZ.JEŻELI			##	Zlicza komórki wewnątrz zakresu, które spełniają podane kryteria.
+COUNTIFS		= LICZ.WARUNKI			##	Zlicza komórki wewnątrz zakresu, które spełniają wiele kryteriów.
+COVAR			= KOWARIANCJA			##	Zwraca kowariancję, czyli średnią wartość iloczynów odpowiednich odchyleń.
+CRITBINOM		= PRÓG.ROZKŁAD.DWUM		##	Zwraca najmniejszą wartość, dla której skumulowany rozkład dwumianowy jest mniejszy niż wartość kryterium lub równy jej.
+DEVSQ			= ODCH.KWADRATOWE		##	Zwraca sumę kwadratów odchyleń.
+EXPONDIST		= ROZKŁAD.EXP			##	Zwraca rozkład wykładniczy.
+FDIST			= ROZKŁAD.F			##	Zwraca rozkład prawdopodobieństwa F.
+FINV			= ROZKŁAD.F.ODW			##	Zwraca odwrotność rozkładu prawdopodobieństwa F.
+FISHER			= ROZKŁAD.FISHER		##	Zwraca transformację Fishera.
+FISHERINV		= ROZKŁAD.FISHER.ODW		##	Zwraca odwrotność transformacji Fishera.
+FORECAST		= REGLINX			##	Zwraca wartość trendu liniowego.
+FREQUENCY		= CZĘSTOŚĆ			##	Zwraca rozkład częstotliwości jako tablicę pionową.
+FTEST			= TEST.F			##	Zwraca wynik testu F.
+GAMMADIST		= ROZKŁAD.GAMMA			##	Zwraca rozkład gamma.
+GAMMAINV		= ROZKŁAD.GAMMA.ODW		##	Zwraca odwrotność skumulowanego rozkładu gamma.
+GAMMALN			= ROZKŁAD.LIN.GAMMA		##	Zwraca logarytm naturalny funkcji gamma, Γ(x).
+GEOMEAN			= ŚREDNIA.GEOMETRYCZNA		##	Zwraca średnią geometryczną.
+GROWTH			= REGEXPW			##	Zwraca wartości trendu wykładniczego.
+HARMEAN			= ŚREDNIA.HARMONICZNA		##	Zwraca średnią harmoniczną.
+HYPGEOMDIST		= ROZKŁAD.HIPERGEOM		##	Zwraca rozkład hipergeometryczny.
+INTERCEPT		= ODCIĘTA			##	Zwraca punkt przecięcia osi pionowej z linią regresji liniowej.
+KURT			= KURTOZA			##	Zwraca kurtozę zbioru danych.
+LARGE			= MAX.K				##	Zwraca k-tą największą wartość ze zbioru danych.
+LINEST			= REGLINP			##	Zwraca parametry trendu liniowego.
+LOGEST			= REGEXPP			##	Zwraca parametry trendu wykładniczego.
+LOGINV			= ROZKŁAD.LOG.ODW		##	Zwraca odwrotność rozkładu logarytmu naturalnego.
+LOGNORMDIST		= ROZKŁAD.LOG			##	Zwraca skumulowany rozkład logarytmu naturalnego.
+MAX			= MAX				##	Zwraca maksymalną wartość listy argumentów.
+MAXA			= MAX.A				##	Zwraca maksymalną wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
+MEDIAN			= MEDIANA			##	Zwraca medianę podanych liczb.
+MIN			= MIN				##	Zwraca minimalną wartość listy argumentów.
+MINA			= MIN.A				##	Zwraca najmniejszą wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
+MODE			= WYST.NAJCZĘŚCIEJ		##	Zwraca wartość najczęściej występującą w zbiorze danych.
+NEGBINOMDIST		= ROZKŁAD.DWUM.PRZEC		##	Zwraca ujemny rozkład dwumianowy.
+NORMDIST		= ROZKŁAD.NORMALNY		##	Zwraca rozkład normalny skumulowany.
+NORMINV			= ROZKŁAD.NORMALNY.ODW		##	Zwraca odwrotność rozkładu normalnego skumulowanego.
+NORMSDIST		= ROZKŁAD.NORMALNY.S		##	Zwraca standardowy rozkład normalny skumulowany.
+NORMSINV		= ROZKŁAD.NORMALNY.S.ODW	##	Zwraca odwrotność standardowego rozkładu normalnego skumulowanego.
+PEARSON			= PEARSON			##	Zwraca współczynnik korelacji momentu iloczynu Pearsona.
+PERCENTILE		= PERCENTYL			##	Wyznacza k-ty percentyl wartości w zakresie.
+PERCENTRANK		= PROCENT.POZYCJA		##	Zwraca procentową pozycję wartości w zbiorze danych.
+PERMUT			= PERMUTACJE			##	Zwraca liczbę permutacji dla danej liczby obiektów.
+POISSON			= ROZKŁAD.POISSON		##	Zwraca rozkład Poissona.
+PROB			= PRAWDPD			##	Zwraca prawdopodobieństwo, że wartości w zakresie leżą pomiędzy dwiema granicami.
+QUARTILE		= KWARTYL			##	Wyznacza kwartyl zbioru danych.
+RANK			= POZYCJA			##	Zwraca pozycję liczby na liście liczb.
+RSQ			= R.KWADRAT			##	Zwraca kwadrat współczynnika korelacji momentu iloczynu Pearsona.
+SKEW			= SKOŚNOŚĆ			##	Zwraca skośność rozkładu.
+SLOPE			= NACHYLENIE			##	Zwraca nachylenie linii regresji liniowej.
+SMALL			= MIN.K				##	Zwraca k-tą najmniejszą wartość ze zbioru danych.
+STANDARDIZE		= NORMALIZUJ			##	Zwraca wartość znormalizowaną.
+STDEV			= ODCH.STANDARDOWE		##	Szacuje odchylenie standardowe na podstawie próbki.
+STDEVA			= ODCH.STANDARDOWE.A		##	Szacuje odchylenie standardowe na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
+STDEVP			= ODCH.STANDARD.POPUL		##	Oblicza odchylenie standardowe na podstawie całej populacji.
+STDEVPA			= ODCH.STANDARD.POPUL.A		##	Oblicza odchylenie standardowe na podstawie całej populacji, z uwzględnieniem liczb, teksów i wartości logicznych.
+STEYX			= REGBŁSTD			##	Zwraca błąd standardowy przewidzianej wartości y dla każdej wartości x w regresji.
+TDIST			= ROZKŁAD.T			##	Zwraca rozkład t-Studenta.
+TINV			= ROZKŁAD.T.ODW			##	Zwraca odwrotność rozkładu t-Studenta.
+TREND			= REGLINW			##	Zwraca wartości trendu liniowego.
+TRIMMEAN		= ŚREDNIA.WEWN			##	Zwraca średnią wartość dla wnętrza zbioru danych.
+TTEST			= TEST.T			##	Zwraca prawdopodobieństwo związane z testem t-Studenta.
+VAR			= WARIANCJA			##	Szacuje wariancję na podstawie próbki.
+VARA			= WARIANCJA.A			##	Szacuje wariancję na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
+VARP			= WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji.
+VARPA			= WARIANCJA.POPUL.A		##	Oblicza wariancję na podstawie całej populacji, z uwzględnieniem liczb, tekstów i wartości logicznych.
+WEIBULL			= ROZKŁAD.WEIBULL		##	Zwraca rozkład Weibulla.
+ZTEST			= TEST.Z			##	Zwraca wartość jednostronnego prawdopodobieństwa testu z.
+
+
+##
+##	Text functions					Funkcje tekstowe
+##
+ASC			= ASC				##	Zamienia litery angielskie lub katakana o pełnej szerokości (dwubajtowe) w ciągu znaków na znaki o szerokości połówkowej (jednobajtowe).
+BAHTTEXT		= BAHTTEXT			##	Konwertuje liczbę na tekst, stosując format walutowy ß (baht).
+CHAR			= ZNAK				##	Zwraca znak o podanym numerze kodu.
+CLEAN			= OCZYŚĆ			##	Usuwa z tekstu wszystkie znaki, które nie mogą być drukowane.
+CODE			= KOD				##	Zwraca kod numeryczny pierwszego znaku w ciągu tekstowym.
+CONCATENATE		= ZŁĄCZ.TEKSTY			##	Łączy kilka oddzielnych tekstów w jeden tekst.
+DOLLAR			= KWOTA				##	Konwertuje liczbę na tekst, stosując format walutowy $ (dolar).
+EXACT			= PORÓWNAJ			##	Sprawdza identyczność dwóch wartości tekstowych.
+FIND			= ZNAJDŹ			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
+FINDB			= ZNAJDŹB			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
+FIXED			= ZAOKR.DO.TEKST		##	Formatuje liczbę jako tekst przy stałej liczbie miejsc dziesiętnych.
+JIS			= JIS				##	Zmienia litery angielskie lub katakana o szerokości połówkowej (jednobajtowe) w ciągu znaków na znaki o pełnej szerokości (dwubajtowe).
+LEFT			= LEWY				##	Zwraca skrajne lewe znaki z wartości tekstowej.
+LEFTB			= LEWYB				##	Zwraca skrajne lewe znaki z wartości tekstowej.
+LEN			= DŁ				##	Zwraca liczbę znaków ciągu tekstowego.
+LENB			= DŁ.B				##	Zwraca liczbę znaków ciągu tekstowego.
+LOWER			= LITERY.MAŁE			##	Konwertuje wielkie litery tekstu na małe litery.
+MID			= FRAGMENT.TEKSTU		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
+MIDB			= FRAGMENT.TEKSTU.B		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
+PHONETIC		= PHONETIC			##	Wybiera znaki fonetyczne (furigana) z ciągu tekstowego.
+PROPER			= Z.WIELKIEJ.LITERY		##	Zastępuje pierwszą literę każdego wyrazu tekstu wielką literą.
+REPLACE			= ZASTĄP			##	Zastępuje znaki w tekście.
+REPLACEB		= ZASTĄP.B			##	Zastępuje znaki w tekście.
+REPT			= POWT				##	Powiela tekst daną liczbę razy.
+RIGHT			= PRAWY				##	Zwraca skrajne prawe znaki z wartości tekstowej.
+RIGHTB			= PRAWYB			##	Zwraca skrajne prawe znaki z wartości tekstowej.
+SEARCH			= SZUKAJ.TEKST			##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
+SEARCHB			= SZUKAJ.TEKST.B		##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
+SUBSTITUTE		= PODSTAW			##	Podstawia nowy tekst w miejsce poprzedniego tekstu w ciągu tekstowym.
+T			= T				##	Konwertuje argumenty na tekst.
+TEXT			= TEKST				##	Formatuje liczbę i konwertuje ją na tekst.
+TRIM			= USUŃ.ZBĘDNE.ODSTĘPY		##	Usuwa spacje z tekstu.
+UPPER			= LITERY.WIELKIE		##	Konwertuje znaki tekstu na wielkie litery.
+VALUE			= WARTOŚĆ			##	Konwertuje argument tekstowy na liczbę.
diff --git a/lib/PHPExcel/locale/pt/br/config b/lib/PHPExcel/locale/pt/br/config
new file mode 100644
index 000000000..45b6fbd92
--- /dev/null
+++ b/lib/PHPExcel/locale/pt/br/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= R$
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NULO!
+DIV0	= #DIV/0!
+VALUE	= #VALOR!
+REF	= #REF!
+NAME	= #NOME?
+NUM	= #NÚM!
+NA	= #N/D
diff --git a/lib/PHPExcel/locale/pt/br/functions b/lib/PHPExcel/locale/pt/br/functions
new file mode 100644
index 000000000..a062a7fad
--- /dev/null
+++ b/lib/PHPExcel/locale/pt/br/functions
@@ -0,0 +1,408 @@
+##
+##	Add-in and Automation functions			Funções Suplemento e Automação
+##
+GETPIVOTDATA		= INFODADOSTABELADINÂMICA	##	Retorna os dados armazenados em um relatório de tabela dinâmica
+
+
+##
+##	Cube functions					Funções de Cubo
+##
+CUBEKPIMEMBER		= MEMBROKPICUBO			##	Retorna o nome de um KPI (indicador de desempenho-chave), uma propriedade e uma medida e exibe o nome e a propriedade na célula. Um KPI é uma medida quantificável, como o lucro bruto mensal ou a rotatividade trimestral dos funcionários, usada para monitorar o desempenho de uma organização.
+CUBEMEMBER		= MEMBROCUBO			##	Retorna um membro ou tupla em uma hierarquia de cubo. Use para validar se o membro ou tupla existe no cubo.
+CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Retorna o valor da propriedade de um membro no cubo. Usada para validar a existência do nome do membro no cubo e para retornar a propriedade especificada para esse membro.
+CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Retorna o enésimo membro, ou o membro ordenado, em um conjunto. Use para retornar um ou mais elementos em um conjunto, assim como o melhor vendedor ou os dez melhores alunos.
+CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou tuplas enviando uma expressão do conjunto para o cubo no servidor, que cria o conjunto e o retorna para o Microsoft Office Excel.
+CUBESETCOUNT		= CONTAGEMCONJUNTOCUBO		##	Retorna o número de itens em um conjunto.
+CUBEVALUE		= VALORCUBO			##	Retorna um valor agregado de um cubo.
+
+
+##
+##	Database functions				Funções de banco de dados
+##
+DAVERAGE		= BDMÉDIA			##	Retorna a média das entradas selecionadas de um banco de dados
+DCOUNT			= BDCONTAR			##	Conta as células que contêm números em um banco de dados
+DCOUNTA			= BDCONTARA			##	Conta células não vazias em um banco de dados
+DGET			= BDEXTRAIR			##	Extrai de um banco de dados um único registro que corresponde a um critério específico
+DMAX			= BDMÁX				##	Retorna o valor máximo de entradas selecionadas de um banco de dados
+DMIN			= BDMÍN				##	Retorna o valor mínimo de entradas selecionadas de um banco de dados
+DPRODUCT		= BDMULTIPL			##	Multiplica os valores em um campo específico de registros que correspondem ao critério em um banco de dados
+DSTDEV			= BDEST				##	Estima o desvio padrão com base em uma amostra de entradas selecionadas de um banco de dados
+DSTDEVP			= BDDESVPA			##	Calcula o desvio padrão com base na população inteira de entradas selecionadas de um banco de dados
+DSUM			= BDSOMA			##	Adiciona os números à coluna de campos de registros do banco de dados que correspondem ao critério
+DVAR			= BDVAREST			##	Estima a variância com base em uma amostra de entradas selecionadas de um banco de dados
+DVARP			= BDVARP			##	Calcula a variância com base na população inteira de entradas selecionadas de um banco de dados
+
+
+##
+##	Date and time functions				Funções de data e hora
+##
+DATE			= DATA				##	Retorna o número de série de uma data específica
+DATEVALUE		= DATA.VALOR			##	Converte uma data na forma de texto para um número de série
+DAY			= DIA				##	Converte um número de série em um dia do mês
+DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base em um ano de 360 dias
+EDATE			= DATAM				##	Retorna o número de série da data que é o número indicado de meses antes ou depois da data inicial
+EOMONTH			= FIMMÊS			##	Retorna o número de série do último dia do mês antes ou depois de um número especificado de meses
+HOUR			= HORA				##	Converte um número de série em uma hora
+MINUTE			= MINUTO			##	Converte um número de série em um minuto
+MONTH			= MÊS				##	Converte um número de série em um mês
+NETWORKDAYS		= DIATRABALHOTOTAL		##	Retorna o número de dias úteis inteiros entre duas datas
+NOW			= AGORA				##	Retorna o número de série seqüencial da data e hora atuais
+SECOND			= SEGUNDO			##	Converte um número de série em um segundo
+TIME			= HORA				##	Retorna o número de série de uma hora específica
+TIMEVALUE		= VALOR.TEMPO			##	Converte um horário na forma de texto para um número de série
+TODAY			= HOJE				##	Retorna o número de série da data de hoje
+WEEKDAY			= DIA.DA.SEMANA			##	Converte um número de série em um dia da semana
+WEEKNUM			= NÚMSEMANA			##	Converte um número de série em um número que representa onde a semana cai numericamente em um ano
+WORKDAY			= DIATRABALHO			##	Retorna o número de série da data antes ou depois de um número específico de dias úteis
+YEAR			= ANO				##	Converte um número de série em um ano
+YEARFRAC		= FRAÇÃOANO			##	Retorna a fração do ano que representa o número de dias entre data_inicial e data_final
+
+
+##
+##	Engineering functions				Funções de engenharia
+##
+BESSELI			= BESSELI			##	Retorna a função de Bessel In(x) modificada
+BESSELJ			= BESSELJ			##	Retorna a função de Bessel Jn(x)
+BESSELK			= BESSELK			##	Retorna a função de Bessel Kn(x) modificada
+BESSELY			= BESSELY			##	Retorna a função de Bessel Yn(x)
+BIN2DEC			= BIN2DEC			##	Converte um número binário em decimal
+BIN2HEX			= BIN2HEX			##	Converte um número binário em hexadecimal
+BIN2OCT			= BIN2OCT			##	Converte um número binário em octal
+COMPLEX			= COMPLEX			##	Converte coeficientes reais e imaginários e um número complexo
+CONVERT			= CONVERTER			##	Converte um número de um sistema de medida para outro
+DEC2BIN			= DECABIN			##	Converte um número decimal em binário
+DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
+DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
+DELTA			= DELTA				##	Testa se dois valores são iguais
+ERF			= FUNERRO			##	Retorna a função de erro
+ERFC			= FUNERROCOMPL			##	Retorna a função de erro complementar
+GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
+HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
+HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
+HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
+IMABS			= IMABS				##	Retorna o valor absoluto (módulo) de um número complexo
+IMAGINARY		= IMAGINÁRIO			##	Retorna o coeficiente imaginário de um número complexo
+IMARGUMENT		= IMARG				##	Retorna o argumento teta, um ângulo expresso em radianos
+IMCONJUGATE		= IMCONJ			##	Retorna o conjugado complexo de um número complexo
+IMCOS			= IMCOS				##	Retorna o cosseno de um número complexo
+IMDIV			= IMDIV				##	Retorna o quociente de dois números complexos
+IMEXP			= IMEXP				##	Retorna o exponencial de um número complexo
+IMLN			= IMLN				##	Retorna o logaritmo natural de um número complexo
+IMLOG10			= IMLOG10			##	Retorna o logaritmo de base 10 de um número complexo
+IMLOG2			= IMLOG2			##	Retorna o logaritmo de base 2 de um número complexo
+IMPOWER			= IMPOT				##	Retorna um número complexo elevado a uma potência inteira
+IMPRODUCT		= IMPROD			##	Retorna o produto de números complexos
+IMREAL			= IMREAL			##	Retorna o coeficiente real de um número complexo
+IMSIN			= IMSENO			##	Retorna o seno de um número complexo
+IMSQRT			= IMRAIZ			##	Retorna a raiz quadrada de um número complexo
+IMSUB			= IMSUBTR			##	Retorna a diferença entre dois números complexos
+IMSUM			= IMSOMA			##	Retorna a soma de números complexos
+OCT2BIN			= OCTABIN			##	Converte um número octal em binário
+OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
+OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
+
+
+##
+##	Financial functions				Funções financeiras
+##
+ACCRINT			= JUROSACUM			##	Retorna a taxa de juros acumulados de um título que paga uma taxa periódica de juros
+ACCRINTM		= JUROSACUMV			##	Retorna os juros acumulados de um título que paga juros no vencimento
+AMORDEGRC		= AMORDEGRC			##	Retorna a depreciação para cada período contábil usando o coeficiente de depreciação
+AMORLINC		= AMORLINC			##	Retorna a depreciação para cada período contábil
+COUPDAYBS		= CUPDIASINLIQ			##	Retorna o número de dias do início do período de cupom até a data de liquidação
+COUPDAYS		= CUPDIAS			##	Retorna o número de dias no período de cupom que contém a data de quitação
+COUPDAYSNC		= CUPDIASPRÓX			##	Retorna o número de dias da data de liquidação até a data do próximo cupom
+COUPNCD			= CUPDATAPRÓX			##	Retorna a próxima data de cupom após a data de quitação
+COUPNUM			= CUPNÚM			##	Retorna o número de cupons pagáveis entre as datas de quitação e vencimento
+COUPPCD			= CUPDATAANT			##	Retorna a data de cupom anterior à data de quitação
+CUMIPMT			= PGTOJURACUM			##	Retorna os juros acumulados pagos entre dois períodos
+CUMPRINC		= PGTOCAPACUM			##	Retorna o capital acumulado pago sobre um empréstimo entre dois períodos
+DB			= BD				##	Retorna a depreciação de um ativo para um período especificado, usando o método de balanço de declínio fixo
+DDB			= BDD				##	Retorna a depreciação de um ativo com relação a um período especificado usando o método de saldos decrescentes duplos ou qualquer outro método especificado por você
+DISC			= DESC				##	Retorna a taxa de desconto de um título
+DOLLARDE		= MOEDADEC			##	Converte um preço em formato de moeda, na forma fracionária, em um preço na forma decimal
+DOLLARFR		= MOEDAFRA			##	Converte um preço, apresentado na forma decimal, em um preço apresentado na forma fracionária
+DURATION		= DURAÇÃO			##	Retorna a duração anual de um título com pagamentos de juros periódicos
+EFFECT			= EFETIVA			##	Retorna a taxa de juros anual efetiva
+FV			= VF				##	Retorna o valor futuro de um investimento
+FVSCHEDULE		= VFPLANO			##	Retorna o valor futuro de um capital inicial após a aplicação de uma série de taxas de juros compostas
+INTRATE			= TAXAJUROS			##	Retorna a taxa de juros de um título totalmente investido
+IPMT			= IPGTO				##	Retorna o pagamento de juros para um investimento em um determinado período
+IRR			= TIR				##	Retorna a taxa interna de retorno de uma série de fluxos de caixa
+ISPMT			= ÉPGTO				##	Calcula os juros pagos durante um período específico de um investimento
+MDURATION		= MDURAÇÃO			##	Retorna a duração de Macauley modificada para um título com um valor de paridade equivalente a R$ 100
+MIRR			= MTIR				##	Calcula a taxa interna de retorno em que fluxos de caixa positivos e negativos são financiados com diferentes taxas
+NOMINAL			= NOMINAL			##	Retorna a taxa de juros nominal anual
+NPER			= NPER				##	Retorna o número de períodos de um investimento
+NPV			= VPL				##	Retorna o valor líquido atual de um investimento com base em uma série de fluxos de caixa periódicos e em uma taxa de desconto
+ODDFPRICE		= PREÇOPRIMINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um primeiro período indefinido
+ODDFYIELD		= LUCROPRIMINC			##	Retorna o rendimento de um título com um primeiro período indefinido
+ODDLPRICE		= PREÇOÚLTINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um último período de cupom indefinido
+ODDLYIELD		= LUCROÚLTINC			##	Retorna o rendimento de um título com um último período indefinido
+PMT			= PGTO				##	Retorna o pagamento periódico de uma anuidade
+PPMT			= PPGTO				##	Retorna o pagamento de capital para determinado período de investimento
+PRICE			= PREÇO				##	Retorna a preço por R$ 100,00 de valor nominal de um título que paga juros periódicos
+PRICEDISC		= PREÇODESC			##	Retorna o preço por R$ 100,00 de valor nominal de um título descontado
+PRICEMAT		= PREÇOVENC			##	Retorna o preço por R$ 100,00 de valor nominal de um título que paga juros no vencimento
+PV			= VP				##	Retorna o valor presente de um investimento
+RATE			= TAXA				##	Retorna a taxa de juros por período de uma anuidade
+RECEIVED		= RECEBER			##	Retorna a quantia recebida no vencimento de um título totalmente investido
+SLN			= DPD				##	Retorna a depreciação em linha reta de um ativo durante um período
+SYD			= SDA				##	Retorna a depreciação dos dígitos da soma dos anos de um ativo para um período especificado
+TBILLEQ			= OTN				##	Retorna o rendimento de um título equivalente a uma obrigação do Tesouro
+TBILLPRICE		= OTNVALOR			##	Retorna o preço por R$ 100,00 de valor nominal de uma obrigação do Tesouro
+TBILLYIELD		= OTNLUCRO			##	Retorna o rendimento de uma obrigação do Tesouro
+VDB			= BDV				##	Retorna a depreciação de um ativo para um período especificado ou parcial usando um método de balanço declinante
+XIRR			= XTIR				##	Fornece a taxa interna de retorno para um programa de fluxos de caixa que não é necessariamente periódico
+XNPV			= XVPL				##	Retorna o valor presente líquido de um programa de fluxos de caixa que não é necessariamente periódico
+YIELD			= LUCRO				##	Retorna o lucro de um título que paga juros periódicos
+YIELDDISC		= LUCRODESC			##	Retorna o rendimento anual de um título descontado. Por exemplo, uma obrigação do Tesouro
+YIELDMAT		= LUCROVENC			##	Retorna o lucro anual de um título que paga juros no vencimento
+
+
+##
+##	Information functions				Funções de informação
+##
+CELL			= CÉL				##	Retorna informações sobre formatação, localização ou conteúdo de uma célula
+ERROR.TYPE		= TIPO.ERRO			##	Retorna um número correspondente a um tipo de erro
+INFO			= INFORMAÇÃO			##	Retorna informações sobre o ambiente operacional atual
+ISBLANK			= ÉCÉL.VAZIA			##	Retorna VERDADEIRO se o valor for vazio
+ISERR			= ÉERRO				##	Retorna VERDADEIRO se o valor for um valor de erro diferente de #N/D
+ISERROR			= ÉERROS			##	Retorna VERDADEIRO se o valor for um valor de erro
+ISEVEN			= ÉPAR				##	Retorna VERDADEIRO se o número for par
+ISLOGICAL		= ÉLÓGICO			##	Retorna VERDADEIRO se o valor for um valor lógico
+ISNA			= É.NÃO.DISP			##	Retorna VERDADEIRO se o valor for o valor de erro #N/D
+ISNONTEXT		= É.NÃO.TEXTO			##	Retorna VERDADEIRO se o valor for diferente de texto
+ISNUMBER		= ÉNÚM				##	Retorna VERDADEIRO se o valor for um número
+ISODD			= ÉIMPAR			##	Retorna VERDADEIRO se o número for ímpar
+ISREF			= ÉREF				##	Retorna VERDADEIRO se o valor for uma referência
+ISTEXT			= ÉTEXTO			##	Retorna VERDADEIRO se o valor for texto
+N			= N				##	Retorna um valor convertido em um número
+NA			= NÃO.DISP			##	Retorna o valor de erro #N/D
+TYPE			= TIPO				##	Retorna um número indicando o tipo de dados de um valor
+
+
+##
+##	Logical functions				Funções lógicas
+##
+AND			= E				##	Retorna VERDADEIRO se todos os seus argumentos forem VERDADEIROS
+FALSE			= FALSO				##	Retorna o valor lógico FALSO
+IF			= SE				##	Especifica um teste lógico a ser executado
+IFERROR			= SEERRO			##	Retornará um valor que você especifica se uma fórmula for avaliada para um erro; do contrário, retornará o resultado da fórmula
+NOT			= NÃO				##	Inverte o valor lógico do argumento
+OR			= OU				##	Retorna VERDADEIRO se um dos argumentos for VERDADEIRO
+TRUE			= VERDADEIRO			##	Retorna o valor lógico VERDADEIRO
+
+
+##
+##	Lookup and reference functions			Funções de pesquisa e referência
+##
+ADDRESS			= ENDEREÇO			##	Retorna uma referência como texto para uma única célula em uma planilha
+AREAS			= ÁREAS				##	Retorna o número de áreas em uma referência
+CHOOSE			= ESCOLHER			##	Escolhe um valor a partir de uma lista de valores
+COLUMN			= COL				##	Retorna o número da coluna de uma referência
+COLUMNS			= COLS				##	Retorna o número de colunas em uma referência
+HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e retorna o valor da célula especificada
+HYPERLINK		= HYPERLINK			##	Cria um atalho ou salto que abre um documento armazenado em um servidor de rede, uma intranet ou na Internet
+INDEX			= ÍNDICE			##	Usa um índice para escolher um valor de uma referência ou matriz
+INDIRECT		= INDIRETO			##	Retorna uma referência indicada por um valor de texto
+LOOKUP			= PROC				##	Procura valores em um vetor ou em uma matriz
+MATCH			= CORRESP			##	Procura valores em uma referência ou em uma matriz
+OFFSET			= DESLOC			##	Retorna um deslocamento de referência com base em uma determinada referência
+ROW			= LIN				##	Retorna o número da linha de uma referência
+ROWS			= LINS				##	Retorna o número de linhas em uma referência
+RTD			= RTD				##	Recupera dados em tempo real de um programa que ofereça suporte a automação COM (automação: uma forma de trabalhar com objetos de um aplicativo a partir de outro aplicativo ou ferramenta de desenvolvimento. Chamada inicialmente de automação OLE, a automação é um padrão industrial e um recurso do modelo de objeto componente (COM).)
+TRANSPOSE		= TRANSPOR			##	Retorna a transposição de uma matriz
+VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e move ao longo da linha para retornar o valor de uma célula
+
+
+##
+##	Math and trigonometry functions			Funções matemáticas e trigonométricas
+##
+ABS			= ABS				##	Retorna o valor absoluto de um número
+ACOS			= ACOS				##	Retorna o arco cosseno de um número
+ACOSH			= ACOSH				##	Retorna o cosseno hiperbólico inverso de um número
+ASIN			= ASEN				##	Retorna o arco seno de um número
+ASINH			= ASENH				##	Retorna o seno hiperbólico inverso de um número
+ATAN			= ATAN				##	Retorna o arco tangente de um número
+ATAN2			= ATAN2				##	Retorna o arco tangente das coordenadas x e y especificadas
+ATANH			= ATANH				##	Retorna a tangente hiperbólica inversa de um número
+CEILING			= TETO				##	Arredonda um número para o inteiro mais próximo ou para o múltiplo mais próximo de significância
+COMBIN			= COMBIN			##	Retorna o número de combinações de um determinado número de objetos
+COS			= COS				##	Retorna o cosseno de um número
+COSH			= COSH				##	Retorna o cosseno hiperbólico de um número
+DEGREES			= GRAUS				##	Converte radianos em graus
+EVEN			= PAR				##	Arredonda um número para cima até o inteiro par mais próximo
+EXP			= EXP				##	Retorna e elevado à potência de um número especificado
+FACT			= FATORIAL			##	Retorna o fatorial de um número
+FACTDOUBLE		= FATDUPLO			##	Retorna o fatorial duplo de um número
+FLOOR			= ARREDMULTB			##	Arredonda um número para baixo até zero
+GCD			= MDC				##	Retorna o máximo divisor comum
+INT			= INT				##	Arredonda um número para baixo até o número inteiro mais próximo
+LCM			= MMC				##	Retorna o mínimo múltiplo comum
+LN			= LN				##	Retorna o logaritmo natural de um número
+LOG			= LOG				##	Retorna o logaritmo de um número de uma base especificada
+LOG10			= LOG10				##	Retorna o logaritmo de base 10 de um número
+MDETERM			= MATRIZ.DETERM			##	Retorna o determinante de uma matriz de uma variável do tipo matriz
+MINVERSE		= MATRIZ.INVERSO		##	Retorna a matriz inversa de uma matriz
+MMULT			= MATRIZ.MULT			##	Retorna o produto de duas matrizes
+MOD			= RESTO				##	Retorna o resto da divisão
+MROUND			= MARRED			##	Retorna um número arredondado ao múltiplo desejado
+MULTINOMIAL		= MULTINOMIAL			##	Retorna o multinomial de um conjunto de números
+ODD			= ÍMPAR				##	Arredonda um número para cima até o inteiro ímpar mais próximo
+PI			= PI				##	Retorna o valor de Pi
+POWER			= POTÊNCIA			##	Fornece o resultado de um número elevado a uma potência
+PRODUCT			= MULT				##	Multiplica seus argumentos
+QUOTIENT		= QUOCIENTE			##	Retorna a parte inteira de uma divisão
+RADIANS			= RADIANOS			##	Converte graus em radianos
+RAND			= ALEATÓRIO			##	Retorna um número aleatório entre 0 e 1
+RANDBETWEEN		= ALEATÓRIOENTRE		##	Retorna um número aleatório entre os números especificados
+ROMAN			= ROMANO			##	Converte um algarismo arábico em romano, como texto
+ROUND			= ARRED				##	Arredonda um número até uma quantidade especificada de dígitos
+ROUNDDOWN		= ARREDONDAR.PARA.BAIXO		##	Arredonda um número para baixo até zero
+ROUNDUP			= ARREDONDAR.PARA.CIMA		##	Arredonda um número para cima, afastando-o de zero
+SERIESSUM		= SOMASEQÜÊNCIA			##	Retorna a soma de uma série polinomial baseada na fórmula
+SIGN			= SINAL				##	Retorna o sinal de um número
+SIN			= SEN				##	Retorna o seno de um ângulo dado
+SINH			= SENH				##	Retorna o seno hiperbólico de um número
+SQRT			= RAIZ				##	Retorna uma raiz quadrada positiva
+SQRTPI			= RAIZPI			##	Retorna a raiz quadrada de (núm* pi)
+SUBTOTAL		= SUBTOTAL			##	Retorna um subtotal em uma lista ou em um banco de dados
+SUM			= SOMA				##	Soma seus argumentos
+SUMIF			= SOMASE			##	Adiciona as células especificadas por um determinado critério
+SUMIFS			= SOMASE			##	Adiciona as células em um intervalo que atende a vários critérios
+SUMPRODUCT		= SOMARPRODUTO			##	Retorna a soma dos produtos de componentes correspondentes de matrizes
+SUMSQ			= SOMAQUAD			##	Retorna a soma dos quadrados dos argumentos
+SUMX2MY2		= SOMAX2DY2			##	Retorna a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
+SUMX2PY2		= SOMAX2SY2			##	Retorna a soma da soma dos quadrados dos valores correspondentes em duas matrizes
+SUMXMY2			= SOMAXMY2			##	Retorna a soma dos quadrados das diferenças dos valores correspondentes em duas matrizes
+TAN			= TAN				##	Retorna a tangente de um número
+TANH			= TANH				##	Retorna a tangente hiperbólica de um número
+TRUNC			= TRUNCAR			##	Trunca um número para um inteiro
+
+
+##
+##	Statistical functions				Funções estatísticas
+##
+AVEDEV			= DESV.MÉDIO			##	Retorna a média aritmética dos desvios médios dos pontos de dados a partir de sua média
+AVERAGE			= MÉDIA				##	Retorna a média dos argumentos
+AVERAGEA		= MÉDIAA			##	Retorna a média dos argumentos, inclusive números, texto e valores lógicos
+AVERAGEIF		= MÉDIASE			##	Retorna a média (média aritmética) de todas as células em um intervalo que atendem a um determinado critério
+AVERAGEIFS		= MÉDIASES			##	Retorna a média (média aritmética) de todas as células que atendem a múltiplos critérios.
+BETADIST		= DISTBETA			##	Retorna a função de distribuição cumulativa beta
+BETAINV			= BETA.ACUM.INV			##	Retorna o inverso da função de distribuição cumulativa para uma distribuição beta especificada
+BINOMDIST		= DISTRBINOM			##	Retorna a probabilidade de distribuição binomial do termo individual
+CHIDIST			= DIST.QUI			##	Retorna a probabilidade unicaudal da distribuição qui-quadrada
+CHIINV			= INV.QUI			##	Retorna o inverso da probabilidade uni-caudal da distribuição qui-quadrada
+CHITEST			= TESTE.QUI			##	Retorna o teste para independência
+CONFIDENCE		= INT.CONFIANÇA			##	Retorna o intervalo de confiança para uma média da população
+CORREL			= CORREL			##	Retorna o coeficiente de correlação entre dois conjuntos de dados
+COUNT			= CONT.NÚM			##	Calcula quantos números há na lista de argumentos
+COUNTA			= CONT.VALORES			##	Calcula quantos valores há na lista de argumentos
+COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células vazias no intervalo especificado
+COUNTIF			= CONT.SE			##	Calcula o número de células não vazias em um intervalo que corresponde a determinados critérios
+COUNTIFS		= CONT.SES			##	Conta o número de células dentro de um intervalo que atende a múltiplos critérios
+COVAR			= COVAR				##	Retorna a covariância, a média dos produtos dos desvios pares
+CRITBINOM		= CRIT.BINOM			##	Retorna o menor valor para o qual a distribuição binomial cumulativa é menor ou igual ao valor padrão
+DEVSQ			= DESVQ				##	Retorna a soma dos quadrados dos desvios
+EXPONDIST		= DISTEXPON			##	Retorna a distribuição exponencial
+FDIST			= DISTF				##	Retorna a distribuição de probabilidade F
+FINV			= INVF				##	Retorna o inverso da distribuição de probabilidades F
+FISHER			= FISHER			##	Retorna a transformação Fisher
+FISHERINV		= FISHERINV			##	Retorna o inverso da transformação Fisher
+FORECAST		= PREVISÃO			##	Retorna um valor ao longo de uma linha reta
+FREQUENCY		= FREQÜÊNCIA			##	Retorna uma distribuição de freqüência como uma matriz vertical
+FTEST			= TESTEF			##	Retorna o resultado de um teste F
+GAMMADIST		= DISTGAMA			##	Retorna a distribuição gama
+GAMMAINV		= INVGAMA			##	Retorna o inverso da distribuição cumulativa gama
+GAMMALN			= LNGAMA			##	Retorna o logaritmo natural da função gama, G(x)
+GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Retorna a média geométrica
+GROWTH			= CRESCIMENTO			##	Retorna valores ao longo de uma tendência exponencial
+HARMEAN			= MÉDIA.HARMÔNICA		##	Retorna a média harmônica
+HYPGEOMDIST		= DIST.HIPERGEOM		##	Retorna a distribuição hipergeométrica
+INTERCEPT		= INTERCEPÇÃO			##	Retorna a intercepção da linha de regressão linear
+KURT			= CURT				##	Retorna a curtose de um conjunto de dados
+LARGE			= MAIOR				##	Retorna o maior valor k-ésimo de um conjunto de dados
+LINEST			= PROJ.LIN			##	Retorna os parâmetros de uma tendência linear
+LOGEST			= PROJ.LOG			##	Retorna os parâmetros de uma tendência exponencial
+LOGINV			= INVLOG			##	Retorna o inverso da distribuição lognormal
+LOGNORMDIST		= DIST.LOGNORMAL		##	Retorna a distribuição lognormal cumulativa
+MAX			= MÁXIMO			##	Retorna o valor máximo em uma lista de argumentos
+MAXA			= MÁXIMOA			##	Retorna o maior valor em uma lista de argumentos, inclusive números, texto e valores lógicos
+MEDIAN			= MED				##	Retorna a mediana dos números indicados
+MIN			= MÍNIMO			##	Retorna o valor mínimo em uma lista de argumentos
+MINA			= MÍNIMOA			##	Retorna o menor valor em uma lista de argumentos, inclusive números, texto e valores lógicos
+MODE			= MODO				##	Retorna o valor mais comum em um conjunto de dados
+NEGBINOMDIST		= DIST.BIN.NEG			##	Retorna a distribuição binomial negativa
+NORMDIST		= DIST.NORM			##	Retorna a distribuição cumulativa normal
+NORMINV			= INV.NORM			##	Retorna o inverso da distribuição cumulativa normal
+NORMSDIST		= DIST.NORMP			##	Retorna a distribuição cumulativa normal padrão
+NORMSINV		= INV.NORMP			##	Retorna o inverso da distribuição cumulativa normal padrão
+PEARSON			= PEARSON			##	Retorna o coeficiente de correlação do momento do produto Pearson
+PERCENTILE		= PERCENTIL			##	Retorna o k-ésimo percentil de valores em um intervalo
+PERCENTRANK		= ORDEM.PORCENTUAL		##	Retorna a ordem percentual de um valor em um conjunto de dados
+PERMUT			= PERMUT			##	Retorna o número de permutações de um determinado número de objetos
+POISSON			= POISSON			##	Retorna a distribuição Poisson
+PROB			= PROB				##	Retorna a probabilidade de valores em um intervalo estarem entre dois limites
+QUARTILE		= QUARTIL			##	Retorna o quartil do conjunto de dados
+RANK			= ORDEM				##	Retorna a posição de um número em uma lista de números
+RSQ			= RQUAD				##	Retorna o quadrado do coeficiente de correlação do momento do produto de Pearson
+SKEW			= DISTORÇÃO			##	Retorna a distorção de uma distribuição
+SLOPE			= INCLINAÇÃO			##	Retorna a inclinação da linha de regressão linear
+SMALL			= MENOR				##	Retorna o menor valor k-ésimo do conjunto de dados
+STANDARDIZE		= PADRONIZAR			##	Retorna um valor normalizado
+STDEV			= DESVPAD			##	Estima o desvio padrão com base em uma amostra
+STDEVA			= DESVPADA			##	Estima o desvio padrão com base em uma amostra, inclusive números, texto e valores lógicos
+STDEVP			= DESVPADP			##	Calcula o desvio padrão com base na população total
+STDEVPA			= DESVPADPA			##	Calcula o desvio padrão com base na população total, inclusive números, texto e valores lógicos
+STEYX			= EPADYX			##	Retorna o erro padrão do valor-y previsto para cada x da regressão
+TDIST			= DISTT				##	Retorna a distribuição t de Student
+TINV			= INVT				##	Retorna o inverso da distribuição t de Student
+TREND			= TENDÊNCIA			##	Retorna valores ao longo de uma tendência linear
+TRIMMEAN		= MÉDIA.INTERNA			##	Retorna a média do interior de um conjunto de dados
+TTEST			= TESTET			##	Retorna a probabilidade associada ao teste t de Student
+VAR			= VAR				##	Estima a variância com base em uma amostra
+VARA			= VARA				##	Estima a variância com base em uma amostra, inclusive números, texto e valores lógicos
+VARP			= VARP				##	Calcula a variância com base na população inteira
+VARPA			= VARPA				##	Calcula a variância com base na população total, inclusive números, texto e valores lógicos
+WEIBULL			= WEIBULL			##	Retorna a distribuição Weibull
+ZTEST			= TESTEZ			##	Retorna o valor de probabilidade uni-caudal de um teste-z
+
+
+##
+##	Text functions			Funções de texto
+##
+ASC			= ASC				##	Altera letras do inglês ou katakana de largura total (bytes duplos) dentro de uma seqüência de caracteres para caracteres de meia largura (byte único)
+BAHTTEXT		= BAHTTEXT			##	Converte um número em um texto, usando o formato de moeda ß (baht)
+CHAR			= CARACT			##	Retorna o caractere especificado pelo número de código
+CLEAN			= TIRAR				##	Remove todos os caracteres do texto que não podem ser impressos
+CODE			= CÓDIGO			##	Retorna um código numérico para o primeiro caractere de uma seqüência de caracteres de texto
+CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto em um único item de texto
+DOLLAR			= MOEDA				##	Converte um número em texto, usando o formato de moeda $ (dólar)
+EXACT			= EXATO				##	Verifica se dois valores de texto são idênticos
+FIND			= PROCURAR			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
+FINDB			= PROCURARB			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
+FIXED			= DEF.NÚM.DEC			##	Formata um número como texto com um número fixo de decimais
+JIS			= JIS				##	Altera letras do inglês ou katakana de meia largura (byte único) dentro de uma seqüência de caracteres para caracteres de largura total (bytes duplos)
+LEFT			= ESQUERDA			##	Retorna os caracteres mais à esquerda de um valor de texto
+LEFTB			= ESQUERDAB			##	Retorna os caracteres mais à esquerda de um valor de texto
+LEN			= NÚM.CARACT			##	Retorna o número de caracteres em uma seqüência de texto
+LENB			= NÚM.CARACTB			##	Retorna o número de caracteres em uma seqüência de texto
+LOWER			= MINÚSCULA			##	Converte texto para minúsculas
+MID			= EXT.TEXTO			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
+MIDB			= EXT.TEXTOB			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
+PHONETIC		= FONÉTICA			##	Extrai os caracteres fonéticos (furigana) de uma seqüência de caracteres de texto
+PROPER			= PRI.MAIÚSCULA			##	Coloca a primeira letra de cada palavra em maiúscula em um valor de texto
+REPLACE			= MUDAR				##	Muda os caracteres dentro do texto
+REPLACEB		= MUDARB			##	Muda os caracteres dentro do texto
+REPT			= REPT				##	Repete o texto um determinado número de vezes
+RIGHT			= DIREITA			##	Retorna os caracteres mais à direita de um valor de texto
+RIGHTB			= DIREITAB			##	Retorna os caracteres mais à direita de um valor de texto
+SEARCH			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
+SEARCHB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
+SUBSTITUTE		= SUBSTITUIR			##	Substitui um novo texto por um texto antigo em uma seqüência de texto
+T			= T				##	Converte os argumentos em texto
+TEXT			= TEXTO				##	Formata um número e o converte em texto
+TRIM			= ARRUMAR			##	Remove espaços do texto
+UPPER			= MAIÚSCULA			##	Converte o texto em maiúsculas
+VALUE			= VALOR				##	Converte um argumento de texto em um número
diff --git a/lib/PHPExcel/locale/pt/config b/lib/PHPExcel/locale/pt/config
new file mode 100644
index 000000000..8bb8d8b8e
--- /dev/null
+++ b/lib/PHPExcel/locale/pt/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= €
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #NULO!
+DIV0	= #DIV/0!
+VALUE	= #VALOR!
+REF	= #REF!
+NAME	= #NOME?
+NUM	= #NÚM!
+NA	= #N/D
diff --git a/lib/PHPExcel/locale/pt/functions b/lib/PHPExcel/locale/pt/functions
new file mode 100644
index 000000000..ba4eb471b
--- /dev/null
+++ b/lib/PHPExcel/locale/pt/functions
@@ -0,0 +1,408 @@
+##
+##	Add-in and Automation functions			Funções de Suplemento e Automatização
+##
+GETPIVOTDATA		= OBTERDADOSDIN			##	Devolve dados armazenados num relatório de Tabela Dinâmica
+
+
+##
+##	Cube functions					Funções de cubo
+##
+CUBEKPIMEMBER		= MEMBROKPICUBO			##	Devolve o nome, propriedade e medição de um KPI (key performance indicator) e apresenta o nome e a propriedade na célula. Um KPI é uma medida quantificável, como, por exemplo, o lucro mensal bruto ou a rotatividade trimestral de pessoal, utilizada para monitorizar o desempenho de uma organização.
+CUBEMEMBER		= MEMBROCUBO			##	Devolve um membro ou cadeia de identificação numa hierarquia de cubo. Utilizada para validar a existência do membro ou cadeia de identificação no cubo.
+CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Devolve o valor de uma propriedade de membro no cubo. Utilizada para validar a existência de um nome de membro no cubo e para devolver a propriedade especificada para esse membro.
+CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Devolve o enésimo ou a classificação mais alta num conjunto. Utilizada para devolver um ou mais elementos num conjunto, tal como o melhor vendedor ou os 10 melhores alunos.
+CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou cadeias de identificação enviando uma expressão de conjunto para o cubo no servidor, que cria o conjunto e, em seguida, devolve o conjunto ao Microsoft Office Excel.
+CUBESETCOUNT		= CONTARCONJUNTOCUBO		##	Devolve o número de itens num conjunto.
+CUBEVALUE		= VALORCUBO			##	Devolve um valor agregado do cubo.
+
+
+##
+##	Database functions				Funções de base de dados
+##
+DAVERAGE		= BDMÉDIA			##	Devolve a média das entradas da base de dados seleccionadas
+DCOUNT			= BDCONTAR			##	Conta as células que contêm números numa base de dados
+DCOUNTA			= BDCONTAR.VAL			##	Conta as células que não estejam em branco numa base de dados
+DGET			= BDOBTER			##	Extrai de uma base de dados um único registo que corresponde aos critérios especificados
+DMAX			= BDMÁX				##	Devolve o valor máximo das entradas da base de dados seleccionadas
+DMIN			= BDMÍN				##	Devolve o valor mínimo das entradas da base de dados seleccionadas
+DPRODUCT		= BDMULTIPL			##	Multiplica os valores de um determinado campo de registos que correspondem aos critérios numa base de dados
+DSTDEV			= BDDESVPAD			##	Calcula o desvio-padrão com base numa amostra de entradas da base de dados seleccionadas
+DSTDEVP			= BDDESVPADP			##	Calcula o desvio-padrão com base na população total das entradas da base de dados seleccionadas
+DSUM			= BDSOMA			##	Adiciona os números na coluna de campo dos registos de base de dados que correspondem aos critérios
+DVAR			= BDVAR				##	Calcula a variância com base numa amostra das entradas de base de dados seleccionadas
+DVARP			= BDVARP			##	Calcula a variância com base na população total das entradas de base de dados seleccionadas
+
+
+##
+##	Date and time functions				Funções de data e hora
+##
+DATE			= DATA				##	Devolve o número de série de uma determinada data
+DATEVALUE		= DATA.VALOR			##	Converte uma data em forma de texto num número de série
+DAY			= DIA				##	Converte um número de série num dia do mês
+DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base num ano com 360 dias
+EDATE			= DATAM				##	Devolve um número de série de data que corresponde ao número de meses indicado antes ou depois da data de início
+EOMONTH			= FIMMÊS			##	Devolve o número de série do último dia do mês antes ou depois de um número de meses especificado
+HOUR			= HORA				##	Converte um número de série numa hora
+MINUTE			= MINUTO			##	Converte um número de série num minuto
+MONTH			= MÊS				##	Converte um número de série num mês
+NETWORKDAYS		= DIATRABALHOTOTAL		##	Devolve o número total de dias úteis entre duas datas
+NOW			= AGORA				##	Devolve o número de série da data e hora actuais
+SECOND			= SEGUNDO			##	Converte um número de série num segundo
+TIME			= TEMPO				##	Devolve o número de série de um determinado tempo
+TIMEVALUE		= VALOR.TEMPO			##	Converte um tempo em forma de texto num número de série
+TODAY			= HOJE				##	Devolve o número de série da data actual
+WEEKDAY			= DIA.SEMANA			##	Converte um número de série num dia da semana
+WEEKNUM			= NÚMSEMANA			##	Converte um número de série num número que representa o número da semana num determinado ano
+WORKDAY			= DIA.TRABALHO			##	Devolve o número de série da data antes ou depois de um número de dias úteis especificado
+YEAR			= ANO				##	Converte um número de série num ano
+YEARFRAC		= FRACÇÃOANO			##	Devolve a fracção de ano que representa o número de dias inteiros entre a data_de_início e a data_de_fim
+
+
+##
+##	Engineering functions				Funções de engenharia
+##
+BESSELI			= BESSELI			##	Devolve a função de Bessel modificada In(x)
+BESSELJ			= BESSELJ			##	Devolve a função de Bessel Jn(x)
+BESSELK			= BESSELK			##	Devolve a função de Bessel modificada Kn(x)
+BESSELY			= BESSELY			##	Devolve a função de Bessel Yn(x)
+BIN2DEC			= BINADEC			##	Converte um número binário em decimal
+BIN2HEX			= BINAHEX			##	Converte um número binário em hexadecimal
+BIN2OCT			= BINAOCT			##	Converte um número binário em octal
+COMPLEX			= COMPLEXO			##	Converte coeficientes reais e imaginários num número complexo
+CONVERT			= CONVERTER			##	Converte um número de um sistema de medida noutro
+DEC2BIN			= DECABIN			##	Converte um número decimal em binário
+DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
+DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
+DELTA			= DELTA				##	Testa se dois valores são iguais
+ERF			= FUNCERRO			##	Devolve a função de erro
+ERFC			= FUNCERROCOMPL			##	Devolve a função de erro complementar
+GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
+HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
+HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
+HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
+IMABS			= IMABS				##	Devolve o valor absoluto (módulo) de um número complexo
+IMAGINARY		= IMAGINÁRIO			##	Devolve o coeficiente imaginário de um número complexo
+IMARGUMENT		= IMARG				##	Devolve o argumento Teta, um ângulo expresso em radianos
+IMCONJUGATE		= IMCONJ			##	Devolve o conjugado complexo de um número complexo
+IMCOS			= IMCOS				##	Devolve o co-seno de um número complexo
+IMDIV			= IMDIV				##	Devolve o quociente de dois números complexos
+IMEXP			= IMEXP				##	Devolve o exponencial de um número complexo
+IMLN			= IMLN				##	Devolve o logaritmo natural de um número complexo
+IMLOG10			= IMLOG10			##	Devolve o logaritmo de base 10 de um número complexo
+IMLOG2			= IMLOG2			##	Devolve o logaritmo de base 2 de um número complexo
+IMPOWER			= IMPOT				##	Devolve um número complexo elevado a uma potência inteira
+IMPRODUCT		= IMPROD			##	Devolve o produto de números complexos
+IMREAL			= IMREAL			##	Devolve o coeficiente real de um número complexo
+IMSIN			= IMSENO			##	Devolve o seno de um número complexo
+IMSQRT			= IMRAIZ			##	Devolve a raiz quadrada de um número complexo
+IMSUB			= IMSUBTR			##	Devolve a diferença entre dois números complexos
+IMSUM			= IMSOMA			##	Devolve a soma de números complexos
+OCT2BIN			= OCTABIN			##	Converte um número octal em binário
+OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
+OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
+
+
+##
+##	Financial functions				Funções financeiras
+##
+ACCRINT			= JUROSACUM			##	Devolve os juros acumulados de um título que paga juros periódicos
+ACCRINTM		= JUROSACUMV			##	Devolve os juros acumulados de um título que paga juros no vencimento
+AMORDEGRC		= AMORDEGRC			##	Devolve a depreciação correspondente a cada período contabilístico utilizando um coeficiente de depreciação
+AMORLINC		= AMORLINC			##	Devolve a depreciação correspondente a cada período contabilístico
+COUPDAYBS		= CUPDIASINLIQ			##	Devolve o número de dias entre o início do período do cupão e a data de regularização
+COUPDAYS		= CUPDIAS			##	Devolve o número de dias no período do cupão que contém a data de regularização
+COUPDAYSNC		= CUPDIASPRÓX			##	Devolve o número de dias entre a data de regularização e a data do cupão seguinte
+COUPNCD			= CUPDATAPRÓX			##	Devolve a data do cupão seguinte após a data de regularização
+COUPNUM			= CUPNÚM			##	Devolve o número de cupões a serem pagos entre a data de regularização e a data de vencimento
+COUPPCD			= CUPDATAANT			##	Devolve a data do cupão anterior antes da data de regularização
+CUMIPMT			= PGTOJURACUM			##	Devolve os juros cumulativos pagos entre dois períodos
+CUMPRINC		= PGTOCAPACUM			##	Devolve o capital cumulativo pago a título de empréstimo entre dois períodos
+DB			= BD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas fixas
+DDB			= BDD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas duplas ou qualquer outro método especificado
+DISC			= DESC				##	Devolve a taxa de desconto de um título
+DOLLARDE		= MOEDADEC			##	Converte um preço em unidade monetária, expresso como uma fracção, num preço em unidade monetária, expresso como um número decimal
+DOLLARFR		= MOEDAFRA			##	Converte um preço em unidade monetária, expresso como um número decimal, num preço em unidade monetária, expresso como uma fracção
+DURATION		= DURAÇÃO			##	Devolve a duração anual de um título com pagamentos de juros periódicos
+EFFECT			= EFECTIVA			##	Devolve a taxa de juros anual efectiva
+FV			= VF				##	Devolve o valor futuro de um investimento
+FVSCHEDULE		= VFPLANO			##	Devolve o valor futuro de um capital inicial após a aplicação de uma série de taxas de juro compostas
+INTRATE			= TAXAJUROS			##	Devolve a taxa de juros de um título investido na totalidade
+IPMT			= IPGTO				##	Devolve o pagamento dos juros de um investimento durante um determinado período
+IRR			= TIR				##	Devolve a taxa de rentabilidade interna para uma série de fluxos monetários
+ISPMT			= É.PGTO			##	Calcula os juros pagos durante um período específico de um investimento
+MDURATION		= MDURAÇÃO			##	Devolve a duração modificada de Macauley de um título com um valor de paridade equivalente a € 100
+MIRR			= MTIR				##	Devolve a taxa interna de rentabilidade em que os fluxos monetários positivos e negativos são financiados com taxas diferentes
+NOMINAL			= NOMINAL			##	Devolve a taxa de juros nominal anual
+NPER			= NPER				##	Devolve o número de períodos de um investimento
+NPV			= VAL				##	Devolve o valor actual líquido de um investimento com base numa série de fluxos monetários periódicos e numa taxa de desconto
+ODDFPRICE		= PREÇOPRIMINC			##	Devolve o preço por € 100 do valor nominal de um título com um período inicial incompleto
+ODDFYIELD		= LUCROPRIMINC			##	Devolve o lucro de um título com um período inicial incompleto
+ODDLPRICE		= PREÇOÚLTINC			##	Devolve o preço por € 100 do valor nominal de um título com um período final incompleto
+ODDLYIELD		= LUCROÚLTINC			##	Devolve o lucro de um título com um período final incompleto
+PMT			= PGTO				##	Devolve o pagamento periódico de uma anuidade
+PPMT			= PPGTO				##	Devolve o pagamento sobre o capital de um investimento num determinado período
+PRICE			= PREÇO				##	Devolve o preço por € 100 do valor nominal de um título que paga juros periódicos
+PRICEDISC		= PREÇODESC			##	Devolve o preço por € 100 do valor nominal de um título descontado
+PRICEMAT		= PREÇOVENC			##	Devolve o preço por € 100 do valor nominal de um título que paga juros no vencimento
+PV			= VA				##	Devolve o valor actual de um investimento
+RATE			= TAXA				##	Devolve a taxa de juros por período de uma anuidade
+RECEIVED		= RECEBER			##	Devolve o montante recebido no vencimento de um título investido na totalidade
+SLN			= AMORT				##	Devolve uma depreciação linear de um activo durante um período
+SYD			= AMORTD			##	Devolve a depreciação por algarismos da soma dos anos de um activo durante um período especificado
+TBILLEQ			= OTN				##	Devolve o lucro de um título equivalente a uma Obrigação do Tesouro
+TBILLPRICE		= OTNVALOR			##	Devolve o preço por € 100 de valor nominal de uma Obrigação do Tesouro
+TBILLYIELD		= OTNLUCRO			##	Devolve o lucro de uma Obrigação do Tesouro
+VDB			= BDV				##	Devolve a depreciação de um activo relativo a um período específico ou parcial utilizando um método de quotas degressivas
+XIRR			= XTIR				##	Devolve a taxa interna de rentabilidade de um plano de fluxos monetários que não seja necessariamente periódica
+XNPV			= XVAL				##	Devolve o valor actual líquido de um plano de fluxos monetários que não seja necessariamente periódico
+YIELD			= LUCRO				##	Devolve o lucro de um título que paga juros periódicos
+YIELDDISC		= LUCRODESC			##	Devolve o lucro anual de um título emitido abaixo do valor nominal, por exemplo, uma Obrigação do Tesouro
+YIELDMAT		= LUCROVENC			##	Devolve o lucro anual de um título que paga juros na data de vencimento
+
+
+##
+##	Information functions				Funções de informação
+##
+CELL			= CÉL				##	Devolve informações sobre a formatação, localização ou conteúdo de uma célula
+ERROR.TYPE		= TIPO.ERRO			##	Devolve um número correspondente a um tipo de erro
+INFO			= INFORMAÇÃO			##	Devolve informações sobre o ambiente de funcionamento actual
+ISBLANK			= É.CÉL.VAZIA			##	Devolve VERDADEIRO se o valor estiver em branco
+ISERR			= É.ERROS			##	Devolve VERDADEIRO se o valor for um valor de erro diferente de #N/D
+ISERROR			= É.ERRO			##	Devolve VERDADEIRO se o valor for um valor de erro
+ISEVEN			= ÉPAR				##	Devolve VERDADEIRO se o número for par
+ISLOGICAL		= É.LÓGICO			##	Devolve VERDADEIRO se o valor for lógico
+ISNA			= É.NÃO.DISP			##	Devolve VERDADEIRO se o valor for o valor de erro #N/D
+ISNONTEXT		= É.NÃO.TEXTO			##	Devolve VERDADEIRO se o valor não for texto
+ISNUMBER		= É.NÚM				##	Devolve VERDADEIRO se o valor for um número
+ISODD			= ÉÍMPAR			##	Devolve VERDADEIRO se o número for ímpar
+ISREF			= É.REF				##	Devolve VERDADEIRO se o valor for uma referência
+ISTEXT			= É.TEXTO			##	Devolve VERDADEIRO se o valor for texto
+N			= N				##	Devolve um valor convertido num número
+NA			= NÃO.DISP			##	Devolve o valor de erro #N/D
+TYPE			= TIPO				##	Devolve um número que indica o tipo de dados de um valor
+
+
+##
+##	Logical functions				Funções lógicas
+##
+AND			= E				##	Devolve VERDADEIRO se todos os respectivos argumentos corresponderem a VERDADEIRO
+FALSE			= FALSO				##	Devolve o valor lógico FALSO
+IF			= SE				##	Especifica um teste lógico a ser executado
+IFERROR			= SE.ERRO			##	Devolve um valor definido pelo utilizador se ocorrer um erro na fórmula, e devolve o resultado da fórmula se não ocorrer nenhum erro
+NOT			= NÃO				##	Inverte a lógica do respectivo argumento
+OR			= OU				##	Devolve VERDADEIRO se qualquer argumento for VERDADEIRO
+TRUE			= VERDADEIRO			##	Devolve o valor lógico VERDADEIRO
+
+
+##
+##	Lookup and reference functions			Funções de pesquisa e referência
+##
+ADDRESS			= ENDEREÇO			##	Devolve uma referência a uma única célula numa folha de cálculo como texto
+AREAS			= ÁREAS				##	Devolve o número de áreas numa referência
+CHOOSE			= SELECCIONAR			##	Selecciona um valor a partir de uma lista de valores
+COLUMN			= COL				##	Devolve o número da coluna de uma referência
+COLUMNS			= COLS				##	Devolve o número de colunas numa referência
+HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e devolve o valor da célula indicada
+HYPERLINK		= HIPERLIGAÇÃO			##	Cria um atalho ou hiperligação que abre um documento armazenado num servidor de rede, numa intranet ou na Internet
+INDEX			= ÍNDICE			##	Utiliza um índice para escolher um valor de uma referência ou de uma matriz
+INDIRECT		= INDIRECTO			##	Devolve uma referência indicada por um valor de texto
+LOOKUP			= PROC				##	Procura valores num vector ou numa matriz
+MATCH			= CORRESP			##	Procura valores numa referência ou numa matriz
+OFFSET			= DESLOCAMENTO			##	Devolve o deslocamento de referência de uma determinada referência
+ROW			= LIN				##	Devolve o número da linha de uma referência
+ROWS			= LINS				##	Devolve o número de linhas numa referência
+RTD			= RTD				##	Obtém dados em tempo real a partir de um programa que suporte automatização COM (automatização: modo de trabalhar com objectos de uma aplicação a partir de outra aplicação ou ferramenta de desenvolvimento. Anteriormente conhecida como automatização OLE, a automatização é uma norma da indústria de software e uma funcionalidade COM (Component Object Model).)
+TRANSPOSE		= TRANSPOR			##	Devolve a transposição de uma matriz
+VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e percorre a linha para devolver o valor de uma célula
+
+
+##
+##	Math and trigonometry functions			Funções matemáticas e trigonométricas
+##
+ABS			= ABS				##	Devolve o valor absoluto de um número
+ACOS			= ACOS				##	Devolve o arco de co-seno de um número
+ACOSH			= ACOSH				##	Devolve o co-seno hiperbólico inverso de um número
+ASIN			= ASEN				##	Devolve o arco de seno de um número
+ASINH			= ASENH				##	Devolve o seno hiperbólico inverso de um número
+ATAN			= ATAN				##	Devolve o arco de tangente de um número
+ATAN2			= ATAN2				##	Devolve o arco de tangente das coordenadas x e y
+ATANH			= ATANH				##	Devolve a tangente hiperbólica inversa de um número
+CEILING			= ARRED.EXCESSO			##	Arredonda um número para o número inteiro mais próximo ou para o múltiplo de significância mais próximo
+COMBIN			= COMBIN			##	Devolve o número de combinações de um determinado número de objectos
+COS			= COS				##	Devolve o co-seno de um número
+COSH			= COSH				##	Devolve o co-seno hiperbólico de um número
+DEGREES			= GRAUS				##	Converte radianos em graus
+EVEN			= PAR				##	Arredonda um número por excesso para o número inteiro mais próximo
+EXP			= EXP				##	Devolve e elevado à potência de um determinado número
+FACT			= FACTORIAL			##	Devolve o factorial de um número
+FACTDOUBLE		= FACTDUPLO			##	Devolve o factorial duplo de um número
+FLOOR			= ARRED.DEFEITO			##	Arredonda um número por defeito até zero
+GCD			= MDC				##	Devolve o maior divisor comum
+INT			= INT				##	Arredonda um número por defeito para o número inteiro mais próximo
+LCM			= MMC				##	Devolve o mínimo múltiplo comum
+LN			= LN				##	Devolve o logaritmo natural de um número
+LOG			= LOG				##	Devolve o logaritmo de um número com uma base especificada
+LOG10			= LOG10				##	Devolve o logaritmo de base 10 de um número
+MDETERM			= MATRIZ.DETERM			##	Devolve o determinante matricial de uma matriz
+MINVERSE		= MATRIZ.INVERSA		##	Devolve o inverso matricial de uma matriz
+MMULT			= MATRIZ.MULT			##	Devolve o produto matricial de duas matrizes
+MOD			= RESTO				##	Devolve o resto da divisão
+MROUND			= MARRED			##	Devolve um número arredondado para o múltiplo pretendido
+MULTINOMIAL		= POLINOMIAL			##	Devolve o polinomial de um conjunto de números
+ODD			= ÍMPAR				##	Arredonda por excesso um número para o número inteiro ímpar mais próximo
+PI			= PI				##	Devolve o valor de pi
+POWER			= POTÊNCIA			##	Devolve o resultado de um número elevado a uma potência
+PRODUCT			= PRODUTO			##	Multiplica os respectivos argumentos
+QUOTIENT		= QUOCIENTE			##	Devolve a parte inteira de uma divisão
+RADIANS			= RADIANOS			##	Converte graus em radianos
+RAND			= ALEATÓRIO			##	Devolve um número aleatório entre 0 e 1
+RANDBETWEEN		= ALEATÓRIOENTRE		##	Devolve um número aleatório entre os números especificados
+ROMAN			= ROMANO			##	Converte um número árabe em romano, como texto
+ROUND			= ARRED				##	Arredonda um número para um número de dígitos especificado
+ROUNDDOWN		= ARRED.PARA.BAIXO		##	Arredonda um número por defeito até zero
+ROUNDUP			= ARRED.PARA.CIMA		##	Arredonda um número por excesso, afastando-o de zero
+SERIESSUM		= SOMASÉRIE			##	Devolve a soma de uma série de potências baseada na fórmula
+SIGN			= SINAL				##	Devolve o sinal de um número
+SIN			= SEN				##	Devolve o seno de um determinado ângulo
+SINH			= SENH				##	Devolve o seno hiperbólico de um número
+SQRT			= RAIZQ				##	Devolve uma raiz quadrada positiva
+SQRTPI			= RAIZPI			##	Devolve a raiz quadrada de (núm * pi)
+SUBTOTAL		= SUBTOTAL			##	Devolve um subtotal numa lista ou base de dados
+SUM			= SOMA				##	Adiciona os respectivos argumentos
+SUMIF			= SOMA.SE			##	Adiciona as células especificadas por um determinado critério
+SUMIFS			= SOMA.SE.S			##	Adiciona as células num intervalo que cumpre vários critérios
+SUMPRODUCT		= SOMARPRODUTO			##	Devolve a soma dos produtos de componentes de matrizes correspondentes
+SUMSQ			= SOMARQUAD			##	Devolve a soma dos quadrados dos argumentos
+SUMX2MY2		= SOMAX2DY2			##	Devolve a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
+SUMX2PY2		= SOMAX2SY2			##	Devolve a soma da soma dos quadrados dos valores correspondentes em duas matrizes
+SUMXMY2			= SOMAXMY2			##	Devolve a soma dos quadrados da diferença dos valores correspondentes em duas matrizes
+TAN			= TAN				##	Devolve a tangente de um número
+TANH			= TANH				##	Devolve a tangente hiperbólica de um número
+TRUNC			= TRUNCAR			##	Trunca um número para um número inteiro
+
+
+##
+##	Statistical functions				Funções estatísticas
+##
+AVEDEV			= DESV.MÉDIO			##	Devolve a média aritmética dos desvios absolutos à média dos pontos de dados
+AVERAGE			= MÉDIA				##	Devolve a média dos respectivos argumentos
+AVERAGEA		= MÉDIAA			##	Devolve uma média dos respectivos argumentos, incluindo números, texto e valores lógicos
+AVERAGEIF		= MÉDIA.SE			##	Devolve a média aritmética de todas as células num intervalo que cumprem determinado critério
+AVERAGEIFS		= MÉDIA.SE.S			##	Devolve a média aritmética de todas as células que cumprem múltiplos critérios
+BETADIST		= DISTBETA			##	Devolve a função de distribuição cumulativa beta
+BETAINV			= BETA.ACUM.INV			##	Devolve o inverso da função de distribuição cumulativa relativamente a uma distribuição beta específica
+BINOMDIST		= DISTRBINOM			##	Devolve a probabilidade de distribuição binomial de termo individual
+CHIDIST			= DIST.CHI			##	Devolve a probabilidade unicaudal da distribuição qui-quadrada
+CHIINV			= INV.CHI			##	Devolve o inverso da probabilidade unicaudal da distribuição qui-quadrada
+CHITEST			= TESTE.CHI			##	Devolve o teste para independência
+CONFIDENCE		= INT.CONFIANÇA			##	Devolve o intervalo de confiança correspondente a uma média de população
+CORREL			= CORREL			##	Devolve o coeficiente de correlação entre dois conjuntos de dados
+COUNT			= CONTAR			##	Conta os números que existem na lista de argumentos
+COUNTA			= CONTAR.VAL			##	Conta os valores que existem na lista de argumentos
+COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células em branco num intervalo
+COUNTIF			= CONTAR.SE			##	Calcula o número de células num intervalo que corresponde aos critérios determinados
+COUNTIFS		= CONTAR.SE.S			##	Conta o número de células num intervalo que cumprem múltiplos critérios
+COVAR			= COVAR				##	Devolve a covariância, que é a média dos produtos de desvios de pares
+CRITBINOM		= CRIT.BINOM			##	Devolve o menor valor em que a distribuição binomial cumulativa é inferior ou igual a um valor de critério
+DEVSQ			= DESVQ				##	Devolve a soma dos quadrados dos desvios
+EXPONDIST		= DISTEXPON			##	Devolve a distribuição exponencial
+FDIST			= DISTF				##	Devolve a distribuição da probabilidade F
+FINV			= INVF				##	Devolve o inverso da distribuição da probabilidade F
+FISHER			= FISHER			##	Devolve a transformação Fisher
+FISHERINV		= FISHERINV			##	Devolve o inverso da transformação Fisher
+FORECAST		= PREVISÃO			##	Devolve um valor ao longo de uma tendência linear
+FREQUENCY		= FREQUÊNCIA			##	Devolve uma distribuição de frequência como uma matriz vertical
+FTEST			= TESTEF			##	Devolve o resultado de um teste F
+GAMMADIST		= DISTGAMA			##	Devolve a distribuição gama
+GAMMAINV		= INVGAMA			##	Devolve o inverso da distribuição gama cumulativa
+GAMMALN			= LNGAMA			##	Devolve o logaritmo natural da função gama, Γ(x)
+GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Devolve a média geométrica
+GROWTH			= CRESCIMENTO			##	Devolve valores ao longo de uma tendência exponencial
+HARMEAN			= MÉDIA.HARMÓNICA		##	Devolve a média harmónica
+HYPGEOMDIST		= DIST.HIPERGEOM		##	Devolve a distribuição hipergeométrica
+INTERCEPT		= INTERCEPTAR			##	Devolve a intercepção da linha de regressão linear
+KURT			= CURT				##	Devolve a curtose de um conjunto de dados
+LARGE			= MAIOR				##	Devolve o maior valor k-ésimo de um conjunto de dados
+LINEST			= PROJ.LIN			##	Devolve os parâmetros de uma tendência linear
+LOGEST			= PROJ.LOG			##	Devolve os parâmetros de uma tendência exponencial
+LOGINV			= INVLOG			##	Devolve o inverso da distribuição normal logarítmica
+LOGNORMDIST		= DIST.NORMALLOG		##	Devolve a distribuição normal logarítmica cumulativa
+MAX			= MÁXIMO			##	Devolve o valor máximo numa lista de argumentos
+MAXA			= MÁXIMOA			##	Devolve o valor máximo numa lista de argumentos, incluindo números, texto e valores lógicos
+MEDIAN			= MED				##	Devolve a mediana dos números indicados
+MIN			= MÍNIMO			##	Devolve o valor mínimo numa lista de argumentos
+MINA			= MÍNIMOA			##	Devolve o valor mínimo numa lista de argumentos, incluindo números, texto e valores lógicos
+MODE			= MODA				##	Devolve o valor mais comum num conjunto de dados
+NEGBINOMDIST		= DIST.BIN.NEG			##	Devolve a distribuição binominal negativa
+NORMDIST		= DIST.NORM			##	Devolve a distribuição cumulativa normal
+NORMINV			= INV.NORM			##	Devolve o inverso da distribuição cumulativa normal
+NORMSDIST		= DIST.NORMP			##	Devolve a distribuição cumulativa normal padrão
+NORMSINV		= INV.NORMP			##	Devolve o inverso da distribuição cumulativa normal padrão
+PEARSON			= PEARSON			##	Devolve o coeficiente de correlação momento/produto de Pearson
+PERCENTILE		= PERCENTIL			##	Devolve o k-ésimo percentil de valores num intervalo
+PERCENTRANK		= ORDEM.PERCENTUAL		##	Devolve a ordem percentual de um valor num conjunto de dados
+PERMUT			= PERMUTAR			##	Devolve o número de permutações de um determinado número de objectos
+POISSON			= POISSON			##	Devolve a distribuição de Poisson
+PROB			= PROB				##	Devolve a probabilidade dos valores num intervalo se encontrarem entre dois limites
+QUARTILE		= QUARTIL			##	Devolve o quartil de um conjunto de dados
+RANK			= ORDEM				##	Devolve a ordem de um número numa lista numérica
+RSQ			= RQUAD				##	Devolve o quadrado do coeficiente de correlação momento/produto de Pearson
+SKEW			= DISTORÇÃO			##	Devolve a distorção de uma distribuição
+SLOPE			= DECLIVE			##	Devolve o declive da linha de regressão linear
+SMALL			= MENOR				##	Devolve o menor valor de k-ésimo de um conjunto de dados
+STANDARDIZE		= NORMALIZAR			##	Devolve um valor normalizado
+STDEV			= DESVPAD			##	Calcula o desvio-padrão com base numa amostra
+STDEVA			= DESVPADA			##	Calcula o desvio-padrão com base numa amostra, incluindo números, texto e valores lógicos
+STDEVP			= DESVPADP			##	Calcula o desvio-padrão com base na população total
+STDEVPA			= DESVPADPA			##	Calcula o desvio-padrão com base na população total, incluindo números, texto e valores lógicos
+STEYX			= EPADYX			##	Devolve o erro-padrão do valor de y previsto para cada x na regressão
+TDIST			= DISTT				##	Devolve a distribuição t de Student
+TINV			= INVT				##	Devolve o inverso da distribuição t de Student
+TREND			= TENDÊNCIA			##	Devolve valores ao longo de uma tendência linear
+TRIMMEAN		= MÉDIA.INTERNA			##	Devolve a média do interior de um conjunto de dados
+TTEST			= TESTET			##	Devolve a probabilidade associada ao teste t de Student
+VAR			= VAR				##	Calcula a variância com base numa amostra
+VARA			= VARA				##	Calcula a variância com base numa amostra, incluindo números, texto e valores lógicos
+VARP			= VARP				##	Calcula a variância com base na população total
+VARPA			= VARPA				##	Calcula a variância com base na população total, incluindo números, texto e valores lógicos
+WEIBULL			= WEIBULL			##	Devolve a distribuição Weibull
+ZTEST			= TESTEZ			##	Devolve o valor de probabilidade unicaudal de um teste-z
+
+
+##
+##	Text functions					Funções de texto
+##
+ASC			= ASC				##	Altera letras ou katakana de largura total (byte duplo) numa cadeia de caracteres para caracteres de largura média (byte único)
+BAHTTEXT		= TEXTO.BAHT			##	Converte um número em texto, utilizando o formato monetário ß (baht)
+CHAR			= CARÁCT			##	Devolve o carácter especificado pelo número de código
+CLEAN			= LIMPAR			##	Remove do texto todos os caracteres não imprimíveis
+CODE			= CÓDIGO			##	Devolve um código numérico correspondente ao primeiro carácter numa cadeia de texto
+CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto num único item de texto
+DOLLAR			= MOEDA				##	Converte um número em texto, utilizando o formato monetário € (Euro)
+EXACT			= EXACTO			##	Verifica se dois valores de texto são idênticos
+FIND			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
+FINDB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
+FIXED			= FIXA				##	Formata um número como texto com um número fixo de decimais
+JIS			= JIS				##	Altera letras ou katakana de largura média (byte único) numa cadeia de caracteres para caracteres de largura total (byte duplo)
+LEFT			= ESQUERDA			##	Devolve os caracteres mais à esquerda de um valor de texto
+LEFTB			= ESQUERDAB			##	Devolve os caracteres mais à esquerda de um valor de texto
+LEN			= NÚM.CARACT			##	Devolve o número de caracteres de uma cadeia de texto
+LENB			= NÚM.CARACTB			##	Devolve o número de caracteres de uma cadeia de texto
+LOWER			= MINÚSCULAS			##	Converte o texto em minúsculas
+MID			= SEG.TEXTO			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
+MIDB			= SEG.TEXTOB			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
+PHONETIC		= FONÉTICA			##	Retira os caracteres fonéticos (furigana) de uma cadeia de texto
+PROPER			= INICIAL.MAIÚSCULA		##	Coloca em maiúsculas a primeira letra de cada palavra de um valor de texto
+REPLACE			= SUBSTITUIR			##	Substitui caracteres no texto
+REPLACEB		= SUBSTITUIRB			##	Substitui caracteres no texto
+REPT			= REPETIR			##	Repete texto um determinado número de vezes
+RIGHT			= DIREITA			##	Devolve os caracteres mais à direita de um valor de texto
+RIGHTB			= DIREITAB			##	Devolve os caracteres mais à direita de um valor de texto
+SEARCH			= PROCURAR			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
+SEARCHB			= PROCURARB			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
+SUBSTITUTE		= SUBST				##	Substitui texto novo por texto antigo numa cadeia de texto
+T			= T				##	Converte os respectivos argumentos em texto
+TEXT			= TEXTO				##	Formata um número e converte-o em texto
+TRIM			= COMPACTAR			##	Remove espaços do texto
+UPPER			= MAIÚSCULAS			##	Converte texto em maiúsculas
+VALUE			= VALOR				##	Converte um argumento de texto num número
diff --git a/lib/PHPExcel/locale/ru/config b/lib/PHPExcel/locale/ru/config
new file mode 100644
index 000000000..56e45bfda
--- /dev/null
+++ b/lib/PHPExcel/locale/ru/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= р
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #ПУСТО!
+DIV0	= #ДЕЛ/0!
+VALUE	= #ЗНАЧ!
+REF	= #ССЫЛ!
+NAME	= #ИМЯ?
+NUM	= #ЧИСЛО!
+NA	= #Н/Д
diff --git a/lib/PHPExcel/locale/ru/functions b/lib/PHPExcel/locale/ru/functions
new file mode 100644
index 000000000..5ff6d4fbf
--- /dev/null
+++ b/lib/PHPExcel/locale/ru/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
+##
+##
+
+
+##
+##	Add-in and Automation functions				Функции надстроек и автоматизации
+##
+GETPIVOTDATA		= ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ	##	Возвращает данные, хранящиеся в отчете сводной таблицы.
+
+
+##
+##	Cube functions						Функции Куб
+##
+CUBEKPIMEMBER		= КУБЭЛЕМЕНТКИП				##	Возвращает свойство ключевого индикатора производительности «(КИП)» и отображает имя «КИП» в ячейке. «КИП» представляет собой количественную величину, такую как ежемесячная валовая прибыль или ежеквартальная текучесть кадров, используемой для контроля эффективности работы организации.
+CUBEMEMBER		= КУБЭЛЕМЕНТ				##	Возвращает элемент или кортеж из куба. Используется для проверки существования элемента или кортежа в кубе.
+CUBEMEMBERPROPERTY	= КУБСВОЙСТВОЭЛЕМЕНТА			##	Возвращает значение свойства элемента из куба. Используется для проверки существования имени элемента в кубе и возвращает указанное свойство для этого элемента.
+CUBERANKEDMEMBER	= КУБПОРЭЛЕМЕНТ				##	Возвращает n-ый или ранжированный элемент в множество. Используется для возвращения одного или нескольких элементов в множество, например, лучшего продавца или 10 лучших студентов.
+CUBESET			= КУБМНОЖ				##	Определяет вычислительное множество элементов или кортежей, отправляя на сервер выражение, которое создает множество, а затем возвращает его в Microsoft Office Excel.
+CUBESETCOUNT		= КУБЧИСЛОЭЛМНОЖ			##	Возвращает число элементов множества.
+CUBEVALUE		= КУБЗНАЧЕНИЕ				##	Возвращает обобщенное значение из куба.
+
+
+##
+##	Database functions					Функции для работы с базами данных
+##
+DAVERAGE		= ДСРЗНАЧ				##	Возвращает среднее значение выбранных записей базы данных.
+DCOUNT			= БСЧЁТ					##	Подсчитывает количество числовых ячеек в базе данных.
+DCOUNTA			= БСЧЁТА				##	Подсчитывает количество непустых ячеек в базе данных.
+DGET			= БИЗВЛЕЧЬ				##	Извлекает из базы данных одну запись, удовлетворяющую заданному условию.
+DMAX			= ДМАКС					##	Возвращает максимальное значение среди выделенных записей базы данных.
+DMIN			= ДМИН					##	Возвращает минимальное значение среди выделенных записей базы данных.
+DPRODUCT		= БДПРОИЗВЕД				##	Перемножает значения определенного поля в записях базы данных, удовлетворяющих условию.
+DSTDEV			= ДСТАНДОТКЛ				##	Оценивает стандартное отклонение по выборке для выделенных записей базы данных.
+DSTDEVP			= ДСТАНДОТКЛП				##	Вычисляет стандартное отклонение по генеральной совокупности для выделенных записей базы данных
+DSUM			= БДСУММ				##	Суммирует числа в поле для записей базы данных, удовлетворяющих условию.
+DVAR			= БДДИСП				##	Оценивает дисперсию по выборке из выделенных записей базы данных
+DVARP			= БДДИСПП				##	Вычисляет дисперсию по генеральной совокупности для выделенных записей базы данных
+
+
+##
+##	Date and time functions					Функции даты и времени
+##
+DATE			= ДАТА					##	Возвращает заданную дату в числовом формате.
+DATEVALUE		= ДАТАЗНАЧ				##	Преобразует дату из текстового формата в числовой формат.
+DAY			= ДЕНЬ					##	Преобразует дату в числовом формате в день месяца.
+DAYS360			= ДНЕЙ360				##	Вычисляет количество дней между двумя датами на основе 360-дневного года.
+EDATE			= ДАТАМЕС				##	Возвращает дату в числовом формате, отстоящую на заданное число месяцев вперед или назад от начальной даты.
+EOMONTH			= КОНМЕСЯЦА				##	Возвращает дату в числовом формате для последнего дня месяца, отстоящего вперед или назад на заданное число месяцев.
+HOUR			= ЧАС					##	Преобразует дату в числовом формате в часы.
+MINUTE			= МИНУТЫ				##	Преобразует дату в числовом формате в минуты.
+MONTH			= МЕСЯЦ					##	Преобразует дату в числовом формате в месяцы.
+NETWORKDAYS		= ЧИСТРАБДНИ				##	Возвращает количество рабочих дней между двумя датами.
+NOW			= ТДАТА					##	Возвращает текущую дату и время в числовом формате.
+SECOND			= СЕКУНДЫ				##	Преобразует дату в числовом формате в секунды.
+TIME			= ВРЕМЯ					##	Возвращает заданное время в числовом формате.
+TIMEVALUE		= ВРЕМЗНАЧ				##	Преобразует время из текстового формата в числовой формат.
+TODAY			= СЕГОДНЯ				##	Возвращает текущую дату в числовом формате.
+WEEKDAY			= ДЕНЬНЕД				##	Преобразует дату в числовом формате в день недели.
+WEEKNUM			= НОМНЕДЕЛИ				##	Преобразует числовое представление в число, которое указывает, на какую неделю года приходится указанная дата.
+WORKDAY			= РАБДЕНЬ				##	Возвращает дату в числовом формате, отстоящую вперед или назад на заданное количество рабочих дней.
+YEAR			= ГОД					##	Преобразует дату в числовом формате в год.
+YEARFRAC		= ДОЛЯГОДА				##	Возвращает долю года, которую составляет количество дней между начальной и конечной датами.
+
+
+##
+##	Engineering functions					Инженерные функции
+##
+BESSELI			= БЕССЕЛЬ.I	 			##	Возвращает модифицированную функцию Бесселя In(x).
+BESSELJ			= БЕССЕЛЬ.J				##	Возвращает функцию Бесселя Jn(x).
+BESSELK			= БЕССЕЛЬ.K				##	Возвращает модифицированную функцию Бесселя Kn(x).
+BESSELY			= БЕССЕЛЬ.Y				##	Возвращает функцию Бесселя Yn(x).
+BIN2DEC			= ДВ.В.ДЕС				##	Преобразует двоичное число в десятичное.
+BIN2HEX			= ДВ.В.ШЕСТН				##	Преобразует двоичное число в шестнадцатеричное.
+BIN2OCT			= ДВ.В.ВОСЬМ				##	Преобразует двоичное число в восьмеричное.
+COMPLEX			= КОМПЛЕКСН				##	Преобразует коэффициенты при вещественной и мнимой частях комплексного числа в комплексное число.
+CONVERT			= ПРЕОБР				##	Преобразует число из одной системы единиц измерения в другую.
+DEC2BIN			= ДЕС.В.ДВ				##	Преобразует десятичное число в двоичное.
+DEC2HEX			= ДЕС.В.ШЕСТН				##	Преобразует десятичное число в шестнадцатеричное.
+DEC2OCT			= ДЕС.В.ВОСЬМ				##	Преобразует десятичное число в восьмеричное.
+DELTA			= ДЕЛЬТА				##	Проверяет равенство двух значений.
+ERF			= ФОШ					##	Возвращает функцию ошибки.
+ERFC			= ДФОШ					##	Возвращает дополнительную функцию ошибки.
+GESTEP			= ПОРОГ					##	Проверяет, не превышает ли данное число порогового значения.
+HEX2BIN			= ШЕСТН.В.ДВ				##	Преобразует шестнадцатеричное число в двоичное.
+HEX2DEC			= ШЕСТН.В.ДЕС				##	Преобразует шестнадцатеричное число в десятичное.
+HEX2OCT			= ШЕСТН.В.ВОСЬМ				##	Преобразует шестнадцатеричное число в восьмеричное.
+IMABS			= МНИМ.ABS				##	Возвращает абсолютную величину (модуль) комплексного числа.
+IMAGINARY		= МНИМ.ЧАСТЬ				##	Возвращает коэффициент при мнимой части комплексного числа.
+IMARGUMENT		= МНИМ.АРГУМЕНТ				##	Возвращает значение аргумента комплексного числа (тета) — угол, выраженный в радианах.
+IMCONJUGATE		= МНИМ.СОПРЯЖ				##	Возвращает комплексно-сопряженное комплексное число.
+IMCOS			= МНИМ.COS				##	Возвращает косинус комплексного числа.
+IMDIV			= МНИМ.ДЕЛ				##	Возвращает частное от деления двух комплексных чисел.
+IMEXP			= МНИМ.EXP				##	Возвращает экспоненту комплексного числа.
+IMLN			= МНИМ.LN				##	Возвращает натуральный логарифм комплексного числа.
+IMLOG10			= МНИМ.LOG10				##	Возвращает обычный (десятичный) логарифм комплексного числа.
+IMLOG2			= МНИМ.LOG2				##	Возвращает двоичный логарифм комплексного числа.
+IMPOWER			= МНИМ.СТЕПЕНЬ				##	Возвращает комплексное число, возведенное в целую степень.
+IMPRODUCT		= МНИМ.ПРОИЗВЕД				##	Возвращает произведение от 2 до 29 комплексных чисел.
+IMREAL			= МНИМ.ВЕЩ				##	Возвращает коэффициент при вещественной части комплексного числа.
+IMSIN			= МНИМ.SIN				##	Возвращает синус комплексного числа.
+IMSQRT			= МНИМ.КОРЕНЬ				##	Возвращает значение квадратного корня из комплексного числа.
+IMSUB			= МНИМ.РАЗН				##	Возвращает разность двух комплексных чисел.
+IMSUM			= МНИМ.СУММ				##	Возвращает сумму комплексных чисел.
+OCT2BIN			= ВОСЬМ.В.ДВ				##	Преобразует восьмеричное число в двоичное.
+OCT2DEC			= ВОСЬМ.В.ДЕС				##	Преобразует восьмеричное число в десятичное.
+OCT2HEX			= ВОСЬМ.В.ШЕСТН				##	Преобразует восьмеричное число в шестнадцатеричное.
+
+
+##
+##	Financial functions					Финансовые функции
+##
+ACCRINT			= НАКОПДОХОД				##	Возвращает накопленный процент по ценным бумагам с периодической выплатой процентов.
+ACCRINTM		= НАКОПДОХОДПОГАШ			##	Возвращает накопленный процент по ценным бумагам, проценты по которым выплачиваются в срок погашения.
+AMORDEGRC		= АМОРУМ				##	Возвращает величину амортизации для каждого периода, используя коэффициент амортизации.
+AMORLINC		= АМОРУВ				##	Возвращает величину амортизации для каждого периода.
+COUPDAYBS		= ДНЕЙКУПОНДО				##	Возвращает количество дней от начала действия купона до даты соглашения.
+COUPDAYS		= ДНЕЙКУПОН				##	Возвращает число дней в периоде купона, содержащем дату соглашения.
+COUPDAYSNC		= ДНЕЙКУПОНПОСЛЕ			##	Возвращает число дней от даты соглашения до срока следующего купона.
+COUPNCD			= ДАТАКУПОНПОСЛЕ			##	Возвращает следующую дату купона после даты соглашения.
+COUPNUM			= ЧИСЛКУПОН				##	Возвращает количество купонов, которые могут быть оплачены между датой соглашения и сроком вступления в силу.
+COUPPCD			= ДАТАКУПОНДО				##	Возвращает предыдущую дату купона перед датой соглашения.
+CUMIPMT			= ОБЩПЛАТ				##	Возвращает общую выплату, произведенную между двумя периодическими выплатами.
+CUMPRINC		= ОБЩДОХОД				##	Возвращает общую выплату по займу между двумя периодами.
+DB			= ФУО					##	Возвращает величину амортизации актива для заданного периода, рассчитанную методом фиксированного уменьшения остатка.
+DDB			= ДДОБ					##	Возвращает величину амортизации актива за данный период, используя метод двойного уменьшения остатка или иной явно указанный метод.
+DISC			= СКИДКА				##	Возвращает норму скидки для ценных бумаг.
+DOLLARDE		= РУБЛЬ.ДЕС				##	Преобразует цену в рублях, выраженную в виде дроби, в цену в рублях, выраженную десятичным числом.
+DOLLARFR		= РУБЛЬ.ДРОБЬ				##	Преобразует цену в рублях, выраженную десятичным числом, в цену в рублях, выраженную в виде дроби.
+DURATION		= ДЛИТ					##	Возвращает ежегодную продолжительность действия ценных бумаг с периодическими выплатами по процентам.
+EFFECT			= ЭФФЕКТ				##	Возвращает действующие ежегодные процентные ставки.
+FV			= БС					##	Возвращает будущую стоимость инвестиции.
+FVSCHEDULE		= БЗРАСПИС				##	Возвращает будущую стоимость первоначальной основной суммы после начисления ряда сложных процентов.
+INTRATE			= ИНОРМА				##	Возвращает процентную ставку для полностью инвестированных ценных бумаг.
+IPMT			= ПРПЛТ					##	Возвращает величину выплаты прибыли на вложения за данный период.
+IRR			= ВСД					##	Возвращает внутреннюю ставку доходности для ряда потоков денежных средств.
+ISPMT			= ПРОЦПЛАТ				##	Вычисляет выплаты за указанный период инвестиции.
+MDURATION		= МДЛИТ					##	Возвращает модифицированную длительность Маколея для ценных бумаг с предполагаемой номинальной стоимостью 100 рублей.
+MIRR			= МВСД					##	Возвращает внутреннюю ставку доходности, при которой положительные и отрицательные денежные потоки имеют разные значения ставки.
+NOMINAL			= НОМИНАЛ				##	Возвращает номинальную годовую процентную ставку.
+NPER			= КПЕР					##	Возвращает общее количество периодов выплаты для данного вклада.
+NPV			= ЧПС					##	Возвращает чистую приведенную стоимость инвестиции, основанной на серии периодических денежных потоков и ставке дисконтирования.
+ODDFPRICE		= ЦЕНАПЕРВНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным первым периодом.
+ODDFYIELD		= ДОХОДПЕРВНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным первым периодом.
+ODDLPRICE		= ЦЕНАПОСЛНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным последним периодом.
+ODDLYIELD		= ДОХОДПОСЛНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным последним периодом.
+PMT			= ПЛТ					##	Возвращает величину выплаты за один период аннуитета.
+PPMT			= ОСПЛТ					##	Возвращает величину выплат в погашение основной суммы по инвестиции за заданный период.
+PRICE			= ЦЕНА					##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг, по которым производится периодическая выплата процентов.
+PRICEDISC		= ЦЕНАСКИДКА				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, на которые сделана скидка.
+PRICEMAT		= ЦЕНАПОГАШ				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, проценты по которым выплачиваются в срок погашения.
+PV			= ПС					##	Возвращает приведенную (к текущему моменту) стоимость инвестиции.
+RATE			= СТАВКА				##	Возвращает процентную ставку по аннуитету за один период.
+RECEIVED		= ПОЛУЧЕНО				##	Возвращает сумму, полученную к сроку погашения полностью обеспеченных ценных бумаг.
+SLN			= АПЛ					##	Возвращает величину линейной амортизации актива за один период.
+SYD			= АСЧ					##	Возвращает величину амортизации актива за данный период, рассчитанную методом суммы годовых чисел.
+TBILLEQ			= РАВНОКЧЕК				##	Возвращает эквивалентный облигации доход по казначейскому чеку.
+TBILLPRICE		= ЦЕНАКЧЕК				##	Возвращает цену за 100 рублей нарицательной стоимости для казначейского чека.
+TBILLYIELD		= ДОХОДКЧЕК				##	Возвращает доход по казначейскому чеку.
+VDB			= ПУО					##	Возвращает величину амортизации актива для указанного или частичного периода при использовании метода сокращающегося баланса.
+XIRR			= ЧИСТВНДОХ				##	Возвращает внутреннюю ставку доходности для графика денежных потоков, которые не обязательно носят периодический характер.
+XNPV			= ЧИСТНЗ				##	Возвращает чистую приведенную стоимость для денежных потоков, которые не обязательно являются периодическими.
+YIELD			= ДОХОД					##	Возвращает доход от ценных бумаг, по которым производятся периодические выплаты процентов.
+YIELDDISC		= ДОХОДСКИДКА				##	Возвращает годовой доход по ценным бумагам, на которые сделана скидка (пример — казначейские чеки).
+YIELDMAT		= ДОХОДПОГАШ				##	Возвращает годовой доход от ценных бумаг, проценты по которым выплачиваются в срок погашения.
+
+
+##
+##	Information functions					Информационные функции
+##
+CELL			= ЯЧЕЙКА				##	Возвращает информацию о формате, расположении или содержимом ячейки.
+ERROR.TYPE		= ТИП.ОШИБКИ				##	Возвращает числовой код, соответствующий типу ошибки.
+INFO			= ИНФОРМ				##	Возвращает информацию о текущей операционной среде.
+ISBLANK			= ЕПУСТО				##	Возвращает значение ИСТИНА, если аргумент является ссылкой на пустую ячейку.
+ISERR			= ЕОШ					##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки, кроме #Н/Д.
+ISERROR			= ЕОШИБКА				##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки.
+ISEVEN			= ЕЧЁТН					##	Возвращает значение ИСТИНА, если значение аргумента является четным числом.
+ISLOGICAL		= ЕЛОГИЧ				##	Возвращает значение ИСТИНА, если аргумент ссылается на логическое значение.
+ISNA			= ЕНД					##	Возвращает значение ИСТИНА, если аргумент ссылается на значение ошибки #Н/Д.
+ISNONTEXT		= ЕНЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента не является текстом.
+ISNUMBER		= ЕЧИСЛО				##	Возвращает значение ИСТИНА, если аргумент ссылается на число.
+ISODD			= ЕНЕЧЁТ				##	Возвращает значение ИСТИНА, если значение аргумента является нечетным числом.
+ISREF			= ЕССЫЛКА				##	Возвращает значение ИСТИНА, если значение аргумента является ссылкой.
+ISTEXT			= ЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента является текстом.
+N			= Ч					##	Возвращает значение, преобразованное в число.
+NA			= НД					##	Возвращает значение ошибки #Н/Д.
+TYPE			= ТИП					##	Возвращает число, обозначающее тип данных значения.
+
+
+##
+##	Logical functions					Логические функции
+##
+AND			= И					##	Renvoie VRAI si tous ses arguments sont VRAI.
+FALSE			= ЛОЖЬ					##	Возвращает логическое значение ЛОЖЬ.
+IF			= ЕСЛИ					##	Выполняет проверку условия.
+IFERROR			= ЕСЛИОШИБКА				##	Возвращает введённое значение, если вычисление по формуле вызывает ошибку; в противном случае функция возвращает результат вычисления.
+NOT			= НЕ					##	Меняет логическое значение своего аргумента на противоположное.
+OR			= ИЛИ					##	Возвращает значение ИСТИНА, если хотя бы один аргумент имеет значение ИСТИНА.
+TRUE			= ИСТИНА				##	Возвращает логическое значение ИСТИНА.
+
+
+##
+##	Lookup and reference functions				Функции ссылки и поиска
+##
+ADDRESS			= АДРЕС					##	Возвращает ссылку на отдельную ячейку листа в виде текста.
+AREAS			= ОБЛАСТИ				##	Возвращает количество областей в ссылке.
+CHOOSE			= ВЫБОР					##	Выбирает значение из списка значений по индексу.
+COLUMN			= СТОЛБЕЦ				##	Возвращает номер столбца, на который указывает ссылка.
+COLUMNS			= ЧИСЛСТОЛБ				##	Возвращает количество столбцов в ссылке.
+HLOOKUP			= ГПР					##	Ищет в первой строке массива и возвращает значение отмеченной ячейки
+HYPERLINK		= ГИПЕРССЫЛКА				##	Создает ссылку, открывающую документ, который находится на сервере сети, в интрасети или в Интернете.
+INDEX			= ИНДЕКС				##	Использует индекс для выбора значения из ссылки или массива.
+INDIRECT		= ДВССЫЛ				##	Возвращает ссылку, заданную текстовым значением.
+LOOKUP			= ПРОСМОТР				##	Ищет значения в векторе или массиве.
+MATCH			= ПОИСКПОЗ				##	Ищет значения в ссылке или массиве.
+OFFSET			= СМЕЩ					##	Возвращает смещение ссылки относительно заданной ссылки.
+ROW			= СТРОКА				##	Возвращает номер строки, определяемой ссылкой.
+ROWS			= ЧСТРОК				##	Возвращает количество строк в ссылке.
+RTD			= ДРВ					##	Извлекает данные реального времени из программ, поддерживающих автоматизацию COM (Программирование объектов. Стандартное средство для работы с объектами некоторого приложения из другого приложения или средства разработки. Программирование объектов (ранее называемое программированием OLE) является функцией модели COM (Component Object Model, модель компонентных объектов).).
+TRANSPOSE		= ТРАНСП				##	Возвращает транспонированный массив.
+VLOOKUP			= ВПР					##	Ищет значение в первом столбце массива и возвращает значение из ячейки в найденной строке и указанном столбце.
+
+
+##
+##	Math and trigonometry functions				Математические и тригонометрические функции
+##
+ABS			= ABS					##	Возвращает модуль (абсолютную величину) числа.
+ACOS			= ACOS					##	Возвращает арккосинус числа.
+ACOSH			= ACOSH					##	Возвращает гиперболический арккосинус числа.
+ASIN			= ASIN					##	Возвращает арксинус числа.
+ASINH			= ASINH					##	Возвращает гиперболический арксинус числа.
+ATAN			= ATAN					##	Возвращает арктангенс числа.
+ATAN2			= ATAN2					##	Возвращает арктангенс для заданных координат x и y.
+ATANH			= ATANH					##	Возвращает гиперболический арктангенс числа.
+CEILING			= ОКРВВЕРХ				##	Округляет число до ближайшего целого или до ближайшего кратного указанному значению.
+COMBIN			= ЧИСЛКОМБ				##	Возвращает количество комбинаций для заданного числа объектов.
+COS			= COS					##	Возвращает косинус числа.
+COSH			= COSH					##	Возвращает гиперболический косинус числа.
+DEGREES			= ГРАДУСЫ				##	Преобразует радианы в градусы.
+EVEN			= ЧЁТН					##	Округляет число до ближайшего четного целого.
+EXP			= EXP					##	Возвращает число e, возведенное в указанную степень.
+FACT			= ФАКТР					##	Возвращает факториал числа.
+FACTDOUBLE		= ДВФАКТР				##	Возвращает двойной факториал числа.
+FLOOR			= ОКРВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
+GCD			= НОД					##	Возвращает наибольший общий делитель.
+INT			= ЦЕЛОЕ					##	Округляет число до ближайшего меньшего целого.
+LCM			= НОК					##	Возвращает наименьшее общее кратное.
+LN			= LN					##	Возвращает натуральный логарифм числа.
+LOG			= LOG					##	Возвращает логарифм числа по заданному основанию.
+LOG10			= LOG10					##	Возвращает десятичный логарифм числа.
+MDETERM			= МОПРЕД				##	Возвращает определитель матрицы массива.
+MINVERSE		= МОБР					##	Возвращает обратную матрицу массива.
+MMULT			= МУМНОЖ				##	Возвращает произведение матриц двух массивов.
+MOD			= ОСТАТ					##	Возвращает остаток от деления.
+MROUND			= ОКРУГЛТ				##	Возвращает число, округленное с требуемой точностью.
+MULTINOMIAL		= МУЛЬТИНОМ				##	Возвращает мультиномиальный коэффициент множества чисел.
+ODD			= НЕЧЁТ					##	Округляет число до ближайшего нечетного целого.
+PI			= ПИ					##	Возвращает число пи.
+POWER			= СТЕПЕНЬ				##	Возвращает результат возведения числа в степень.
+PRODUCT			= ПРОИЗВЕД				##	Возвращает произведение аргументов.
+QUOTIENT		= ЧАСТНОЕ				##	Возвращает целую часть частного при делении.
+RADIANS			= РАДИАНЫ				##	Преобразует градусы в радианы.
+RAND			= СЛЧИС					##	Возвращает случайное число в интервале от 0 до 1.
+RANDBETWEEN		= СЛУЧМЕЖДУ				##	Возвращает случайное число в интервале между двумя заданными числами.
+ROMAN			= РИМСКОЕ				##	Преобразует арабские цифры в римские в виде текста.
+ROUND			= ОКРУГЛ				##	Округляет число до указанного количества десятичных разрядов.
+ROUNDDOWN		= ОКРУГЛВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
+ROUNDUP			= ОКРУГЛВВЕРХ				##	Округляет число до ближайшего большего по модулю значения.
+SERIESSUM		= РЯД.СУММ				##	Возвращает сумму степенного ряда, вычисленную по формуле.
+SIGN			= ЗНАК					##	Возвращает знак числа.
+SIN			= SIN					##	Возвращает синус заданного угла.
+SINH			= SINH					##	Возвращает гиперболический синус числа.
+SQRT			= КОРЕНЬ				##	Возвращает положительное значение квадратного корня.
+SQRTPI			= КОРЕНЬПИ				##	Возвращает квадратный корень из значения выражения (число * ПИ).
+SUBTOTAL		= ПРОМЕЖУТОЧНЫЕ.ИТОГИ			##	Возвращает промежуточный итог в списке или базе данных.
+SUM			= СУММ					##	Суммирует аргументы.
+SUMIF			= СУММЕСЛИ				##	Суммирует ячейки, удовлетворяющие заданному условию.
+SUMIFS			= СУММЕСЛИМН				##	Суммирует диапазон ячеек, удовлетворяющих нескольким условиям. 
+SUMPRODUCT		= СУММПРОИЗВ				##	Возвращает сумму произведений соответствующих элементов массивов.
+SUMSQ			= СУММКВ				##	Возвращает сумму квадратов аргументов.
+SUMX2MY2		= СУММРАЗНКВ				##	Возвращает сумму разностей квадратов соответствующих значений в двух массивах.
+SUMX2PY2		= СУММСУММКВ				##	Возвращает сумму сумм квадратов соответствующих элементов двух массивов.
+SUMXMY2			= СУММКВРАЗН				##	Возвращает сумму квадратов разностей соответствующих значений в двух массивах.
+TAN			= TAN					##	Возвращает тангенс числа.
+TANH			= TANH					##	Возвращает гиперболический тангенс числа.
+TRUNC			= ОТБР					##	Отбрасывает дробную часть числа.
+
+
+##
+##	Statistical functions					Статистические функции
+##
+AVEDEV			= СРОТКЛ				##	Возвращает среднее арифметическое абсолютных значений отклонений точек данных от среднего.
+AVERAGE			= СРЗНАЧ				##	Возвращает среднее арифметическое аргументов.
+AVERAGEA		= СРЗНАЧА				##	Возвращает среднее арифметическое аргументов, включая числа, текст и логические значения.
+AVERAGEIF		= СРЗНАЧЕСЛИ 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек в диапазоне, которые удовлетворяют данному условию.
+AVERAGEIFS		= СРЗНАЧЕСЛИМН 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек, которые удовлетворяют нескольким условиям. 
+BETADIST		= БЕТАРАСП				##	Возвращает интегральную функцию бета-распределения.
+BETAINV			= БЕТАОБР				##	Возвращает обратную интегральную функцию указанного бета-распределения.
+BINOMDIST		= БИНОМРАСП				##	Возвращает отдельное значение биномиального распределения.
+CHIDIST			= ХИ2РАСП				##	Возвращает одностороннюю вероятность распределения хи-квадрат.
+CHIINV			= ХИ2ОБР				##	Возвращает обратное значение односторонней вероятности распределения хи-квадрат.
+CHITEST			= ХИ2ТЕСТ				##	Возвращает тест на независимость.
+CONFIDENCE		= ДОВЕРИТ				##	Возвращает доверительный интервал для среднего значения по генеральной совокупности.
+CORREL			= КОРРЕЛ				##	Возвращает коэффициент корреляции между двумя множествами данных.
+COUNT			= СЧЁТ					##	Подсчитывает количество чисел в списке аргументов.
+COUNTA			= СЧЁТЗ					##	Подсчитывает количество значений в списке аргументов.
+COUNTBLANK		= СЧИТАТЬПУСТОТЫ			##	Подсчитывает количество пустых ячеек в диапазоне
+COUNTIF			= СЧЁТЕСЛИ 				##	Подсчитывает количество ячеек в диапазоне, удовлетворяющих заданному условию
+COUNTIFS		= СЧЁТЕСЛИМН				##	Подсчитывает количество ячеек внутри диапазона, удовлетворяющих нескольким условиям.
+COVAR			= КОВАР					##	Возвращает ковариацию, среднее произведений парных отклонений
+CRITBINOM		= КРИТБИНОМ				##	Возвращает наименьшее значение, для которого интегральное биномиальное распределение меньше или равно заданному критерию.
+DEVSQ			= КВАДРОТКЛ				##	Возвращает сумму квадратов отклонений.
+EXPONDIST		= ЭКСПРАСП				##	Возвращает экспоненциальное распределение.
+FDIST			= FРАСП					##	Возвращает F-распределение вероятности.
+FINV			= FРАСПОБР				##	Возвращает обратное значение для F-распределения вероятности.
+FISHER			= ФИШЕР					##	Возвращает преобразование Фишера.
+FISHERINV		= ФИШЕРОБР				##	Возвращает обратное преобразование Фишера.
+FORECAST		= ПРЕДСКАЗ				##	Возвращает значение линейного тренда.
+FREQUENCY		= ЧАСТОТА				##	Возвращает распределение частот в виде вертикального массива.
+FTEST			= ФТЕСТ					##	Возвращает результат F-теста.
+GAMMADIST		= ГАММАРАСП				##	Возвращает гамма-распределение.
+GAMMAINV		= ГАММАОБР				##	Возвращает обратное гамма-распределение.
+GAMMALN			= ГАММАНЛОГ				##	Возвращает натуральный логарифм гамма функции, Γ(x).
+GEOMEAN			= СРГЕОМ				##	Возвращает среднее геометрическое.
+GROWTH			= РОСТ					##	Возвращает значения в соответствии с экспоненциальным трендом.
+HARMEAN			= СРГАРМ				##	Возвращает среднее гармоническое.
+HYPGEOMDIST		= ГИПЕРГЕОМЕТ				##	Возвращает гипергеометрическое распределение.
+INTERCEPT		= ОТРЕЗОК				##	Возвращает отрезок, отсекаемый на оси линией линейной регрессии.
+KURT			= ЭКСЦЕСС				##	Возвращает эксцесс множества данных.
+LARGE			= НАИБОЛЬШИЙ				##	Возвращает k-ое наибольшее значение в множестве данных.
+LINEST			= ЛИНЕЙН				##	Возвращает параметры линейного тренда.
+LOGEST			= ЛГРФПРИБЛ				##	Возвращает параметры экспоненциального тренда.
+LOGINV			= ЛОГНОРМОБР				##	Возвращает обратное логарифмическое нормальное распределение.
+LOGNORMDIST		= ЛОГНОРМРАСП				##	Возвращает интегральное логарифмическое нормальное распределение.
+MAX			= МАКС					##	Возвращает наибольшее значение в списке аргументов.
+MAXA			= МАКСА					##	Возвращает наибольшее значение в списке аргументов, включая числа, текст и логические значения.
+MEDIAN			= МЕДИАНА				##	Возвращает медиану заданных чисел.
+MIN			= МИН					##	Возвращает наименьшее значение в списке аргументов.
+MINA			= МИНА					##	Возвращает наименьшее значение в списке аргументов, включая числа, текст и логические значения.
+MODE			= МОДА					##	Возвращает значение моды множества данных.
+NEGBINOMDIST		= ОТРБИНОМРАСП				##	Возвращает отрицательное биномиальное распределение.
+NORMDIST		= НОРМРАСП				##	Возвращает нормальную функцию распределения.
+NORMINV			= НОРМОБР				##	Возвращает обратное нормальное распределение.
+NORMSDIST		= НОРМСТРАСП				##	Возвращает стандартное нормальное интегральное распределение.
+NORMSINV		= НОРМСТОБР				##	Возвращает обратное значение стандартного нормального распределения.
+PEARSON			= ПИРСОН				##	Возвращает коэффициент корреляции Пирсона.
+PERCENTILE		= ПЕРСЕНТИЛЬ				##	Возвращает k-ую персентиль для значений диапазона.
+PERCENTRANK		= ПРОЦЕНТРАНГ				##	Возвращает процентную норму значения в множестве данных.
+PERMUT			= ПЕРЕСТ				##	Возвращает количество перестановок для заданного числа объектов.
+POISSON			= ПУАССОН				##	Возвращает распределение Пуассона.
+PROB			= ВЕРОЯТНОСТЬ				##	Возвращает вероятность того, что значение из диапазона находится внутри заданных пределов.
+QUARTILE		= КВАРТИЛЬ				##	Возвращает квартиль множества данных.
+RANK			= РАНГ					##	Возвращает ранг числа в списке чисел.
+RSQ			= КВПИРСОН				##	Возвращает квадрат коэффициента корреляции Пирсона.
+SKEW			= СКОС					##	Возвращает асимметрию распределения.
+SLOPE			= НАКЛОН				##	Возвращает наклон линии линейной регрессии.
+SMALL			= НАИМЕНЬШИЙ				##	Возвращает k-ое наименьшее значение в множестве данных.
+STANDARDIZE		= НОРМАЛИЗАЦИЯ				##	Возвращает нормализованное значение.
+STDEV			= СТАНДОТКЛОН				##	Оценивает стандартное отклонение по выборке.
+STDEVA			= СТАНДОТКЛОНА				##	Оценивает стандартное отклонение по выборке, включая числа, текст и логические значения.
+STDEVP			= СТАНДОТКЛОНП				##	Вычисляет стандартное отклонение по генеральной совокупности.
+STDEVPA			= СТАНДОТКЛОНПА				##	Вычисляет стандартное отклонение по генеральной совокупности, включая числа, текст и логические значения.
+STEYX			= СТОШYX				##	Возвращает стандартную ошибку предсказанных значений y для каждого значения x в регрессии.
+TDIST			= СТЬЮДРАСП				##	Возвращает t-распределение Стьюдента.
+TINV			= СТЬЮДРАСПОБР				##	Возвращает обратное t-распределение Стьюдента.
+TREND			= ТЕНДЕНЦИЯ				##	Возвращает значения в соответствии с линейным трендом.
+TRIMMEAN		= УРЕЗСРЕДНЕЕ				##	Возвращает среднее внутренности множества данных.
+TTEST			= ТТЕСТ					##	Возвращает вероятность, соответствующую критерию Стьюдента.
+VAR			= ДИСП					##	Оценивает дисперсию по выборке.
+VARA			= ДИСПА					##	Оценивает дисперсию по выборке, включая числа, текст и логические значения.
+VARP			= ДИСПР					##	Вычисляет дисперсию для генеральной совокупности.
+VARPA			= ДИСПРА				##	Вычисляет дисперсию для генеральной совокупности, включая числа, текст и логические значения.
+WEIBULL			= ВЕЙБУЛЛ				##	Возвращает распределение Вейбулла.
+ZTEST			= ZТЕСТ					##	Возвращает двустороннее P-значение z-теста.
+
+
+##
+##	Text functions						Текстовые функции
+##
+ASC			= ASC					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полноширинные (двухбайтовые) знаки в полуширинные (однобайтовые).
+BAHTTEXT		= БАТТЕКСТ				##	Преобразует число в текст, используя денежный формат ß (БАТ).
+CHAR			= СИМВОЛ				##	Возвращает знак с заданным кодом.
+CLEAN			= ПЕЧСИМВ				##	Удаляет все непечатаемые знаки из текста.
+CODE			= КОДСИМВ				##	Возвращает числовой код первого знака в текстовой строке.
+CONCATENATE		= СЦЕПИТЬ				##	Объединяет несколько текстовых элементов в один.
+DOLLAR			= РУБЛЬ					##	Преобразует число в текст, используя денежный формат.
+EXACT			= СОВПАД				##	Проверяет идентичность двух текстовых значений.
+FIND			= НАЙТИ					##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
+FINDB			= НАЙТИБ				##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
+FIXED			= ФИКСИРОВАННЫЙ				##	Форматирует число и преобразует его в текст с заданным числом десятичных знаков.
+JIS			= JIS					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полуширинные (однобайтовые) знаки в текстовой строке в полноширинные (двухбайтовые).
+LEFT			= ЛЕВСИМВ				##	Возвращает крайние слева знаки текстового значения.
+LEFTB			= ЛЕВБ					##	Возвращает крайние слева знаки текстового значения.
+LEN			= ДЛСТР					##	Возвращает количество знаков в текстовой строке.
+LENB			= ДЛИНБ					##	Возвращает количество знаков в текстовой строке.
+LOWER			= СТРОЧН				##	Преобразует все буквы текста в строчные.
+MID			= ПСТР					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
+MIDB			= ПСТРБ					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
+PHONETIC		= PHONETIC				##	Извлекает фонетические (фуригана) знаки из текстовой строки.
+PROPER			= ПРОПНАЧ				##	Преобразует первую букву в каждом слове текста в прописную.
+REPLACE			= ЗАМЕНИТЬ				##	Заменяет знаки в тексте.
+REPLACEB		= ЗАМЕНИТЬБ				##	Заменяет знаки в тексте.
+REPT			= ПОВТОР				##	Повторяет текст заданное число раз.
+RIGHT			= ПРАВСИМВ				##	Возвращает крайние справа знаки текстовой строки.
+RIGHTB			= ПРАВБ					##	Возвращает крайние справа знаки текстовой строки.
+SEARCH			= ПОИСК					##	Ищет вхождения одного текстового значения в другом (без учета регистра).
+SEARCHB			= ПОИСКБ				##	Ищет вхождения одного текстового значения в другом (без учета регистра).
+SUBSTITUTE		= ПОДСТАВИТЬ				##	Заменяет в текстовой строке старый текст новым.
+T			= Т					##	Преобразует аргументы в текст.
+TEXT			= ТЕКСТ					##	Форматирует число и преобразует его в текст.
+TRIM			= СЖПРОБЕЛЫ				##	Удаляет из текста пробелы.
+UPPER			= ПРОПИСН				##	Преобразует все буквы текста в прописные.
+VALUE			= ЗНАЧЕН				##	Преобразует текстовый аргумент в число.
diff --git a/lib/PHPExcel/locale/sv/config b/lib/PHPExcel/locale/sv/config
new file mode 100644
index 000000000..726f77164
--- /dev/null
+++ b/lib/PHPExcel/locale/sv/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= kr
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #Skärning!
+DIV0	= #Division/0!
+VALUE	= #Värdefel!
+REF	= #Referens!
+NAME	= #Namn?
+NUM	= #Ogiltigt!
+NA	= #Saknas!
diff --git a/lib/PHPExcel/locale/sv/functions b/lib/PHPExcel/locale/sv/functions
new file mode 100644
index 000000000..73b2deb5e
--- /dev/null
+++ b/lib/PHPExcel/locale/sv/functions
@@ -0,0 +1,408 @@
+##
+##	Add-in and Automation functions			Tilläggs- och automatiseringsfunktioner
+##
+GETPIVOTDATA		= HÄMTA.PIVOTDATA		##	Returnerar data som lagrats i en pivottabellrapport
+
+
+##
+##	Cube functions					Kubfunktioner
+##
+CUBEKPIMEMBER		= KUBKPIMEDLEM			##	Returnerar namn, egenskap och mått för en KPI och visar namnet och egenskapen i cellen. En KPI, eller prestandaindikator, är ett kvantifierbart mått, t.ex. månatlig bruttovinst eller personalomsättning per kvartal, som används för att analysera ett företags resultat.
+CUBEMEMBER		= KUBMEDLEM			##	Returnerar en medlem eller ett par i en kubhierarki. Används för att verifiera att medlemmen eller paret finns i kuben.
+CUBEMEMBERPROPERTY	= KUBMEDLEMSEGENSKAP		##	Returnerar värdet för en medlemsegenskap i kuben. Används för att verifiera att ett medlemsnamn finns i kuben, samt för att returnera den angivna egenskapen för medlemmen.
+CUBERANKEDMEMBER	= KUBRANGORDNADMEDLEM		##	Returnerar den n:te, eller rangordnade, medlemmen i en uppsättning. Används för att returnera ett eller flera element i en uppsättning, till exempelvis den bästa försäljaren eller de tio bästa eleverna.
+CUBESET			= KUBINSTÄLLNING		##	Definierar en beräknad uppsättning medlemmar eller par genom att skicka ett bestämt uttryck till kuben på servern, som skapar uppsättningen och sedan returnerar den till Microsoft Office Excel.
+CUBESETCOUNT		= KUBINSTÄLLNINGANTAL		##	Returnerar antalet objekt i en uppsättning.
+CUBEVALUE		= KUBVÄRDE			##	Returnerar ett mängdvärde från en kub.
+
+
+##
+##	Database functions				Databasfunktioner
+##
+DAVERAGE		= DMEDEL			##	Returnerar medelvärdet av databasposterna
+DCOUNT			= DANTAL			##	Räknar antalet celler som innehåller tal i en databas
+DCOUNTA			= DANTALV			##	Räknar ifyllda celler i en databas
+DGET			= DHÄMTA			##	Hämtar en enstaka post från en databas som uppfyller de angivna villkoren
+DMAX			= DMAX				##	Returnerar det största värdet från databasposterna
+DMIN			= DMIN				##	Returnerar det minsta värdet från databasposterna
+DPRODUCT		= DPRODUKT			##	Multiplicerar värdena i ett visst fält i poster som uppfyller villkoret
+DSTDEV			= DSTDAV			##	Uppskattar standardavvikelsen baserat på ett urval av databasposterna
+DSTDEVP			= DSTDAVP			##	Beräknar standardavvikelsen utifrån hela populationen av valda databasposter
+DSUM			= DSUMMA			##	Summerar talen i kolumnfält i databasposter som uppfyller villkoret
+DVAR			= DVARIANS			##	Uppskattar variansen baserat på ett urval av databasposterna
+DVARP			= DVARIANSP			##	Beräknar variansen utifrån hela populationen av valda databasposter
+
+
+##
+##	Date and time functions				Tid- och datumfunktioner
+##
+DATE			= DATUM				##	Returnerar ett serienummer för ett visst datum
+DATEVALUE		= DATUMVÄRDE			##	Konverterar ett datum i textformat till ett serienummer
+DAY			= DAG				##	Konverterar ett serienummer till dag i månaden
+DAYS360			= DAGAR360			##	Beräknar antalet dagar mellan två datum baserat på ett 360-dagarsår
+EDATE			= EDATUM			##	Returnerar serienumret för ett datum som infaller ett visst antal månader före eller efter startdatumet
+EOMONTH			= SLUTMÅNAD			##	Returnerar serienumret för sista dagen i månaden ett visst antal månader tidigare eller senare
+HOUR			= TIMME				##	Konverterar ett serienummer till en timme
+MINUTE			= MINUT				##	Konverterar ett serienummer till en minut
+MONTH			= MÅNAD				##	Konverterar ett serienummer till en månad
+NETWORKDAYS		= NETTOARBETSDAGAR		##	Returnerar antalet hela arbetsdagar mellan två datum
+NOW			= NU				##	Returnerar serienumret för dagens datum och aktuell tid
+SECOND			= SEKUND			##	Konverterar ett serienummer till en sekund
+TIME			= KLOCKSLAG			##	Returnerar serienumret för en viss tid
+TIMEVALUE		= TIDVÄRDE			##	Konverterar en tid i textformat till ett serienummer
+TODAY			= IDAG				##	Returnerar serienumret för dagens datum
+WEEKDAY			= VECKODAG			##	Konverterar ett serienummer till en dag i veckan
+WEEKNUM			= VECKONR			##	Konverterar ett serienummer till ett veckonummer
+WORKDAY			= ARBETSDAGAR			##	Returnerar serienumret för ett datum ett visst antal arbetsdagar tidigare eller senare
+YEAR			= ÅR				##	Konverterar ett serienummer till ett år
+YEARFRAC		= ÅRDEL				##	Returnerar en del av ett år som representerar antalet hela dagar mellan start- och slutdatum
+
+
+##
+##	Engineering functions				Tekniska funktioner
+##
+BESSELI			= BESSELI			##	Returnerar den modifierade Bessel-funktionen In(x)
+BESSELJ			= BESSELJ			##	Returnerar Bessel-funktionen Jn(x)
+BESSELK			= BESSELK			##	Returnerar den modifierade Bessel-funktionen Kn(x)
+BESSELY			= BESSELY			##	Returnerar Bessel-funktionen Yn(x)
+BIN2DEC			= BIN.TILL.DEC			##	Omvandlar ett binärt tal till decimalt
+BIN2HEX			= BIN.TILL.HEX			##	Omvandlar ett binärt tal till hexadecimalt
+BIN2OCT			= BIN.TILL.OKT			##	Omvandlar ett binärt tal till oktalt
+COMPLEX			= KOMPLEX			##	Omvandlar reella och imaginära koefficienter till ett komplext tal
+CONVERT			= KONVERTERA			##	Omvandlar ett tal från ett måttsystem till ett annat
+DEC2BIN			= DEC.TILL.BIN			##	Omvandlar ett decimalt tal till binärt
+DEC2HEX			= DEC.TILL.HEX			##	Omvandlar ett decimalt tal till hexadecimalt
+DEC2OCT			= DEC.TILL.OKT			##	Omvandlar ett decimalt tal till oktalt
+DELTA			= DELTA				##	Testar om två värden är lika
+ERF			= FELF				##	Returnerar felfunktionen
+ERFC			= FELFK				##	Returnerar den komplementära felfunktionen
+GESTEP			= SLSTEG			##	Testar om ett tal är större än ett tröskelvärde
+HEX2BIN			= HEX.TILL.BIN			##	Omvandlar ett hexadecimalt tal till binärt
+HEX2DEC			= HEX.TILL.DEC			##	Omvandlar ett hexadecimalt tal till decimalt
+HEX2OCT			= HEX.TILL.OKT			##	Omvandlar ett hexadecimalt tal till oktalt
+IMABS			= IMABS				##	Returnerar absolutvärdet (modulus) för ett komplext tal
+IMAGINARY		= IMAGINÄR			##	Returnerar den imaginära koefficienten för ett komplext tal
+IMARGUMENT		= IMARGUMENT			##	Returnerar det komplexa talets argument, en vinkel uttryckt i radianer
+IMCONJUGATE		= IMKONJUGAT			##	Returnerar det komplexa talets konjugat
+IMCOS			= IMCOS				##	Returnerar cosinus för ett komplext tal
+IMDIV			= IMDIV				##	Returnerar kvoten för två komplexa tal
+IMEXP			= IMEUPPHÖJT			##	Returnerar exponenten för ett komplext tal
+IMLN			= IMLN				##	Returnerar den naturliga logaritmen för ett komplext tal
+IMLOG10			= IMLOG10			##	Returnerar 10-logaritmen för ett komplext tal
+IMLOG2			= IMLOG2			##	Returnerar 2-logaritmen för ett komplext tal
+IMPOWER			= IMUPPHÖJT			##	Returnerar ett komplext tal upphöjt till en exponent
+IMPRODUCT		= IMPRODUKT			##	Returnerar produkten av komplexa tal
+IMREAL			= IMREAL			##	Returnerar den reella koefficienten för ett komplext tal
+IMSIN			= IMSIN				##	Returnerar sinus för ett komplext tal
+IMSQRT			= IMROT				##	Returnerar kvadratroten av ett komplext tal
+IMSUB			= IMDIFF			##	Returnerar differensen mellan två komplexa tal
+IMSUM			= IMSUM				##	Returnerar summan av komplexa tal
+OCT2BIN			= OKT.TILL.BIN			##	Omvandlar ett oktalt tal till binärt
+OCT2DEC			= OKT.TILL.DEC			##	Omvandlar ett oktalt tal till decimalt
+OCT2HEX			= OKT.TILL.HEX			##	Omvandlar ett oktalt tal till hexadecimalt
+
+
+##
+##	Financial functions				Finansiella funktioner
+##
+ACCRINT			= UPPLRÄNTA			##	Returnerar den upplupna räntan för värdepapper med periodisk ränta
+ACCRINTM		= UPPLOBLRÄNTA			##	Returnerar den upplupna räntan för ett värdepapper som ger avkastning på förfallodagen
+AMORDEGRC		= AMORDEGRC			##	Returnerar avskrivningen för varje redovisningsperiod med hjälp av en avskrivningskoefficient
+AMORLINC		= AMORLINC			##	Returnerar avskrivningen för varje redovisningsperiod
+COUPDAYBS		= KUPDAGBB			##	Returnerar antal dagar från början av kupongperioden till likviddagen
+COUPDAYS		= KUPDAGARS			##	Returnerar antalet dagar i kupongperioden som innehåller betalningsdatumet
+COUPDAYSNC		= KUPDAGNK			##	Returnerar antalet dagar från betalningsdatumet till nästa kupongdatum
+COUPNCD			= KUPNKD			##	Returnerar nästa kupongdatum efter likviddagen
+COUPNUM			= KUPANT			##	Returnerar kuponger som förfaller till betalning mellan likviddagen och förfallodagen
+COUPPCD			= KUPFKD			##	Returnerar föregående kupongdatum före likviddagen
+CUMIPMT			= KUMRÄNTA			##	Returnerar den ackumulerade räntan som betalats mellan två perioder
+CUMPRINC		= KUMPRIS			##	Returnerar det ackumulerade kapitalbeloppet som betalats på ett lån mellan två perioder
+DB			= DB				##	Returnerar avskrivningen för en tillgång under en angiven tid enligt metoden för fast degressiv avskrivning
+DDB			= DEGAVSKR			##	Returnerar en tillgångs värdeminskning under en viss period med hjälp av dubbel degressiv avskrivning eller någon annan metod som du anger
+DISC			= DISK				##	Returnerar diskonteringsräntan för ett värdepapper
+DOLLARDE		= DECTAL			##	Omvandlar ett pris uttryckt som ett bråk till ett decimaltal
+DOLLARFR		= BRÅK				##	Omvandlar ett pris i kronor uttryckt som ett decimaltal till ett bråk
+DURATION		= LÖPTID			##	Returnerar den årliga löptiden för en säkerhet med periodiska räntebetalningar
+EFFECT			= EFFRÄNTA			##	Returnerar den årliga effektiva räntesatsen
+FV			= SLUTVÄRDE			##	Returnerar det framtida värdet på en investering
+FVSCHEDULE		= FÖRRÄNTNING			##	Returnerar det framtida värdet av ett begynnelsekapital beräknat på olika räntenivåer
+INTRATE			= ÅRSRÄNTA			##	Returnerar räntesatsen för ett betalt värdepapper
+IPMT			= RBETALNING			##	Returnerar räntedelen av en betalning för en given period
+IRR			= IR				##	Returnerar internräntan för en serie betalningar
+ISPMT			= RALÅN				##	Beräknar räntan som har betalats under en specifik betalningsperiod
+MDURATION		= MLÖPTID			##	Returnerar den modifierade Macauley-löptiden för ett värdepapper med det antagna nominella värdet 100 kr
+MIRR			= MODIR				##	Returnerar internräntan där positiva och negativa betalningar finansieras med olika räntor
+NOMINAL			= NOMRÄNTA			##	Returnerar den årliga nominella räntesatsen
+NPER			= PERIODER			##	Returnerar antalet perioder för en investering
+NPV			= NETNUVÄRDE			##	Returnerar nuvärdet av en serie periodiska betalningar vid en given diskonteringsränta
+ODDFPRICE		= UDDAFPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda första period
+ODDFYIELD		= UDDAFAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda första period
+ODDLPRICE		= UDDASPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda sista period
+ODDLYIELD		= UDDASAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda sista period
+PMT			= BETALNING			##	Returnerar den periodiska betalningen för en annuitet
+PPMT			= AMORT				##	Returnerar amorteringsdelen av en annuitetsbetalning för en given period
+PRICE			= PRIS				##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger periodisk ränta
+PRICEDISC		= PRISDISK			##	Returnerar priset per 100 kr nominellt värde för ett diskonterat värdepapper
+PRICEMAT		= PRISFÖRF			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger ränta på förfallodagen
+PV			= PV				##	Returnerar nuvärdet av en serie lika stora periodiska betalningar
+RATE			= RÄNTA				##	Returnerar räntesatsen per period i en annuitet
+RECEIVED		= BELOPP			##	Returnerar beloppet som utdelas på förfallodagen för ett betalat värdepapper
+SLN			= LINAVSKR			##	Returnerar den linjära avskrivningen för en tillgång under en period
+SYD			= ÅRSAVSKR			##	Returnerar den årliga avskrivningssumman för en tillgång under en angiven period
+TBILLEQ			= SSVXEKV			##	Returnerar avkastningen motsvarande en obligation för en statsskuldväxel
+TBILLPRICE		= SSVXPRIS			##	Returnerar priset per 100 kr nominellt värde för en statsskuldväxel
+TBILLYIELD		= SSVXRÄNTA			##	Returnerar avkastningen för en statsskuldväxel
+VDB			= VDEGRAVSKR			##	Returnerar avskrivningen för en tillgång under en angiven period (med degressiv avskrivning)
+XIRR			= XIRR				##	Returnerar internräntan för en serie betalningar som inte nödvändigtvis är periodiska
+XNPV			= XNUVÄRDE			##	Returnerar det nuvarande nettovärdet för en serie betalningar som inte nödvändigtvis är periodiska
+YIELD			= NOMAVK			##	Returnerar avkastningen för ett värdepapper som ger periodisk ränta
+YIELDDISC		= NOMAVKDISK			##	Returnerar den årliga avkastningen för diskonterade värdepapper, exempelvis en statsskuldväxel
+YIELDMAT		= NOMAVKFÖRF			##	Returnerar den årliga avkastningen för ett värdepapper som ger ränta på förfallodagen
+
+
+##
+##	Information functions				Informationsfunktioner
+##
+CELL			= CELL				##	Returnerar information om formatering, plats och innehåll i en cell
+ERROR.TYPE		= FEL.TYP			##	Returnerar ett tal som motsvarar ett felvärde
+INFO			= INFO				##	Returnerar information om operativsystemet
+ISBLANK			= ÄRREF				##	Returnerar SANT om värdet är tomt
+ISERR			= Ä				##	Returnerar SANT om värdet är ett felvärde annat än #SAKNAS!
+ISERROR			= ÄRFEL				##	Returnerar SANT om värdet är ett felvärde
+ISEVEN			= ÄRJÄMN			##	Returnerar SANT om talet är jämnt
+ISLOGICAL		= ÄREJTEXT			##	Returnerar SANT om värdet är ett logiskt värde
+ISNA			= ÄRLOGISK			##	Returnerar SANT om värdet är felvärdet #SAKNAS!
+ISNONTEXT		= ÄRSAKNAD			##	Returnerar SANT om värdet inte är text
+ISNUMBER		= ÄRTAL				##	Returnerar SANT om värdet är ett tal
+ISODD			= ÄRUDDA			##	Returnerar SANT om talet är udda
+ISREF			= ÄRTOM				##	Returnerar SANT om värdet är en referens
+ISTEXT			= ÄRTEXT			##	Returnerar SANT om värdet är text
+N			= N				##	Returnerar ett värde omvandlat till ett tal
+NA			= SAKNAS			##	Returnerar felvärdet #SAKNAS!
+TYPE			= VÄRDETYP			##	Returnerar ett tal som anger värdets datatyp
+
+
+##
+##	Logical functions				Logiska funktioner
+##
+AND			= OCH				##	Returnerar SANT om alla argument är sanna
+FALSE			= FALSKT			##	Returnerar det logiska värdet FALSKT
+IF			= OM				##	Anger vilket logiskt test som ska utföras
+IFERROR			= OMFEL				##	Returnerar ett värde som du anger om en formel utvärderar till ett fel; annars returneras resultatet av formeln
+NOT			= ICKE				##	Inverterar logiken för argumenten
+OR			= ELLER				##	Returnerar SANT om något argument är SANT
+TRUE			= SANT				##	Returnerar det logiska värdet SANT
+
+
+##
+##	Lookup and reference functions			Sök- och referensfunktioner
+##
+ADDRESS			= ADRESS			##	Returnerar en referens som text till en enstaka cell i ett kalkylblad
+AREAS			= OMRÅDEN			##	Returnerar antalet områden i en referens
+CHOOSE			= VÄLJ				##	Väljer ett värde i en lista över värden
+COLUMN			= KOLUMN			##	Returnerar kolumnnumret för en referens
+COLUMNS			= KOLUMNER			##	Returnerar antalet kolumner i en referens
+HLOOKUP			= LETAKOLUMN			##	Söker i den översta raden i en matris och returnerar värdet för angiven cell
+HYPERLINK		= HYPERLÄNK			##	Skapar en genväg eller ett hopp till ett dokument i nätverket, i ett intranät eller på Internet
+INDEX			= INDEX				##	Använder ett index för ett välja ett värde i en referens eller matris
+INDIRECT		= INDIREKT			##	Returnerar en referens som anges av ett textvärde
+LOOKUP			= LETAUPP			##	Letar upp värden i en vektor eller matris
+MATCH			= PASSA				##	Letar upp värden i en referens eller matris
+OFFSET			= FÖRSKJUTNING			##	Returnerar en referens förskjuten i förhållande till en given referens
+ROW			= RAD				##	Returnerar radnumret för en referens
+ROWS			= RADER				##	Returnerar antalet rader i en referens
+RTD			= RTD				##	Hämtar realtidsdata från ett program som stöder COM-automation (Automation: Ett sätt att arbeta med ett programs objekt från ett annat program eller utvecklingsverktyg. Detta kallades tidigare för OLE Automation, och är en branschstandard och ingår i Component Object Model (COM).)
+TRANSPOSE		= TRANSPONERA			##	Transponerar en matris
+VLOOKUP			= LETARAD			##	Letar i den första kolumnen i en matris och flyttar över raden för att returnera värdet för en cell
+
+
+##
+##	Math and trigonometry functions			Matematiska och trigonometriska funktioner
+##
+ABS			= ABS				##	Returnerar absolutvärdet av ett tal
+ACOS			= ARCCOS			##	Returnerar arcus cosinus för ett tal
+ACOSH			= ARCCOSH			##	Returnerar inverterad hyperbolisk cosinus för ett tal
+ASIN			= ARCSIN			##	Returnerar arcus cosinus för ett tal
+ASINH			= ARCSINH			##	Returnerar hyperbolisk arcus sinus för ett tal
+ATAN			= ARCTAN			##	Returnerar arcus tangens för ett tal
+ATAN2			= ARCTAN2			##	Returnerar arcus tangens för en x- och en y- koordinat
+ATANH			= ARCTANH			##	Returnerar hyperbolisk arcus tangens för ett tal
+CEILING			= RUNDA.UPP			##	Avrundar ett tal till närmaste heltal eller närmaste signifikanta multipel
+COMBIN			= KOMBIN			##	Returnerar antalet kombinationer för ett givet antal objekt
+COS			= COS				##	Returnerar cosinus för ett tal
+COSH			= COSH				##	Returnerar hyperboliskt cosinus för ett tal
+DEGREES			= GRADER			##	Omvandlar radianer till grader
+EVEN			= JÄMN				##	Avrundar ett tal uppåt till närmaste heltal
+EXP			= EXP				##	Returnerar e upphöjt till ett givet tal
+FACT			= FAKULTET			##	Returnerar fakulteten för ett tal
+FACTDOUBLE		= DUBBELFAKULTET		##	Returnerar dubbelfakulteten för ett tal
+FLOOR			= RUNDA.NED			##	Avrundar ett tal nedåt mot noll
+GCD			= SGD				##	Returnerar den största gemensamma nämnaren
+INT			= HELTAL			##	Avrundar ett tal nedåt till närmaste heltal
+LCM			= MGM				##	Returnerar den minsta gemensamma multipeln
+LN			= LN				##	Returnerar den naturliga logaritmen för ett tal
+LOG			= LOG				##	Returnerar logaritmen för ett tal för en given bas
+LOG10			= LOG10				##	Returnerar 10-logaritmen för ett tal
+MDETERM			= MDETERM			##	Returnerar matrisen som är avgörandet av en matris
+MINVERSE		= MINVERT			##	Returnerar matrisinversen av en matris
+MMULT			= MMULT				##	Returnerar matrisprodukten av två matriser
+MOD			= REST				##	Returnerar resten vid en division
+MROUND			= MAVRUNDA			##	Returnerar ett tal avrundat till en given multipel
+MULTINOMIAL		= MULTINOMIAL			##	Returnerar multinomialen för en uppsättning tal
+ODD			= UDDA				##	Avrundar ett tal uppåt till närmaste udda heltal
+PI			= PI				##	Returnerar värdet pi
+POWER			= UPPHÖJT.TILL			##	Returnerar resultatet av ett tal upphöjt till en exponent
+PRODUCT			= PRODUKT			##	Multiplicerar argumenten
+QUOTIENT		= KVOT				##	Returnerar heltalsdelen av en division
+RADIANS			= RADIANER			##	Omvandlar grader till radianer
+RAND			= SLUMP				##	Returnerar ett slumptal mellan 0 och 1
+RANDBETWEEN		= SLUMP.MELLAN			##	Returnerar ett slumptal mellan de tal som du anger
+ROMAN			= ROMERSK			##	Omvandlar vanliga (arabiska) siffror till romerska som text
+ROUND			= AVRUNDA			##	Avrundar ett tal till ett angivet antal siffror
+ROUNDDOWN		= AVRUNDA.NEDÅT			##	Avrundar ett tal nedåt mot noll
+ROUNDUP			= AVRUNDA.UPPÅT			##	Avrundar ett tal uppåt, från noll
+SERIESSUM		= SERIESUMMA			##	Returnerar summan av en potensserie baserat på formeln
+SIGN			= TECKEN			##	Returnerar tecknet för ett tal
+SIN			= SIN				##	Returnerar sinus för en given vinkel
+SINH			= SINH				##	Returnerar hyperbolisk sinus för ett tal
+SQRT			= ROT				##	Returnerar den positiva kvadratroten
+SQRTPI			= ROTPI				##	Returnerar kvadratroten för (tal * pi)
+SUBTOTAL		= DELSUMMA			##	Returnerar en delsumma i en lista eller databas
+SUM			= SUMMA				##	Summerar argumenten
+SUMIF			= SUMMA.OM			##	Summerar celler enligt ett angivet villkor
+SUMIFS			= SUMMA.OMF			##	Lägger till cellerna i ett område som uppfyller flera kriterier
+SUMPRODUCT		= PRODUKTSUMMA			##	Returnerar summan av produkterna i motsvarande matriskomponenter
+SUMSQ			= KVADRATSUMMA			##	Returnerar summan av argumentens kvadrater
+SUMX2MY2		= SUMMAX2MY2			##	Returnerar summan av differensen mellan kvadraterna för motsvarande värden i två matriser
+SUMX2PY2		= SUMMAX2PY2			##	Returnerar summan av summan av kvadraterna av motsvarande värden i två matriser
+SUMXMY2			= SUMMAXMY2			##	Returnerar summan av kvadraten av skillnaden mellan motsvarande värden i två matriser
+TAN			= TAN				##	Returnerar tangens för ett tal
+TANH			= TANH				##	Returnerar hyperbolisk tangens för ett tal
+TRUNC			= AVKORTA			##	Avkortar ett tal till ett heltal
+
+
+##
+##	Statistical functions				Statistiska funktioner
+##
+AVEDEV			= MEDELAVV			##	Returnerar medelvärdet för datapunkters absoluta avvikelse från deras medelvärde
+AVERAGE			= MEDEL				##	Returnerar medelvärdet av argumenten
+AVERAGEA		= AVERAGEA			##	Returnerar medelvärdet av argumenten, inklusive tal, text och logiska värden
+AVERAGEIF		= MEDELOM			##	Returnerar medelvärdet (aritmetiskt medelvärde) för alla celler i ett område som uppfyller ett givet kriterium
+AVERAGEIFS		= MEDELOMF			##	Returnerar medelvärdet (det aritmetiska medelvärdet) för alla celler som uppfyller flera villkor.
+BETADIST		= BETAFÖRD			##	Returnerar den kumulativa betafördelningsfunktionen
+BETAINV			= BETAINV			##	Returnerar inversen till den kumulativa fördelningsfunktionen för en viss betafördelning
+BINOMDIST		= BINOMFÖRD			##	Returnerar den individuella binomialfördelningen
+CHIDIST			= CHI2FÖRD			##	Returnerar den ensidiga sannolikheten av c2-fördelningen
+CHIINV			= CHI2INV			##	Returnerar inversen av chi2-fördelningen
+CHITEST			= CHI2TEST			##	Returnerar oberoendetesten
+CONFIDENCE		= KONFIDENS			##	Returnerar konfidensintervallet för en populations medelvärde
+CORREL			= KORREL			##	Returnerar korrelationskoefficienten mellan två datamängder
+COUNT			= ANTAL				##	Räknar hur många tal som finns bland argumenten
+COUNTA			= ANTALV			##	Räknar hur många värden som finns bland argumenten
+COUNTBLANK		= ANTAL.TOMMA			##	Räknar antalet tomma celler i ett område
+COUNTIF			= ANTAL.OM			##	Räknar antalet celler i ett område som uppfyller angivna villkor.
+COUNTIFS		= ANTAL.OMF			##	Räknar antalet celler i ett område som uppfyller flera villkor.
+COVAR			= KOVAR				##	Returnerar kovariansen, d.v.s. medelvärdet av produkterna för parade avvikelser
+CRITBINOM		= KRITBINOM			##	Returnerar det minsta värdet för vilket den kumulativa binomialfördelningen är mindre än eller lika med ett villkorsvärde
+DEVSQ			= KVADAVV			##	Returnerar summan av kvadrater på avvikelser
+EXPONDIST		= EXPONFÖRD			##	Returnerar exponentialfördelningen
+FDIST			= FFÖRD				##	Returnerar F-sannolikhetsfördelningen
+FINV			= FINV				##	Returnerar inversen till F-sannolikhetsfördelningen
+FISHER			= FISHER			##	Returnerar Fisher-transformationen
+FISHERINV		= FISHERINV			##	Returnerar inversen till Fisher-transformationen
+FORECAST		= PREDIKTION			##	Returnerar ett värde längs en linjär trendlinje
+FREQUENCY		= FREKVENS			##	Returnerar en frekvensfördelning som en lodrät matris
+FTEST			= FTEST				##	Returnerar resultatet av en F-test
+GAMMADIST		= GAMMAFÖRD			##	Returnerar gammafördelningen
+GAMMAINV		= GAMMAINV			##	Returnerar inversen till den kumulativa gammafördelningen
+GAMMALN			= GAMMALN			##	Returnerar den naturliga logaritmen för gammafunktionen, G(x)
+GEOMEAN			= GEOMEDEL			##	Returnerar det geometriska medelvärdet
+GROWTH			= EXPTREND			##	Returnerar värden längs en exponentiell trend
+HARMEAN			= HARMMEDEL			##	Returnerar det harmoniska medelvärdet
+HYPGEOMDIST		= HYPGEOMFÖRD			##	Returnerar den hypergeometriska fördelningen
+INTERCEPT		= SKÄRNINGSPUNKT		##	Returnerar skärningspunkten för en linjär regressionslinje
+KURT			= TOPPIGHET			##	Returnerar toppigheten av en mängd data
+LARGE			= STÖRSTA			##	Returnerar det n:te största värdet i en mängd data
+LINEST			= REGR				##	Returnerar parametrar till en linjär trendlinje
+LOGEST			= EXPREGR			##	Returnerar parametrarna i en exponentiell trend
+LOGINV			= LOGINV			##	Returnerar inversen till den lognormala fördelningen
+LOGNORMDIST		= LOGNORMFÖRD			##	Returnerar den kumulativa lognormala fördelningen
+MAX			= MAX				##	Returnerar det största värdet i en lista av argument
+MAXA			= MAXA				##	Returnerar det största värdet i en lista av argument, inklusive tal, text och logiska värden
+MEDIAN			= MEDIAN			##	Returnerar medianen för angivna tal
+MIN			= MIN				##	Returnerar det minsta värdet i en lista med argument
+MINA			= MINA				##	Returnerar det minsta värdet i en lista över argument, inklusive tal, text och logiska värden
+MODE			= TYPVÄRDE			##	Returnerar det vanligaste värdet i en datamängd
+NEGBINOMDIST		= NEGBINOMFÖRD			##	Returnerar den negativa binomialfördelningen
+NORMDIST		= NORMFÖRD			##	Returnerar den kumulativa normalfördelningen
+NORMINV			= NORMINV			##	Returnerar inversen till den kumulativa normalfördelningen
+NORMSDIST		= NORMSFÖRD			##	Returnerar den kumulativa standardnormalfördelningen
+NORMSINV		= NORMSINV			##	Returnerar inversen till den kumulativa standardnormalfördelningen
+PEARSON			= PEARSON			##	Returnerar korrelationskoefficienten till Pearsons momentprodukt
+PERCENTILE		= PERCENTIL			##	Returnerar den n:te percentilen av värden i ett område
+PERCENTRANK		= PROCENTRANG			##	Returnerar procentrangen för ett värde i en datamängd
+PERMUT			= PERMUT			##	Returnerar antal permutationer för ett givet antal objekt
+POISSON			= POISSON			##	Returnerar Poisson-fördelningen
+PROB			= SANNOLIKHET			##	Returnerar sannolikheten att värden i ett område ligger mellan två gränser
+QUARTILE		= KVARTIL			##	Returnerar kvartilen av en mängd data
+RANK			= RANG				##	Returnerar rangordningen för ett tal i en lista med tal
+RSQ			= RKV				##	Returnerar kvadraten av Pearsons produktmomentkorrelationskoefficient
+SKEW			= SNEDHET			##	Returnerar snedheten för en fördelning
+SLOPE			= LUTNING			##	Returnerar lutningen på en linjär regressionslinje
+SMALL			= MINSTA			##	Returnerar det n:te minsta värdet i en mängd data
+STANDARDIZE		= STANDARDISERA			##	Returnerar ett normaliserat värde
+STDEV			= STDAV				##	Uppskattar standardavvikelsen baserat på ett urval
+STDEVA			= STDEVA			##	Uppskattar standardavvikelsen baserat på ett urval, inklusive tal, text och logiska värden
+STDEVP			= STDAVP			##	Beräknar standardavvikelsen baserat på hela populationen
+STDEVPA			= STDEVPA			##	Beräknar standardavvikelsen baserat på hela populationen, inklusive tal, text och logiska värden
+STEYX			= STDFELYX			##	Returnerar standardfelet för ett förutspått y-värde för varje x-värde i regressionen
+TDIST			= TFÖRD				##	Returnerar Students t-fördelning
+TINV			= TINV				##	Returnerar inversen till Students t-fördelning
+TREND			= TREND				##	Returnerar värden längs en linjär trend
+TRIMMEAN		= TRIMMEDEL			##	Returnerar medelvärdet av mittpunkterna i en datamängd
+TTEST			= TTEST				##	Returnerar sannolikheten beräknad ur Students t-test
+VAR			= VARIANS			##	Uppskattar variansen baserat på ett urval
+VARA			= VARA				##	Uppskattar variansen baserat på ett urval, inklusive tal, text och logiska värden
+VARP			= VARIANSP			##	Beräknar variansen baserat på hela populationen
+VARPA			= VARPA				##	Beräknar variansen baserat på hela populationen, inklusive tal, text och logiska värden
+WEIBULL			= WEIBULL			##	Returnerar Weibull-fördelningen
+ZTEST			= ZTEST				##	Returnerar det ensidiga sannolikhetsvärdet av ett z-test
+
+
+##
+##	Text functions					Textfunktioner
+##
+ASC			= ASC				##	Ändrar helbredds (dubbel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med halvt breddsteg (enkel byte)
+BAHTTEXT		= BAHTTEXT			##	Omvandlar ett tal till text med valutaformatet ß (baht)
+CHAR			= TECKENKOD			##	Returnerar tecknet som anges av kod
+CLEAN			= STÄDA				##	Tar bort alla icke utskrivbara tecken i en text
+CODE			= KOD				##	Returnerar en numerisk kod för det första tecknet i en textsträng
+CONCATENATE		= SAMMANFOGA			##	Sammanfogar flera textdelar till en textsträng
+DOLLAR			= VALUTA			##	Omvandlar ett tal till text med valutaformat
+EXACT			= EXAKT				##	Kontrollerar om två textvärden är identiska
+FIND			= HITTA				##	Hittar en text i en annan (skiljer på gemener och versaler)
+FINDB			= HITTAB			##	Hittar en text i en annan (skiljer på gemener och versaler)
+FIXED			= FASTTAL			##	Formaterar ett tal som text med ett fast antal decimaler
+JIS			= JIS				##	Ändrar halvbredds (enkel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med helt breddsteg (dubbel byte)
+LEFT			= VÄNSTER			##	Returnerar tecken längst till vänster i en sträng
+LEFTB			= VÄNSTERB			##	Returnerar tecken längst till vänster i en sträng
+LEN			= LÄNGD				##	Returnerar antalet tecken i en textsträng
+LENB			= LÄNGDB			##	Returnerar antalet tecken i en textsträng
+LOWER			= GEMENER			##	Omvandlar text till gemener
+MID			= EXTEXT			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
+MIDB			= EXTEXTB			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
+PHONETIC		= PHONETIC			##	Returnerar de fonetiska (furigana) tecknen i en textsträng
+PROPER			= INITIAL			##	Ändrar första bokstaven i varje ord i ett textvärde till versal
+REPLACE			= ERSÄTT			##	Ersätter tecken i text
+REPLACEB		= ERSÄTTB			##	Ersätter tecken i text
+REPT			= REP				##	Upprepar en text ett bestämt antal gånger
+RIGHT			= HÖGER				##	Returnerar tecken längst till höger i en sträng
+RIGHTB			= HÖGERB			##	Returnerar tecken längst till höger i en sträng
+SEARCH			= SÖK				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
+SEARCHB			= SÖKB				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
+SUBSTITUTE		= BYT.UT			##	Ersätter gammal text med ny text i en textsträng
+T			= T				##	Omvandlar argumenten till text
+TEXT			= TEXT				##	Formaterar ett tal och omvandlar det till text
+TRIM			= RENSA				##	Tar bort blanksteg från text
+UPPER			= VERSALER			##	Omvandlar text till versaler
+VALUE			= TEXTNUM			##	Omvandlar ett textargument till ett tal
diff --git a/lib/PHPExcel/locale/tr/config b/lib/PHPExcel/locale/tr/config
new file mode 100644
index 000000000..b69d4257a
--- /dev/null
+++ b/lib/PHPExcel/locale/tr/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= YTL
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #BOŞ!
+DIV0	= #SAYI/0!
+VALUE	= #DEĞER!
+REF	= #BAŞV!
+NAME	= #AD?
+NUM	= #SAYI!
+NA	= #YOK
diff --git a/lib/PHPExcel/locale/tr/functions b/lib/PHPExcel/locale/tr/functions
new file mode 100644
index 000000000..45d7df1fe
--- /dev/null
+++ b/lib/PHPExcel/locale/tr/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2013 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    ##VERSION##, ##DATE##
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Eklenti ve Otomasyon fonksiyonları
+##
+GETPIVOTDATA		= ÖZETVERİAL	##	Bir Özet Tablo raporunda saklanan verileri verir.
+
+
+##
+##	Cube functions					Küp işlevleri
+##
+CUBEKPIMEMBER		= KÜPKPIÜYE			##	Kilit performans göstergesi (KPI-Key Performance Indicator) adını, özelliğini ve ölçüsünü verir ve hücredeki ad ve özelliği gösterir. KPI, bir kurumun performansını izlemek için kullanılan aylık brüt kâr ya da üç aylık çalışan giriş çıkışları gibi ölçülebilen bir birimdir.
+CUBEMEMBER			= KÜPÜYE			##	Bir küp hiyerarşisinde bir üyeyi veya kaydı verir. Üye veya kaydın küpte varolduğunu doğrulamak için kullanılır.
+CUBEMEMBERPROPERTY	= KÜPÜYEÖZELLİĞİ	##	Bir küpte bir üyenin özelliğinin değerini verir. Küp içinde üye adının varlığını doğrulamak ve bu üyenin belli özelliklerini getirmek için kullanılır.
+CUBERANKEDMEMBER	= KÜPÜYESIRASI 		##	Bir küme içindeki üyenin derecesini veya kaçıncı olduğunu verir. En iyi satış elemanı, veya en iyi on öğrenci gibi bir kümedeki bir veya daha fazla öğeyi getirmek için kullanılır.
+CUBESET				= KÜPKÜME			##	Kümeyi oluşturan ve ardından bu kümeyi Microsoft Office Excel'e getiren sunucudaki küpe küme ifadelerini göndererek hesaplanan üye veya kayıt kümesini tanımlar.
+CUBESETCOUNT		= KÜPKÜMESAY		##	Bir kümedeki öğelerin sayısını getirir.
+CUBEVALUE			= KÜPDEĞER 			##	Bir küpten toplam değeri getirir.
+
+
+##
+##	Database functions				Veritabanı işlevleri
+##
+DAVERAGE		= VSEÇORT			##	Seçili veritabanı girdilerinin ortalamasını verir.
+DCOUNT			= VSEÇSAY			##	Veritabanında sayı içeren hücre sayısını hesaplar.
+DCOUNTA			= VSEÇSAYDOLU		##	Veritabanındaki boş olmayan hücreleri sayar.
+DGET			= VAL				##	Veritabanından, belirtilen ölçütlerle eşleşen tek bir rapor çıkarır.
+DMAX			= VSEÇMAK			##	Seçili veritabanı girişlerinin en yüksek değerini verir.
+DMIN			= VSEÇMİN			##	Seçili veritabanı girişlerinin en düşük değerini verir.
+DPRODUCT		= VSEÇÇARP			##	Kayıtların belli bir alanında bulunan, bir veritabanındaki ölçütlerle eşleşen değerleri çarpar.
+DSTDEV			= VSEÇSTDSAPMA		##	Seçili veritabanı girişlerinden oluşan bir örneğe dayanarak, standart sapmayı tahmin eder.
+DSTDEVP			= VSEÇSTDSAPMAS		##	Standart sapmayı, seçili veritabanı girişlerinin tüm popülasyonunu esas alarak hesaplar.
+DSUM			= VSEÇTOPLA			##	Kayıtların alan sütununda bulunan, ölçütle eşleşen sayıları toplar.
+DVAR			= VSEÇVAR			##	Seçili veritabanı girişlerinden oluşan bir örneği esas alarak farkı tahmin eder.
+DVARP			= VSEÇVARS			##	Seçili veritabanı girişlerinin tüm popülasyonunu esas alarak farkı hesaplar.
+
+
+##
+##	Date and time functions				Tarih ve saat işlevleri
+##
+DATE			= TARİH				##	Belirli bir tarihin seri numarasını verir.
+DATEVALUE		= TARİHSAYISI		##	Metin biçimindeki bir tarihi seri numarasına dönüştürür.
+DAY				= GÜN				##	Seri numarasını, ayın bir gününe dönüştürür.
+DAYS360			= GÜN360			##	İki tarih arasındaki gün sayısını, 360 günlük yılı esas alarak hesaplar.
+EDATE			= SERİTARİH			##	Başlangıç tarihinden itibaren, belirtilen ay sayısından önce veya sonraki tarihin seri numarasını verir.
+EOMONTH			= SERİAY			##	Belirtilen sayıda ay önce veya sonraki ayın son gününün seri numarasını verir.
+HOUR			= SAAT				##	Bir seri numarasını saate dönüştürür.
+MINUTE			= DAKİKA			##	Bir seri numarasını dakikaya dönüştürür.
+MONTH			= AY				##	Bir seri numarasını aya dönüştürür.
+NETWORKDAYS		= TAMİŞGÜNÜ			##	İki tarih arasındaki tam çalışma günlerinin sayısını verir.
+NOW				= ŞİMDİ				##	Geçerli tarihin ve saatin seri numarasını verir.
+SECOND			= SANİYE			##	Bir seri numarasını saniyeye dönüştürür.
+TIME			= ZAMAN				##	Belirli bir zamanın seri numarasını verir.
+TIMEVALUE		= ZAMANSAYISI		##	Metin biçimindeki zamanı seri numarasına dönüştürür.
+TODAY			= BUGÜN				##	Bugünün tarihini seri numarasına dönüştürür.
+WEEKDAY			= HAFTANINGÜNÜ		##	Bir seri numarasını, haftanın gününe dönüştürür.
+WEEKNUM			= HAFTASAY			##	Dizisel değerini, haftanın yıl içinde bulunduğu konumu sayısal olarak gösteren sayıya dönüştürür.
+WORKDAY			= İŞGÜNÜ			##	Belirtilen sayıda çalışma günü öncesinin ya da sonrasının tarihinin seri numarasını verir.
+YEAR			= YIL				##	Bir seri numarasını yıla dönüştürür.
+YEARFRAC		= YILORAN			##	Başlangıç_tarihi ve bitiş_tarihi arasındaki tam günleri gösteren yıl kesrini verir.
+
+
+##
+##	Engineering functions				Mühendislik işlevleri
+##
+BESSELI			= BESSELI			##	Değiştirilmiş Bessel fonksiyonu In(x)'i verir.
+BESSELJ			= BESSELJ			##	Bessel fonksiyonu Jn(x)'i verir.
+BESSELK			= BESSELK			##	Değiştirilmiş Bessel fonksiyonu Kn(x)'i verir.
+BESSELY			= BESSELY			##	Bessel fonksiyonu Yn(x)'i verir.
+BIN2DEC			= BIN2DEC			##	İkili bir sayıyı, ondalık sayıya dönüştürür.
+BIN2HEX			= BIN2HEX			##	İkili bir sayıyı, onaltılıya dönüştürür.
+BIN2OCT			= BIN2OCT			##	İkili bir sayıyı, sekizliye dönüştürür.
+COMPLEX			= KARMAŞIK			##	Gerçek ve sanal katsayıları, karmaşık sayıya dönüştürür.
+CONVERT			= ÇEVİR				##	Bir sayıyı, bir ölçüm sisteminden bir başka ölçüm sistemine dönüştürür.
+DEC2BIN			= DEC2BIN			##	Ondalık bir sayıyı, ikiliye dönüştürür.
+DEC2HEX			= DEC2HEX			##	Ondalık bir sayıyı, onaltılıya dönüştürür.
+DEC2OCT			= DEC2OCT			##	Ondalık bir sayıyı sekizliğe dönüştürür.
+DELTA			= DELTA				##	İki değerin eşit olup olmadığını sınar.
+ERF				= HATAİŞLEV			##	Hata işlevini verir.
+ERFC			= TÜMHATAİŞLEV		##	Tümleyici hata işlevini verir.
+GESTEP			= BESINIR			##	Bir sayının eşik değerinden büyük olup olmadığını sınar.
+HEX2BIN			= HEX2BIN			##	Onaltılı bir sayıyı ikiliye dönüştürür.
+HEX2DEC			= HEX2DEC			##	Onaltılı bir sayıyı ondalığa dönüştürür.
+HEX2OCT			= HEX2OCT			##	Onaltılı bir sayıyı sekizliğe dönüştürür.
+IMABS			= SANMUTLAK			##	Karmaşık bir sayının mutlak değerini (modül) verir.
+IMAGINARY		= SANAL				##	Karmaşık bir sayının sanal katsayısını verir.
+IMARGUMENT		= SANBAĞ_DEĞİŞKEN	##	Radyanlarla belirtilen bir açı olan teta bağımsız değişkenini verir.
+IMCONJUGATE		= SANEŞLENEK		##	Karmaşık bir sayının karmaşık eşleniğini verir.
+IMCOS			= SANCOS			##	Karmaşık bir sayının kosinüsünü verir.
+IMDIV			= SANBÖL			##	İki karmaşık sayının bölümünü verir.
+IMEXP			= SANÜS				##	Karmaşık bir sayının üssünü verir.
+IMLN			= SANLN				##	Karmaşık bir sayının doğal logaritmasını verir.
+IMLOG10			= SANLOG10			##	Karmaşık bir sayının, 10 tabanında logaritmasını verir.
+IMLOG2			= SANLOG2			##	Karmaşık bir sayının 2 tabanında logaritmasını verir.
+IMPOWER			= SANÜSSÜ			##	Karmaşık bir sayıyı, bir tamsayı üssüne yükseltilmiş olarak verir.
+IMPRODUCT		= SANÇARP			##	Karmaşık sayıların çarpımını verir.
+IMREAL			= SANGERÇEK			##	Karmaşık bir sayının, gerçek katsayısını verir.
+IMSIN			= SANSIN			##	Karmaşık bir sayının sinüsünü verir.
+IMSQRT			= SANKAREKÖK		##	Karmaşık bir sayının karekökünü verir.
+IMSUB			= SANÇIKAR			##	İki karmaşık sayının farkını verir.
+IMSUM			= SANTOPLA			##	Karmaşık sayıların toplamını verir.
+OCT2BIN			= OCT2BIN			##	Sekizli bir sayıyı ikiliye dönüştürür.
+OCT2DEC			= OCT2DEC			##	Sekizli bir sayıyı ondalığa dönüştürür.
+OCT2HEX			= OCT2HEX			##	Sekizli bir sayıyı onaltılıya dönüştürür.
+
+
+##
+##	Financial functions				Finansal fonksiyonlar
+##
+ACCRINT			= GERÇEKFAİZ		##	Dönemsel faiz ödeyen hisse senedine ilişkin tahakkuk eden faizi getirir.
+ACCRINTM		= GERÇEKFAİZV		##	Vadesinde ödeme yapan bir tahvilin tahakkuk etmiş faizini verir.
+AMORDEGRC		= AMORDEGRC			##	Yıpranma katsayısı kullanarak her hesap döneminin değer kaybını verir.
+AMORLINC		= AMORLINC			##	Her hesap dönemi içindeki yıpranmayı verir.
+COUPDAYBS		= KUPONGÜNBD		##	Kupon süresinin başlangıcından alış tarihine kadar olan süredeki gün sayısını verir.
+COUPDAYS		= KUPONGÜN			##	Kupon süresindeki, gün sayısını, alış tarihini de içermek üzere, verir.
+COUPDAYSNC		= KUPONGÜNDSK		##	Alış tarihinden bir sonraki kupon tarihine kadar olan gün sayısını verir.
+COUPNCD			= KUPONGÜNSKT		##	Alış tarihinden bir sonraki kupon tarihini verir.
+COUPNUM			= KUPONSAYI			##	Alış tarihiyle vade tarihi arasında ödenecek kuponların sayısını verir.
+COUPPCD			= KUPONGÜNÖKT		##	Alış tarihinden bir önceki kupon tarihini verir.
+CUMIPMT			= AİÇVERİMORANI		##	İki dönem arasında ödenen kümülatif faizi verir.
+CUMPRINC		= ANA_PARA_ÖDEMESİ	##	İki dönem arasında bir borç üzerine ödenen birikimli temeli verir.
+DB				= AZALANBAKİYE		##	Bir malın belirtilen bir süre içindeki yıpranmasını, sabit azalan bakiye yöntemini kullanarak verir.
+DDB				= ÇİFTAZALANBAKİYE	##	Bir malın belirtilen bir süre içindeki yıpranmasını, çift azalan bakiye yöntemi ya da sizin belirttiğiniz başka bir yöntemi kullanarak verir.
+DISC			= İNDİRİM			##	Bir tahvilin indirim oranını verir.
+DOLLARDE		= LİRAON			##	Kesir olarak tanımlanmış lira fiyatını, ondalık sayı olarak tanımlanmış lira fiyatına dönüştürür.
+DOLLARFR		= LİRAKES			##	Ondalık sayı olarak tanımlanmış lira fiyatını, kesir olarak tanımlanmış lira fiyatına dönüştürür.
+DURATION		= SÜRE				##	Belli aralıklarla faiz ödemesi yapan bir tahvilin yıllık süresini verir.
+EFFECT			= ETKİN				##	Efektif yıllık faiz oranını verir.
+FV				= ANBD				##	Bir yatırımın gelecekteki değerini verir.
+FVSCHEDULE		= GDPROGRAM			##	Bir seri birleşik faiz oranı uyguladıktan sonra, bir başlangıçtaki anaparanın gelecekteki değerini verir.
+INTRATE			= FAİZORANI			##	Tam olarak yatırım yapılmış bir tahvilin faiz oranını verir.
+IPMT			= FAİZTUTARI		##	Bir yatırımın verilen bir süre için faiz ödemesini verir.
+IRR				= İÇ_VERİM_ORANI	##	Bir para akışı serisi için, iç verim oranını verir.
+ISPMT			= ISPMT				##	Yatırımın belirli bir dönemi boyunca ödenen faizi hesaplar.
+MDURATION		= MSÜRE				##	Varsayılan par değeri 10.000.000 lira olan bir tahvil için Macauley değiştirilmiş süreyi verir.
+MIRR			= D_İÇ_VERİM_ORANI	##	Pozitif ve negatif para akışlarının farklı oranlarda finanse edildiği durumlarda, iç verim oranını verir.
+NOMINAL			= NOMİNAL			##	Yıllık nominal faiz oranını verir.
+NPER			= DÖNEM_SAYISI		##	Bir yatırımın dönem sayısını verir.
+NPV				= NBD				##	Bir yatırımın bugünkü net değerini, bir dönemsel para akışları serisine ve bir indirim oranına bağlı olarak verir.
+ODDFPRICE		= TEKYDEĞER			##	Tek bir ilk dönemi olan bir tahvilin değerini, her 100.000.000 lirada bir verir.
+ODDFYIELD		= TEKYÖDEME			##	Tek bir ilk dönemi olan bir tahvilin ödemesini verir.
+ODDLPRICE		= TEKSDEĞER			##	Tek bir son dönemi olan bir tahvilin fiyatını her 10.000.000 lirada bir verir.
+ODDLYIELD		= TEKSÖDEME			##	Tek bir son dönemi olan bir tahvilin ödemesini verir.
+PMT				= DEVRESEL_ÖDEME	##	Bir yıllık dönemsel ödemeyi verir.
+PPMT			= ANA_PARA_ÖDEMESİ	##	Verilen bir süre için, bir yatırımın anaparasına dayanan ödemeyi verir.
+PRICE			= DEĞER				##	Dönemsel faiz ödeyen bir tahvilin fiyatını 10.000.00 liralık değer başına verir.
+PRICEDISC		= DEĞERİND			##	İndirimli bir tahvilin fiyatını 10.000.000 liralık nominal değer başına verir.
+PRICEMAT		= DEĞERVADE			##	Faizini vade sonunda ödeyen bir tahvilin fiyatını 10.000.000 nominal değer başına verir.
+PV				= BD				##	Bir yatırımın bugünkü değerini verir.
+RATE			= FAİZ_ORANI		##	Bir yıllık dönem başına düşen faiz oranını verir.
+RECEIVED		= GETİRİ			##	Tam olarak yatırılmış bir tahvilin vadesinin bitiminde alınan miktarı verir.
+SLN				= DA				##	Bir malın bir dönem içindeki doğrusal yıpranmasını verir.
+SYD				= YAT				##	Bir malın belirli bir dönem için olan amortismanını verir.
+TBILLEQ			= HTAHEŞ			##	Bir Hazine bonosunun bono eşdeğeri ödemesini verir.
+TBILLPRICE		= HTAHDEĞER			##	Bir Hazine bonosunun değerini, 10.000.000 liralık nominal değer başına verir.
+TBILLYIELD		= HTAHÖDEME			##	Bir Hazine bonosunun ödemesini verir.
+VDB				= DAB				##	Bir malın amortismanını, belirlenmiş ya da kısmi bir dönem için, bir azalan bakiye yöntemi kullanarak verir.
+XIRR			= AİÇVERİMORANI		##	Dönemsel olması gerekmeyen bir para akışları programı için, iç verim oranını verir.
+XNPV			= ANBD				##	Dönemsel olması gerekmeyen bir para akışları programı için, bugünkü net değeri verir.
+YIELD			= ÖDEME				##	Belirli aralıklarla faiz ödeyen bir tahvilin ödemesini verir.
+YIELDDISC		= ÖDEMEİND			##	İndirimli bir tahvilin yıllık ödemesini verir; örneğin, bir Hazine bonosunun.
+YIELDMAT		= ÖDEMEVADE			##	Vadesinin bitiminde faiz ödeyen bir tahvilin yıllık ödemesini verir.
+
+
+##
+##	Information functions				Bilgi fonksiyonları
+##
+CELL			= HÜCRE			##	Bir hücrenin biçimlendirmesi, konumu ya da içeriği hakkında bilgi verir.
+ERROR.TYPE		= HATA.TİPİ		##	Bir hata türüne ilişkin sayıları verir.
+INFO			= BİLGİ			##	Geçerli işletim ortamı hakkında bilgi verir.
+ISBLANK			= EBOŞSA		##	Değer boşsa, DOĞRU verir.
+ISERR			= EHATA			##	Değer, #YOK dışındaki bir hata değeriyse, DOĞRU verir.
+ISERROR			= EHATALIYSA	##	Değer, herhangi bir hata değeriyse, DOĞRU verir.
+ISEVEN			= ÇİFTTİR		##	Sayı çiftse, DOĞRU verir.
+ISLOGICAL		= EMANTIKSALSA	##	Değer, mantıksal bir değerse, DOĞRU verir.
+ISNA			= EYOKSA		##	Değer, #YOK hata değeriyse, DOĞRU verir.
+ISNONTEXT		= EMETİNDEĞİLSE	##	Değer, metin değilse, DOĞRU verir.
+ISNUMBER		= ESAYIYSA		##	Değer, bir sayıysa, DOĞRU verir.
+ISODD			= TEKTİR		##	Sayı tekse, DOĞRU verir.
+ISREF			= EREFSE		##	Değer bir başvuruysa, DOĞRU verir.
+ISTEXT			= EMETİNSE		##	Değer bir metinse DOĞRU verir.
+N				= N				##	Sayıya dönüştürülmüş bir değer verir.
+NA				= YOKSAY		##	#YOK hata değerini verir.
+TYPE			= TİP			##	Bir değerin veri türünü belirten bir sayı verir.
+
+
+##
+##	Logical functions				Mantıksal fonksiyonlar
+##
+AND				= VE			##	Bütün bağımsız değişkenleri DOĞRU ise, DOĞRU verir.
+FALSE			= YANLIŞ		##	YANLIŞ mantıksal değerini verir.
+IF				= EĞER			##	Gerçekleştirilecek bir mantıksal sınama belirtir.
+IFERROR			= EĞERHATA		##	Formül hatalıysa belirttiğiniz değeri verir; bunun dışındaki durumlarda formülün sonucunu verir.
+NOT				= DEĞİL			##	Bağımsız değişkeninin mantığını tersine çevirir.
+OR				= YADA			##	Bağımsız değişkenlerden herhangi birisi DOĞRU ise, DOĞRU verir.
+TRUE			= DOĞRU			##	DOĞRU mantıksal değerini verir.
+
+
+##
+##	Lookup and reference functions			Arama ve Başvuru fonksiyonları
+##
+ADDRESS			= ADRES				##	Bir başvuruyu, çalışma sayfasındaki tek bir hücreye metin olarak verir.
+AREAS			= ALANSAY			##	Renvoie le nombre de zones dans une référence.
+CHOOSE			= ELEMAN			##	Değerler listesinden bir değer seçer.
+COLUMN			= SÜTUN				##	Bir başvurunun sütun sayısını verir.
+COLUMNS			= SÜTUNSAY			##	Bir başvurudaki sütunların sayısını verir.
+HLOOKUP			= YATAYARA			##	Bir dizinin en üst satırına bakar ve belirtilen hücrenin değerini verir.
+HYPERLINK		= KÖPRÜ				##	Bir ağ sunucusunda, bir intranette ya da Internet'te depolanan bir belgeyi açan bir kısayol ya da atlama oluşturur.
+INDEX			= İNDİS				##	Başvurudan veya diziden bir değer seçmek için, bir dizin kullanır.
+INDIRECT		= DOLAYLI			##	Metin değeriyle belirtilen bir başvuru verir.
+LOOKUP			= ARA				##	Bir vektördeki veya dizideki değerleri arar.
+MATCH			= KAÇINCI			##	Bir başvurudaki veya dizideki değerleri arar.
+OFFSET			= KAYDIR			##	Verilen bir başvurudan, bir başvuru kaydırmayı verir.
+ROW				= SATIR				##	Bir başvurunun satır sayısını verir.
+ROWS			= SATIRSAY			##	Bir başvurudaki satırların sayısını verir.
+RTD				= RTD				##	COM otomasyonunu destekleyen programdan gerçek zaman verileri alır.
+TRANSPOSE		= DEVRİK_DÖNÜŞÜM	##	Bir dizinin devrik dönüşümünü verir.
+VLOOKUP			= DÜŞEYARA			##	Bir dizinin ilk sütununa bakar ve bir hücrenin değerini vermek için satır boyunca hareket eder.
+
+
+##
+##	Math and trigonometry functions			Matematik ve trigonometri fonksiyonları
+##
+ABS				= MUTLAK			##	Bir sayının mutlak değerini verir.
+ACOS			= ACOS				##	Bir sayının ark kosinüsünü verir.
+ACOSH			= ACOSH				##	Bir sayının ters hiperbolik kosinüsünü verir.
+ASIN			= ASİN				##	Bir sayının ark sinüsünü verir.
+ASINH			= ASİNH				##	Bir sayının ters hiperbolik sinüsünü verir.
+ATAN			= ATAN				##	Bir sayının ark tanjantını verir.
+ATAN2			= ATAN2				##	Ark tanjantı, x- ve y- koordinatlarından verir.
+ATANH			= ATANH				##	Bir sayının ters hiperbolik tanjantını verir.
+CEILING			= TAVANAYUVARLA		##	Bir sayıyı, en yakın tamsayıya ya da en yakın katına yuvarlar.
+COMBIN			= KOMBİNASYON		##	Verilen sayıda öğenin kombinasyon sayısını verir.
+COS				= COS				##	Bir sayının kosinüsünü verir.
+COSH			= COSH				##	Bir sayının hiperbolik kosinüsünü verir.
+DEGREES			= DERECE			##	Radyanları dereceye dönüştürür.
+EVEN			= ÇİFT				##	Bir sayıyı, en yakın daha büyük çift tamsayıya yuvarlar.
+EXP				= ÜS				##	e'yi, verilen bir sayının üssüne yükseltilmiş olarak verir.
+FACT			= ÇARPINIM			##	Bir sayının faktörünü verir.
+FACTDOUBLE		= ÇİFTFAKTÖR		##	Bir sayının çift çarpınımını verir.
+FLOOR			= TABANAYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
+GCD				= OBEB				##	En büyük ortak böleni verir.
+INT				= TAMSAYI			##	Bir sayıyı aşağıya doğru en yakın tamsayıya yuvarlar.
+LCM				= OKEK				##	En küçük ortak katı verir.
+LN				= LN				##	Bir sayının doğal logaritmasını verir.
+LOG				= LOG				##	Bir sayının, belirtilen bir tabandaki logaritmasını verir.
+LOG10			= LOG10				##	Bir sayının 10 tabanında logaritmasını verir.
+MDETERM			= DETERMİNANT		##	Bir dizinin dizey determinantını verir.
+MINVERSE		= DİZEY_TERS		##	Bir dizinin dizey tersini verir.
+MMULT			= DÇARP				##	İki dizinin dizey çarpımını verir.
+MOD				= MODÜLO			##	Bölmeden kalanı verir.
+MROUND			= KYUVARLA			##	İstenen kata yuvarlanmış bir sayı verir.
+MULTINOMIAL		= ÇOKTERİMLİ		##	Bir sayılar kümesinin çok terimlisini verir.
+ODD				= TEK				##	Bir sayıyı en yakın daha büyük tek sayıya yuvarlar.
+PI				= Pİ				##	Pi değerini verir.
+POWER			= KUVVET			##	Bir üsse yükseltilmiş sayının sonucunu verir.
+PRODUCT			= ÇARPIM			##	Bağımsız değişkenlerini çarpar.
+QUOTIENT		= BÖLÜM				##	Bir bölme işleminin tamsayı kısmını verir.
+RADIANS			= RADYAN			##	Dereceleri radyanlara dönüştürür.
+RAND			= S_SAYI_ÜRET		##	0 ile 1 arasında rastgele bir sayı verir.
+RANDBETWEEN		= RASTGELEARALIK	##	Belirttiğiniz sayılar arasında rastgele bir sayı verir.
+ROMAN			= ROMEN				##	Bir normal rakamı, metin olarak, romen rakamına çevirir.
+ROUND			= YUVARLA			##	Bir sayıyı, belirtilen basamak sayısına yuvarlar.
+ROUNDDOWN		= AŞAĞIYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
+ROUNDUP			= YUKARIYUVARLA		##	Bir sayıyı daha büyük sayıya, sıfırdan ıraksayarak yuvarlar.
+SERIESSUM		= SERİTOPLA			##	Bir üs serisinin toplamını, formüle bağlı olarak verir.
+SIGN			= İŞARET			##	Bir sayının işaretini verir.
+SIN				= SİN				##	Verilen bir açının sinüsünü verir.
+SINH			= SİNH				##	Bir sayının hiperbolik sinüsünü verir.
+SQRT			= KAREKÖK			##	Pozitif bir karekök verir.
+SQRTPI			= KAREKÖKPİ			##	(* Pi sayısının) kare kökünü verir.
+SUBTOTAL		= ALTTOPLAM			##	Bir listedeki ya da veritabanındaki bir alt toplamı verir.
+SUM				= TOPLA				##	Bağımsız değişkenlerini toplar.
+SUMIF			= ETOPLA			##	Verilen ölçütle belirlenen hücreleri toplar.
+SUMIFS			= SUMIFS			##	Bir aralıktaki, birden fazla ölçüte uyan hücreleri ekler.
+SUMPRODUCT		= TOPLA.ÇARPIM		##	İlişkili dizi bileşenlerinin çarpımlarının toplamını verir.
+SUMSQ			= TOPKARE			##	Bağımsız değişkenlerin karelerinin toplamını verir.
+SUMX2MY2		= TOPX2EY2			##	İki dizideki ilişkili değerlerin farkının toplamını verir.
+SUMX2PY2		= TOPX2AY2			##	İki dizideki ilişkili değerlerin karelerinin toplamının toplamını verir.
+SUMXMY2			= TOPXEY2			##	İki dizideki ilişkili değerlerin farklarının karelerinin toplamını verir.
+TAN				= TAN				##	Bir sayının tanjantını verir.
+TANH			= TANH				##	Bir sayının hiperbolik tanjantını verir.
+TRUNC			= NSAT				##	Bir sayının, tamsayı durumuna gelecek şekilde, fazlalıklarını atar.
+
+
+##
+##	Statistical functions				İstatistiksel fonksiyonlar
+##
+AVEDEV			= ORTSAP			##	Veri noktalarının ortalamalarından mutlak sapmalarının ortalamasını verir.
+AVERAGE			= ORTALAMA			##	Bağımsız değişkenlerinin ortalamasını verir.
+AVERAGEA		= ORTALAMAA			##	Bağımsız değişkenlerinin, sayılar, metin ve mantıksal değerleri içermek üzere ortalamasını verir.
+AVERAGEIF		= EĞERORTALAMA 		##	Verili ölçütü karşılayan bir aralıktaki bütün hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
+AVERAGEIFS		= EĞERLERORTALAMA 	##	Birden çok ölçüte uyan tüm hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
+BETADIST		= BETADAĞ			##	Beta birikimli dağılım fonksiyonunu verir.
+BETAINV			= BETATERS			##	Belirli bir beta dağılımı için birikimli dağılım fonksiyonunun tersini verir.
+BINOMDIST		= BİNOMDAĞ			##	Tek terimli binom dağılımı olasılığını verir.
+CHIDIST			= KİKAREDAĞ			##	Kikare dağılımın tek kuyruklu olasılığını verir.
+CHIINV			= KİKARETERS		##	Kikare dağılımın kuyruklu olasılığının tersini verir.
+CHITEST			= KİKARETEST		##	Bağımsızlık sınamalarını verir.
+CONFIDENCE		= GÜVENİRLİK		##	Bir popülasyon ortalaması için güvenirlik aralığını verir.
+CORREL			= KORELASYON		##	İki veri kümesi arasındaki bağlantı katsayısını verir.
+COUNT			= BAĞ_DEĞ_SAY		##	Bağımsız değişkenler listesinde kaç tane sayı bulunduğunu sayar.
+COUNTA			= BAĞ_DEĞ_DOLU_SAY	##	Bağımsız değişkenler listesinde kaç tane değer bulunduğunu sayar.
+COUNTBLANK		= BOŞLUKSAY 		##	Aralıktaki boş hücre sayısını hesaplar.
+COUNTIF			= EĞERSAY 			##	Verilen ölçütlere uyan bir aralık içindeki hücreleri sayar.
+COUNTIFS		= ÇOKEĞERSAY 		##	Birden çok ölçüte uyan bir aralık içindeki hücreleri sayar.
+COVAR			= KOVARYANS 		##	Eşleştirilmiş sapmaların ortalaması olan kovaryansı verir.
+CRITBINOM		= KRİTİKBİNOM		##	Birikimli binom dağılımının bir ölçüt değerinden küçük veya ölçüt değerine eşit olduğu en küçük değeri verir.
+DEVSQ			= SAPKARE			##	Sapmaların karelerinin toplamını verir.
+EXPONDIST		= ÜSTELDAĞ			##	Üstel dağılımı verir.
+FDIST			= FDAĞ				##	F olasılık dağılımını verir.
+FINV			= FTERS				##	F olasılık dağılımının tersini verir.
+FISHER			= FISHER			##	Fisher dönüşümünü verir.
+FISHERINV		= FISHERTERS		##	Fisher dönüşümünün tersini verir.
+FORECAST		= TAHMİN			##	Bir doğrusal eğilim boyunca bir değer verir.
+FREQUENCY		= SIKLIK			##	Bir sıklık dağılımını, dikey bir dizi olarak verir.
+FTEST			= FTEST				##	Bir F-test'in sonucunu verir.
+GAMMADIST		= GAMADAĞ			##	Gama dağılımını verir.
+GAMMAINV		= GAMATERS			##	Gama kümülatif dağılımının tersini verir.
+GAMMALN			= GAMALN			##	Gama fonksiyonunun (?(x)) doğal logaritmasını verir.
+GEOMEAN			= GEOORT			##	Geometrik ortayı verir.
+GROWTH			= BÜYÜME			##	Üstel bir eğilim boyunca değerler verir.
+HARMEAN			= HARORT			##	Harmonik ortayı verir.
+HYPGEOMDIST		= HİPERGEOMDAĞ		##	Hipergeometrik dağılımı verir.
+INTERCEPT		= KESMENOKTASI		##	Doğrusal çakıştırma çizgisinin kesişme noktasını verir.
+KURT			= BASIKLIK			##	Bir veri kümesinin basıklığını verir.
+LARGE			= BÜYÜK				##	Bir veri kümesinde k. en büyük değeri verir.
+LINEST			= DOT				##	Doğrusal bir eğilimin parametrelerini verir.
+LOGEST			= LOT				##	Üstel bir eğilimin parametrelerini verir.
+LOGINV			= LOGTERS			##	Bir lognormal dağılımının tersini verir.
+LOGNORMDIST		= LOGNORMDAĞ		##	Birikimli lognormal dağılımını verir.
+MAX				= MAK				##	Bir bağımsız değişkenler listesindeki en büyük değeri verir.
+MAXA			= MAKA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri içermek üzere, en büyük değeri verir.
+MEDIAN			= ORTANCA			##	Belirtilen sayıların orta değerini verir.
+MIN				= MİN				##	Bir bağımsız değişkenler listesindeki en küçük değeri verir.
+MINA			= MİNA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri de içermek üzere, en küçük değeri verir.
+MODE			= ENÇOK_OLAN		##	Bir veri kümesindeki en sık rastlanan değeri verir.
+NEGBINOMDIST	= NEGBİNOMDAĞ		##	Negatif binom dağılımını verir.
+NORMDIST		= NORMDAĞ			##	Normal birikimli dağılımı verir.
+NORMINV			= NORMTERS			##	Normal kümülatif dağılımın tersini verir.
+NORMSDIST		= NORMSDAĞ			##	Standart normal birikimli dağılımı verir.
+NORMSINV		= NORMSTERS			##	Standart normal birikimli dağılımın tersini verir.
+PEARSON			= PEARSON			##	Pearson çarpım moment korelasyon katsayısını verir.
+PERCENTILE		= YÜZDEBİRLİK		##	Bir aralık içerisinde bulunan değerlerin k. frekans toplamını verir.
+PERCENTRANK		= YÜZDERANK			##	Bir veri kümesindeki bir değerin yüzde mertebesini verir.
+PERMUT			= PERMÜTASYON		##	Verilen sayıda nesne için permütasyon sayısını verir.
+POISSON			= POISSON			##	Poisson dağılımını verir.
+PROB			= OLASILIK			##	Bir aralıktaki değerlerin iki sınır arasında olması olasılığını verir.
+QUARTILE		= DÖRTTEBİRLİK		##	Bir veri kümesinin dörtte birliğini verir.
+RANK			= RANK				##	Bir sayılar listesinde bir sayının mertebesini verir.
+RSQ				= RKARE				##	Pearson çarpım moment korelasyon katsayısının karesini verir.
+SKEW			= ÇARPIKLIK			##	Bir dağılımın çarpıklığını verir.
+SLOPE			= EĞİM				##	Doğrusal çakışma çizgisinin eğimini verir.
+SMALL			= KÜÇÜK				##	Bir veri kümesinde k. en küçük değeri verir.
+STANDARDIZE		= STANDARTLAŞTIRMA	##	Normalleştirilmiş bir değer verir.
+STDEV			= STDSAPMA			##	Bir örneğe dayanarak standart sapmayı tahmin eder.
+STDEVA			= STDSAPMAA			##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
+STDEVP			= STDSAPMAS			##	Standart sapmayı, tüm popülasyona bağlı olarak hesaplar.
+STDEVPA			= STDSAPMASA		##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
+STEYX			= STHYX				##	Regresyondaki her x için tahmini y değerinin standart hatasını verir.
+TDIST			= TDAĞ				##	T-dağılımını verir.
+TINV			= TTERS				##	T-dağılımının tersini verir.
+TREND			= EĞİLİM			##	Doğrusal bir eğilim boyunca değerler verir.
+TRIMMEAN		= KIRPORTALAMA		##	Bir veri kümesinin içinin ortalamasını verir.
+TTEST			= TTEST				##	T-test'le ilişkilendirilmiş olasılığı verir.
+VAR				= VAR				##	Varyansı, bir örneğe bağlı olarak tahmin eder.
+VARA			= VARA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
+VARP			= VARS				##	Varyansı, tüm popülasyona dayanarak hesaplar.
+VARPA			= VARSA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
+WEIBULL			= WEIBULL			##	Weibull dağılımını hesaplar.
+ZTEST			= ZTEST				##	Z-testinin tek kuyruklu olasılık değerini hesaplar.
+
+
+##
+##	Text functions					Metin fonksiyonları
+##
+ASC				= ASC 				##	Bir karakter dizesindeki çift enli (iki bayt) İngilizce harfleri veya katakanayı yarım enli (tek bayt) karakterlerle değiştirir.
+BAHTTEXT		= BAHTTEXT 			##	Sayıyı, ß (baht) para birimi biçimini kullanarak metne dönüştürür.
+CHAR			= DAMGA 			##	Kod sayısıyla belirtilen karakteri verir.
+CLEAN			= TEMİZ				##	Metindeki bütün yazdırılamaz karakterleri kaldırır.
+CODE			= KOD				##	Bir metin dizesindeki ilk karakter için sayısal bir kod verir.
+CONCATENATE		= BİRLEŞTİR			##	Pek çok metin öğesini bir metin öğesi olarak birleştirir.
+DOLLAR			= LİRA				##	Bir sayıyı YTL (yeni Türk lirası) para birimi biçimini kullanarak metne dönüştürür.
+EXACT			= ÖZDEŞ				##	İki metin değerinin özdeş olup olmadığını anlamak için, değerleri denetler.
+FIND			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
+FINDB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
+FIXED			= SAYIDÜZENLE		##	Bir sayıyı, sabit sayıda ondalıkla, metin olarak biçimlendirir.
+JIS				= JIS				##	Bir karakter dizesindeki tek enli (tek bayt) İngilizce harfleri veya katakanayı çift enli (iki bayt) karakterlerle değiştirir.
+LEFT			= SOL				##	Bir metin değerinden en soldaki karakterleri verir.
+LEFTB			= SOLB				##	Bir metin değerinden en soldaki karakterleri verir.
+LEN				= UZUNLUK			##	Bir metin dizesindeki karakter sayısını verir.
+LENB			= UZUNLUKB			##	Bir metin dizesindeki karakter sayısını verir.
+LOWER			= KÜÇÜKHARF			##	Metni küçük harfe çevirir.
+MID				= ORTA				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
+MIDB			= ORTAB				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
+PHONETIC		= SES				##	Metin dizesinden ses (furigana) karakterlerini ayıklar.
+PROPER			= YAZIM.DÜZENİ		##	Bir metin değerinin her bir sözcüğünün ilk harfini büyük harfe çevirir.
+REPLACE			= DEĞİŞTİR			##	Metnin içindeki karakterleri değiştirir.
+REPLACEB		= DEĞİŞTİRB			##	Metnin içindeki karakterleri değiştirir.
+REPT			= YİNELE			##	Metni belirtilen sayıda yineler.
+RIGHT			= SAĞ				##	Bir metin değerinden en sağdaki karakterleri verir.
+RIGHTB			= SAĞB				##	Bir metin değerinden en sağdaki karakterleri verir.
+SEARCH			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
+SEARCHB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
+SUBSTITUTE		= YERİNEKOY			##	Bir metin dizesinde, eski metnin yerine yeni metin koyar.
+T				= M					##	Bağımsız değerlerini metne dönüştürür.
+TEXT			= METNEÇEVİR		##	Bir sayıyı biçimlendirir ve metne dönüştürür.
+TRIM			= KIRP				##	Metindeki boşlukları kaldırır.
+UPPER			= BÜYÜKHARF			##	Metni büyük harfe çevirir.
+VALUE			= SAYIYAÇEVİR		##	Bir metin bağımsız değişkenini sayıya dönüştürür.
diff --git a/lib/URI/uri.class.php b/lib/URI/uri.class.php
index 3e31a1f88..91a0a5165 100644
--- a/lib/URI/uri.class.php
+++ b/lib/URI/uri.class.php
@@ -163,5 +163,4 @@ class G5_URI {
 
 		return $host.$return_url.$add_param.$fragment;
    }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/cache.lib.php b/lib/cache.lib.php
index 07b640148..b416ea539 100644
--- a/lib/cache.lib.php
+++ b/lib/cache.lib.php
@@ -8,6 +8,8 @@ function get_cachemanage_instance(){
     static $instance = null;
     
     if( ! (defined('G5_USE_CACHE') && G5_USE_CACHE) ) return $instance;
+    
+    $instance = run_replace('get_cachemanage_instance', $instance);
 
     if( $instance === null ){
         $options = array(
@@ -48,14 +50,22 @@ function g5_latest_cache_data($bo_table, $cache_list=array(), $find_wr_id=0){
 function g5_set_cache($key, $save_data, $ttl = null){
 
     if( $cache = get_cachemanage_instance() ){
-        $cache->save($key, $save_data, $ttl);
+        run_event('g5_set_cache_event', $cache, $key, $save_data, $ttl);
+        
+        if( (is_object($cache) && get_class($cache) === 'FileCache') ){
+            $cache->save($key, $save_data, $ttl);
+        }
     }
 }
 
 function g5_get_cache($key, $expired_time=0){
 
     if( $cache = get_cachemanage_instance() ){
-        return $cache->get($key, $expired_time);
+        if( (is_object($cache) && get_class($cache) === 'FileCache') ){
+            return $cache->get($key, $expired_time);
+        }
+
+        return run_replace('g5_get_cache_replace', false, $cache, $key, $expired_time);
     }
     
     return false;
@@ -82,14 +92,21 @@ function g5_delete_all_cache(){
 }
 
 function g5_delete_cache_by_prefix($key){
-    $files = glob(G5_DATA_PATH.'/cache/'.$key.'*');
 
-    foreach( (array) $files as $filename){
-        if(empty($filename)) continue;
+    $cache = get_cachemanage_instance();
+    $files = null;
 
-        unlink($filename);
+    if( (is_object($cache) && get_class($cache) === 'FileCache') ) {
+        $files = glob(G5_DATA_PATH.'/cache/'.$key.'*');
+
+        foreach( (array) $files as $filename){
+            if(empty($filename)) continue;
+
+            unlink($filename);
+        }
     }
 
+    $files = run_replace('g5_delete_cache_by_prefix', $files, $key, $cache);
+
     return ($files) ? true : false;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/common.lib.php b/lib/common.lib.php
index ad1648eaa..087875e32 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -166,9 +166,8 @@ function get_cookie($cookie_name)
 // 경고메세지를 경고창으로
 function alert($msg='', $url='', $error=true, $post=false)
 {
-    global $g5, $config, $member;
-    global $is_admin;
-    
+    global $g5, $config, $member, $is_member, $is_admin, $board;
+
     run_event('alert', $msg, $url, $error, $post);
 
     $msg = $msg ? strip_tags($msg, '<br>') : '올바른 방법으로 이용해 주십시오.';
@@ -185,7 +184,7 @@ function alert($msg='', $url='', $error=true, $post=false)
 // 경고메세지 출력후 창을 닫음
 function alert_close($msg, $error=true)
 {
-    global $g5;
+    global $g5, $config, $member, $is_member, $is_admin, $board;
     
     run_event('alert_close', $msg, $error);
 
@@ -202,7 +201,7 @@ function alert_close($msg, $error=true)
 // confirm 창
 function confirm($msg, $url1='', $url2='', $url3='')
 {
-    global $g5;
+    global $g5, $config, $member, $is_member, $is_admin, $board;
 
     if (!$msg) {
         $msg = '올바른 방법으로 이용해 주십시오.';
@@ -300,14 +299,14 @@ function get_filesize($size)
 // 게시글에 첨부된 파일을 얻는다. (배열로 반환)
 function get_file($bo_table, $wr_id)
 {
-    global $g5, $qstr;
+    global $g5, $qstr, $board;
 
     $file['count'] = 0;
     $sql = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' order by bf_no ";
     $result = sql_query($sql);
     while ($row = sql_fetch_array($result))
     {
-        $no = $row['bf_no'];
+        $no = (int) $row['bf_no'];
         $bf_content = $row['bf_content'] ? html_purifier($row['bf_content']) : '';
         $file[$no]['href'] = G5_BBS_URL."/download.php?bo_table=$bo_table&amp;wr_id=$wr_id&amp;no=$no" . $qstr;
         $file[$no]['download'] = $row['bf_download'];
@@ -330,7 +329,7 @@ function get_file($bo_table, $wr_id)
         $file['count']++;
     }
 
-    return $file;
+    return run_replace('get_files', $file, $bo_table, $wr_id);
 }
 
 
@@ -763,7 +762,8 @@ function get_group($gr_id, $is_cache=false)
 
     $sql = " select * from {$g5['group_table']} where gr_id = '$gr_id' ";
 
-    $cache[$key] = run_replace('get_group', sql_fetch($sql), $gr_id, $is_cache);
+    $group = run_replace('get_group', sql_fetch($sql), $gr_id, $is_cache);
+    $cache[$key] = array_merge(array('gr_device'=>'', 'gr_subject'=>''), (array) $group);
 
     return $cache[$key];
 }
@@ -1252,13 +1252,13 @@ function delete_point($mb_id, $rel_table, $rel_id, $rel_action)
                       and po_rel_action = '$rel_action' ";
         $row = sql_fetch($sql);
 
-        if($row['po_point'] < 0) {
+        if(isset($row['po_point']) && $row['po_point'] < 0) {
             $mb_id = $row['mb_id'];
             $po_point = abs($row['po_point']);
 
             delete_use_point($mb_id, $po_point);
         } else {
-            if($row['po_use_point'] > 0) {
+            if(isset($row['po_use_point']) && $row['po_use_point'] > 0) {
                 insert_use_point($row['mb_id'], $row['po_use_point'], $row['po_id']);
             }
         }
@@ -1270,11 +1270,13 @@ function delete_point($mb_id, $rel_table, $rel_id, $rel_action)
                        and po_rel_action = '$rel_action' ", false);
 
         // po_mb_point에 반영
-        $sql = " update {$g5['point_table']}
-                    set po_mb_point = po_mb_point - '{$row['po_point']}'
-                    where mb_id = '$mb_id'
-                      and po_id > '{$row['po_id']}' ";
-        sql_query($sql);
+        if(isset($row['po_point'])) {
+            $sql = " update {$g5['point_table']}
+                        set po_mb_point = po_mb_point - '{$row['po_point']}'
+                        where mb_id = '$mb_id'
+                          and po_id > '{$row['po_id']}' ";
+            sql_query($sql);
+        }
 
         // 포인트 내역의 합을 구하고
         $sum_point = get_point_sum($mb_id);
@@ -1313,9 +1315,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
             $icon_file = G5_DATA_PATH.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif';
 
             if (file_exists($icon_file)) {
+                $icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?'.filemtime($icon_file) : '';
                 $width = $config['cf_member_icon_width'];
                 $height = $config['cf_member_icon_height'];
-                $icon_file_url = G5_DATA_URL.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif';
+                $icon_file_url = G5_DATA_URL.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif'.$icon_filemtile;
                 $tmp_name .= '<span class="profile_img"><img src="'.$icon_file_url.'" width="'.$width.'" height="'.$height.'" alt=""></span>';
 
                 if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
@@ -1390,7 +1393,7 @@ function view_file_link($file, $width, $height, $content='')
     $ids++;
 
     // 파일의 폭이 게시판설정의 이미지폭 보다 크다면 게시판설정 폭으로 맞추고 비율에 따라 높이를 계산
-    if ($width > $board['bo_image_width'] && $board['bo_image_width'])
+    if ($board && $width > $board['bo_image_width'] && $board['bo_image_width'])
     {
         $rate = $board['bo_image_width'] / $width;
         $width = $board['bo_image_width'];
@@ -1403,7 +1406,7 @@ function view_file_link($file, $width, $height, $content='')
     else
         $attr = '';
 
-    if (preg_match("/\.({$config['cf_image_extension']})$/i", $file)) {
+    if (preg_match("/\.({$config['cf_image_extension']})$/i", $file) && isset($board['bo_table'])) {
         $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?bo_table='.$board['bo_table'].'&amp;fn='.urlencode($file), $file, $board['bo_table'], $width, $height, $content);
         $img = '<a href="'.$attr_href.'" target="_blank" class="view_image">';
         $img .= '<img src="'.G5_DATA_URL.'/file/'.$board['bo_table'].'/'.urlencode($file).'" alt="'.$content.'" '.$attr.'>';
@@ -1641,6 +1644,8 @@ function sql_fetch($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
 // 결과값에서 한행 연관배열(이름으로)로 얻는다.
 function sql_fetch_array($result)
 {
+    if( ! $result) return array();
+
     if(function_exists('mysqli_fetch_assoc') && G5_MYSQLI_USE)
         $row = @mysqli_fetch_assoc($result);
     else
@@ -1655,6 +1660,8 @@ function sql_fetch_array($result)
 // 단, 결과 값은 스크립트(script) 실행부가 종료되면서 메모리에서 자동적으로 지워진다.
 function sql_free_result($result)
 {
+    if(!is_resource($result)) return;
+
     if(function_exists('mysqli_free_result') && G5_MYSQLI_USE)
         return mysqli_free_result($result);
     else
@@ -1746,7 +1753,7 @@ function get_table_define($table, $crlf="\n")
     global $g5;
 
     // For MySQL < 3.23.20
-    $schema_create .= 'CREATE TABLE ' . $table . ' (' . $crlf;
+    $schema_create = 'CREATE TABLE ' . $table . ' (' . $crlf;
 
     $sql = 'SHOW FIELDS FROM ' . $table;
     $result = sql_query($sql);
@@ -1796,7 +1803,7 @@ function get_table_define($table, $crlf="\n")
     } // end while
     sql_free_result($result);
 
-    while (list($x, $columns) = @each($index)) {
+    foreach((array) $index as $x => $columns){
         $schema_create     .= ',' . $crlf;
         if ($x == 'PRIMARY') {
             $schema_create .= '    PRIMARY KEY (';
@@ -1807,7 +1814,7 @@ function get_table_define($table, $crlf="\n")
         } else {
             $schema_create .= '    KEY ' . $x . ' (';
         }
-        $schema_create     .= implode($columns, ', ') . ')';
+        $schema_create     .= implode(', ', $columns) . ')';
     } // end while
 
     $schema_create .= $crlf . ') ENGINE=MyISAM DEFAULT CHARSET=utf8';
@@ -2037,17 +2044,18 @@ function bad_tag_convert($code)
     global $view;
     global $member, $is_admin;
 
-    if ($is_admin && $member['mb_id'] != $view['mb_id']) {
+    if ($is_admin && $member['mb_id'] !== $view['mb_id']) {
         //$code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>(\<\/(embed|object)\>)?#i",
         // embed 또는 object 태그를 막지 않는 경우 필터링이 되도록 수정
-        $code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>?(\<\/(embed|object)\>)?#i",
-                    create_function('$matches', 'return "<div class=\"embedx\">보안문제로 인하여 관리자 아이디로는 embed 또는 object 태그를 볼 수 없습니다. 확인하시려면 관리권한이 없는 다른 아이디로 접속하세요.</div>";'),
-                    $code);
+        $code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>?(\<\/(embed|object)\>)?#i", '_callback_bad_tag_convert', $code);
     }
 
     return preg_replace("/\<([\/]?)(script|iframe|form)([^\>]*)\>?/i", "&lt;$1$2$3&gt;", $code);
 }
 
+function _callback_bad_tag_convert($matches){
+    return "<div class=\"embedx\">보안문제로 인하여 관리자 아이디로는 embed 또는 object 태그를 볼 수 없습니다. 확인하시려면 관리권한이 없는 다른 아이디로 접속하세요.</div>";
+}
 
 // 토큰 생성
 function _token()
@@ -2236,7 +2244,7 @@ function get_uniqid()
     sql_query(" LOCK TABLE {$g5['uniqid_table']} WRITE ");
     while (1) {
         // 년월일시분초에 100분의 1초 두자리를 추가함 (1/100 초 앞에 자리가 모자르면 0으로 채움)
-        $key = date('YmdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
+        $key = date('YmdHis', time()) . str_pad((int)((float)microtime()*100), 2, "0", STR_PAD_LEFT);
 
         $result = sql_query(" insert into {$g5['uniqid_table']} set uq_id = '$key', uq_ip = '{$_SERVER['REMOTE_ADDR']}' ", false);
         if ($result) break; // 쿼리가 정상이면 빠진다.
@@ -2328,7 +2336,7 @@ function delete_editor_thumbnail($contents)
     run_event('delete_editor_thumbnail_before', $contents);
 
     // $contents 중 img 태그 추출
-    $matchs = get_editor_image($contents);
+    $matchs = get_editor_image($contents, false);
 
     if(!$matchs)
         return;
@@ -2336,8 +2344,8 @@ function delete_editor_thumbnail($contents)
     for($i=0; $i<count($matchs[1]); $i++) {
         // 이미지 path 구함
         $imgurl = @parse_url($matchs[1][$i]);
-        $srcfile = $_SERVER['DOCUMENT_ROOT'].$imgurl['path'];
-
+        $srcfile = dirname(G5_PATH).$imgurl['path'];
+        if(! preg_match('/(\.jpe?g|\.gif|\.png)$/i', $srcfile)) continue;
         $filename = preg_replace("/\.[^\.]+$/i", "", basename($srcfile));
         $filepath = dirname($srcfile);
         $files = glob($filepath.'/thumb-'.$filename.'*');
@@ -2544,6 +2552,7 @@ class html_process {
         // 현재접속자 처리
         $tmp_sql = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$_SERVER['REMOTE_ADDR']}' ";
         $tmp_row = sql_fetch($tmp_sql);
+        $http_host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']; 
 
         if ($tmp_row['cnt']) {
             $tmp_sql = " update {$g5['login_table']} set mb_id = '{$member['mb_id']}', lo_datetime = '".G5_TIME_YMDHIS."', lo_location = '{$g5['lo_location']}', lo_url = '{$g5['lo_url']}' where lo_ip = '{$_SERVER['REMOTE_ADDR']}' ";
@@ -2608,8 +2617,9 @@ class html_process {
             foreach($scripts as $js) {
                 if(!trim($js[1]))
                     continue;
-
-                $js[1] = preg_replace('#\.js([\'\"]?>)<\/script>$#i', '.js?ver='.G5_JS_VER.'$1</script>', $js[1]);
+                
+                $add_version_str = (stripos($js[1], $http_host) !== false) ? '?ver='.G5_JS_VER : '';
+                $js[1] = preg_replace('#\.js([\'\"]?>)<\/script>$#i', '.js'.$add_version_str.'$1</script>', $js[1]);
 
                 $javascript .= $php_eol.$js[1];
                 $php_eol = PHP_EOL;
@@ -2714,32 +2724,9 @@ function board_notice($bo_notice, $wr_id, $insert=false)
 function googl_short_url($longUrl)
 {
     global $config;
-
-    // Get API key from : http://code.google.com/apis/console/
-    // URL Shortener API ON
-    $apiKey = $config['cf_googl_shorturl_apikey'];
-
-    $postData = array('longUrl' => $longUrl);
-    $jsonData = json_encode($postData);
-
-    $curlObj = curl_init();
-
-    curl_setopt($curlObj, CURLOPT_URL, 'https://www.googleapis.com/urlshortener/v1/url?key='.$apiKey);
-    curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($curlObj, CURLOPT_SSL_VERIFYPEER, 0);
-    curl_setopt($curlObj, CURLOPT_HEADER, 0);
-    curl_setopt($curlObj, CURLOPT_HTTPHEADER, array('Content-type:application/json'));
-    curl_setopt($curlObj, CURLOPT_POST, 1);
-    curl_setopt($curlObj, CURLOPT_POSTFIELDS, $jsonData);
-
-    $response = curl_exec($curlObj);
-
-    //change the response json string to object
-    $json = json_decode($response);
-
-    curl_close($curlObj);
-
-    return $json->id;
+    
+    // 구글 짧은 주소는 서비스가 종료 되었습니다.
+    return function_exists('run_replace') ? run_replace('googl_short_url', $longUrl) : $longUrl;
 }
 
 
@@ -2810,7 +2797,7 @@ function certify_count_check($mb_id, $type)
 }
 
 // 1:1문의 설정로드
-function get_qa_config($fld='*')
+function get_qa_config($fld='*', $is_cache=false)
 {
     global $g5;
 
@@ -2837,6 +2824,8 @@ if (!function_exists("get_sock")) {
             $host = $res[1];
             $get  = $res[2];
         }
+        
+        $header = '';
 
         // 80번 포트로 소캣접속 시도
         $fp = fsockopen ($host, 80, $errno, $errstr, $timeout);
@@ -3026,8 +3015,16 @@ function get_search_string($stx)
 }
 
 // XSS 관련 태그 제거
-function clean_xss_tags($str, $check_entities=0)
+function clean_xss_tags($str, $check_entities=0, $is_remove_tags=0, $cur_str_len=0)
 {
+    if( $is_remove_tags ){
+        $str = strip_tags($str);
+    }
+
+    if( $cur_str_len ){
+        $str = utf8_strcut($str, $cur_str_len, '');
+    }
+
     $str_len = strlen($str);
     
     $i = 0;
@@ -3170,7 +3167,7 @@ function get_email_address($email)
 {
     preg_match("/[0-9a-z._-]+@[a-z0-9._-]{4,}/i", $email, $matches);
 
-    return $matches[0];
+    return isset($matches[0]) ? $matches[0] : '';
 }
 
 // 파일명에서 특수문자 제거
@@ -3350,6 +3347,11 @@ function clean_query_string($query, $amp=true)
         $q = array();
 
         foreach($out as $key=>$val) {
+            if(($key && is_array($key)) || ($val && is_array($val))){
+                $q[$key] = $val;
+                continue;
+            }
+
             $key = strip_tags(trim($key));
             $val = trim($val);
 
@@ -3423,33 +3425,41 @@ function clean_query_string($query, $amp=true)
     return $str;
 }
 
-function get_params_merge_url($params){
-    $p = @parse_url(G5_URL);
-    $href = $p['scheme'].'://'.$p['host'];
-    if(isset($p['port']) && $p['port'])
-        $href .= ':'.$p['port'];
-
-    if( $tmp = explode('?', $_SERVER['REQUEST_URI']) ){
-        if( isset($tmp[0]) && $tmp[0] )
+function get_params_merge_url($params, $url=''){
+    $str_url = $url ? $url : G5_URL;
+    $p = @parse_url($str_url);
+    $href = (isset($p['scheme']) ? "{$p['scheme']}://" : '')
+        . (isset($p['user']) ? $p['user']
+        . (isset($p['pass']) ? ":{$p['pass']}" : '').'@' : '')
+        . (isset($p['host']) ? $p['host'] : '')
+        . ((isset($p['path']) && $url) ? $p['path'] : '')
+        . ((isset($p['port']) && $p['port']) ? ":{$p['port']}" : '');
+    
+    $ori_params = '';
+    if( $url ){
+        $ori_params = !empty($p['query']) ? $p['query'] : '';
+    } else if( $tmp = explode('?', $_SERVER['REQUEST_URI']) ){
+        if( isset($tmp[0]) && $tmp[0] ) {
             $href .= $tmp[0];
-    }
-    $q = array();
-    if($_SERVER['QUERY_STRING']) {
-        foreach($_GET as $key=>$val) {
-            $key = strip_tags($key);
-            $val = strip_tags($val);
-
-            if($key && $val)
-                $q[$key] = $val;
+            $ori_params = isset($tmp[1]) ? $tmp[1] : '';
+        }
+        if( $freg = strstr($ori_params, '#') ) {
+            $p['fragment'] = preg_replace('/^#/', '', $freg);
         }
     }
-
-    if( is_array($params) ){
+    
+    $q = array();
+    if( $ori_params ){
+        parse_str( $ori_params, $q );
+    }
+    
+    if( is_array($params) && $params ){
         $q = array_merge($q, $params);
     }
 
     $query = http_build_query($q, '', '&amp;');
-    $href .= '?'.$query;
+    $qc = (strpos( $href, '?' ) !== false) ? '&amp;' : '?';
+    $href .= $qc.$query.(isset($p['fragment']) ? "#{$p['fragment']}" : '');
 
     return $href;
 }
@@ -3609,6 +3619,9 @@ function get_member_profile_img($mb_id='', $width='', $height='', $alt='profile_
         } else {
             $member_img = G5_DATA_PATH.'/member_image/'.substr($mb_id,0,2).'/'.get_mb_icon_name($mb_id).'.gif';
             if (is_file($member_img)) {
+                if(defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) {
+                    $member_img .= '?'.filemtime($member_img);
+                }
                 $member_cache[$mb_id] = $src = str_replace(G5_DATA_PATH, G5_DATA_URL, $member_img);
             }
         }
@@ -3696,6 +3709,15 @@ function is_use_email_certify(){
     return $config['cf_use_email_certify'];
 }
 
+function safe_replace_regex($str, $str_case=''){
+
+    if($str_case === 'time'){
+        return preg_replace('/[^0-9 _\-:]/i', '', $str);
+    }
+
+    return preg_replace('/[^0-9a-z_\-]/i', '', $str);
+}
+
 function get_real_client_ip(){
 
     $real_ip = $_SERVER['REMOTE_ADDR'];
@@ -3813,7 +3835,7 @@ function is_include_path_check($path='', $is_input='')
             if( preg_match('/\/data\/(file|editor|qa|cache|member|member_image|session|tmp)\/[A-Za-z0-9_]{1,20}\//i', $replace_path) ){
                 return false;
             }
-            if( preg_match('/'.G5_PLUGIN_DIR.'\//i', $replace_path) && (preg_match('/'.G5_OKNAME_DIR.'\//i', $replace_path) || preg_match('/'.G5_KCPCERT_DIR.'\//i', $replace_path) || preg_match('/'.G5_LGXPAY_DIR.'\//i', $replace_path)) ){
+            if( preg_match('/'.G5_PLUGIN_DIR.'\//i', $replace_path) && (preg_match('/'.G5_OKNAME_DIR.'\//i', $replace_path) || preg_match('/'.G5_KCPCERT_DIR.'\//i', $replace_path) || preg_match('/'.G5_LGXPAY_DIR.'\//i', $replace_path)) || (preg_match('/search\.skin\.php/i', $replace_path) ) ){
                 return false;
             }
             if( substr_count($replace_path, './') > 5 ){
@@ -3851,4 +3873,3 @@ function option_array_checked($option, $arr=array()){
 
     return $checked;
 }
-?>
\ No newline at end of file
diff --git a/lib/connect.lib.php b/lib/connect.lib.php
index 3be01c4de..c8400f797 100644
--- a/lib/connect.lib.php
+++ b/lib/connect.lib.php
@@ -37,5 +37,4 @@ function connect($skin_dir='basic')
     ob_end_clean();
 
     return $content;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/editor.lib.php b/lib/editor.lib.php
index d3650ad83..0f43842a1 100644
--- a/lib/editor.lib.php
+++ b/lib/editor.lib.php
@@ -23,5 +23,4 @@ function get_editor_js($id)
 function chk_editor_js($id)
 {
     return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n";
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/get_data.lib.php b/lib/get_data.lib.php
index 430b69d06..b6e990a0b 100644
--- a/lib/get_data.lib.php
+++ b/lib/get_data.lib.php
@@ -82,8 +82,11 @@ function get_board_db($bo_table, $is_cache=false){
 
         $sql = " select * from {$g5['board_table']} where bo_table = '$bo_table' ";
 
-        $cache[$key] = sql_fetch($sql);
+        $board = sql_fetch($sql);
+        
+        $board_defaults = array('bo_table'=>'', 'bo_skin'=>'', 'bo_mobile_skin'=>'', 'bo_upload_count' => 0, 'bo_use_dhtml_editor'=>'', 'bo_subject'=>'', 'bo_image_width'=>0);
 
+        $cache[$key] = array_merge($board_defaults, (array) $board);
     }
 
     return $cache[$key];
@@ -93,47 +96,48 @@ function get_menu_db($use_mobile=0, $is_cache=false){
     global $g5;
 
     static $cache = array();
-    
-	$cache = run_replace('get_menu_db_cache', $cache, $use_mobile, $is_cache);
-	
-	$key = md5($use_mobile);
+
+    $cache = run_replace('get_menu_db_cache', $cache, $use_mobile, $is_cache);
+
+    $key = md5($use_mobile);
 
     if( $is_cache && isset($cache[$key]) ){
         return $cache[$key];
     }
-	
-	$where = $use_mobile ? "me_mobile_use = '1'" : "me_use = '1'";
 
-	if( !($cache[$key] = run_replace('get_menu_db', array(), $use_mobile)) ){
-		$sql = " select *
-					from {$g5['menu_table']}
-					where $where
-					  and length(me_code) = '2'
-					order by me_order, me_id ";
-		$result = sql_query($sql, false);
+    $where = $use_mobile ? "me_mobile_use = '1'" : "me_use = '1'";
 
-		for ($i=0; $row=sql_fetch_array($result); $i++) {
-			
-			$row['ori_me_link'] = $row['me_link'];
-			$row['me_link'] = short_url_clean($row['me_link']);
-			$cache[$key][$i] = $row;
+    if( !($cache[$key] = run_replace('get_menu_db', array(), $use_mobile)) ){
+        $sql = " select *
+                from {$g5['menu_table']}
+                where $where
+                and length(me_code) = '2'
+                order by me_order, me_id ";
+        $result = sql_query($sql, false);
 
-			$sql2 = " select *
-						from {$g5['menu_table']}
-						where $where
-						  and length(me_code) = '4'
-						  and substring(me_code, 1, 2) = '{$row['me_code']}'
-						order by me_order, me_id ";
-			$result2 = sql_query($sql2);
-			for ($k=0; $row2=sql_fetch_array($result2); $k++) {
-				$row2['ori_me_link'] = $row2['me_link'];
-				$row2['me_link'] = short_url_clean($row2['me_link']);
-				$cache[$key][$i]['sub'][$k] = $row2;
-			}
-		}
-	}
+        for ($i=0; $row=sql_fetch_array($result); $i++) {
 
-	return $cache[$key];
+            $row['ori_me_link'] = $row['me_link'];
+            $row['me_link'] = short_url_clean($row['me_link']);
+            $row['sub'] = isset($row['sub']) ? $row['sub'] : array();
+            $cache[$key][$i] = $row;
+
+            $sql2 = " select *
+                    from {$g5['menu_table']}
+                    where $where
+                    and length(me_code) = '4'
+                    and substring(me_code, 1, 2) = '{$row['me_code']}'
+                    order by me_order, me_id ";
+            $result2 = sql_query($sql2);
+            for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                $row2['ori_me_link'] = $row2['me_link'];
+                $row2['me_link'] = short_url_clean($row2['me_link']);
+                $cache[$key][$i]['sub'][$k] = $row2;
+            }
+        }
+    }
+
+    return $cache[$key];
 }
 
 // 게시판 테이블에서 하나의 행을 읽음
@@ -461,7 +465,7 @@ function get_memo_not_read($mb_id, $add_where='')
     $sql = " SELECT count(*) as cnt FROM {$g5['memo_table']} WHERE me_recv_mb_id = '$mb_id' and me_type= 'recv' and me_read_datetime like '0%' $add_where ";
     $row = sql_fetch($sql, false);
 
-    return $row['cnt'];
+    return isset($row['cnt']) ? $row['cnt'] : 0;
 }
 
 function get_scrap_totals($mb_id=''){
@@ -472,6 +476,5 @@ function get_scrap_totals($mb_id=''){
     $sql = " select count(*) as cnt from {$g5['scrap_table']} where 1=1 $add_where";
     $row = sql_fetch($sql, false);
 
-    return $row['cnt'];
-}
-?>
\ No newline at end of file
+    return isset($row['cnt']) ? $row['cnt'] : 0;
+}
\ No newline at end of file
diff --git a/lib/hook.lib.php b/lib/hook.lib.php
index 453d79a78..7ec8a8b15 100644
--- a/lib/hook.lib.php
+++ b/lib/hook.lib.php
@@ -130,5 +130,4 @@ function get_hook_datas($type='', $is_callback=''){
     }
 
     return null;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/icode.lms.lib.php b/lib/icode.lms.lib.php
index 0da41bdb0..f74b14e3b 100644
--- a/lib/icode.lms.lib.php
+++ b/lib/icode.lms.lib.php
@@ -56,8 +56,8 @@ class LMS {
 	}
 
 	function Init() {
-		$this->Data		= "";	// 발송하기 위한 패킷내용이 배열로 들어간다.
-		$this->Result	= "";	// 발송결과값이 배열로 들어간다.
+		$this->Data		= array();	// 발송하기 위한 패킷내용이 배열로 들어간다.
+		$this->Result	= array();	// 발송결과값이 배열로 들어간다.
 	}
 
 	function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) {
@@ -65,6 +65,7 @@ class LMS {
 
 		// 문자 타입별 Port 설정.
 		$sendType = strlen($strData) > 90 ? 1 : 0; // 0: SMS / 1: LMS
+        $is_use_json = false;
 
         // 토큰키를 사용한다면
         if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
@@ -357,5 +358,4 @@ function CheckCallCenter($url, $dest, $data) {
 		default:
 			return CutChar($data,80);	break;
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/icode.sms.lib.php b/lib/icode.sms.lib.php
index a2a79a449..9b8f75a2f 100644
--- a/lib/icode.sms.lib.php
+++ b/lib/icode.sms.lib.php
@@ -67,8 +67,8 @@ class SMS {
 	}
 
 	function Init() {
-		$this->Data = "";
-		$this->Result = "";
+		$this->Data = array();
+		$this->Result = array();
 	}
 
 	function Add($dest, $callBack, $Caller, $msg, $rsvTime="") {
@@ -239,5 +239,4 @@ class SMS {
 		$this->Data=array();
         return true;
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/json.lib.php b/lib/json.lib.php
index 37fa82b10..877f8c4c2 100644
--- a/lib/json.lib.php
+++ b/lib/json.lib.php
@@ -75,5 +75,4 @@ if(!function_exists('json_decode'))
         eval($out . ';');
         return $x;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/latest.lib.php b/lib/latest.lib.php
index 4d60a0b0a..1d3613242 100644
--- a/lib/latest.lib.php
+++ b/lib/latest.lib.php
@@ -37,7 +37,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
 
     if(G5_USE_CACHE) {
         $cache_file_name = "latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}-".g5_cache_secret_key();
-        $caches = g5_get_cache($cache_file_name, $time_unit * $cache_time);
+        $caches = g5_get_cache($cache_file_name, (int) $time_unit * (int) $cache_time);
         $cache_list = isset($caches['list']) ? $caches['list'] : array();
         g5_latest_cache_data($bo_table, $cache_list);
     }
@@ -48,6 +48,10 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
 
         $board = get_board_db($bo_table, true);
 
+        if( ! $board ){
+            return '';
+        }
+
         $bo_subject = get_text($board['bo_subject']);
 
         $tmp_write_table = $g5['write_prefix'] . $bo_table; // 게시판 테이블 전체이름
@@ -82,6 +86,8 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
                 //     $img_content = '<img src="'. G5_IMG_URL.'/no_img.png'.'" alt="'.$thumb['alt'].'" width="'.$thumb_width.'" height="'.$thumb_height.'" class="no_img">';
                 }
             }
+
+            if(! isset($list[$i]['icon_file'])) $list[$i]['icon_file'] = '';
         }
         g5_latest_cache_data($bo_table, $list);
 
@@ -92,7 +98,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
                 'bo_subject' => sql_escape_string($bo_subject),
             );
 
-            g5_set_cache($cache_file_name, $caches, $time_unit * $cache_time);
+            g5_set_cache($cache_file_name, $caches, (int) $time_unit * (int) $cache_time);
         }
     } else {
         $list = $cache_list;
@@ -105,5 +111,4 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
     ob_end_clean();
 
     return $content;
-}
-?>
+}
\ No newline at end of file
diff --git a/lib/mailer.lib.php b/lib/mailer.lib.php
index 8d0ff707a..229ed97d9 100644
--- a/lib/mailer.lib.php
+++ b/lib/mailer.lib.php
@@ -16,6 +16,12 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file="", $cc=
     if ($type != 1)
         $content = nl2br($content);
 
+    $result = run_replace('mailer', $fname, $fmail, $to, $subject, $content, $type, $file, $cc, $bcc);
+    
+    if( isset($result['return']) ){
+        return $result['return'];
+    }
+
     $mail = new PHPMailer(); // defaults to using php "mail()"
     if (defined('G5_SMTP') && G5_SMTP) {
         $mail->IsSMTP(); // telling the class to use SMTP
@@ -51,5 +57,4 @@ function attach_file($filename, $tmp_name)
     move_uploaded_file($tmp_name, $dest_file);
     $tmpfile = array("name" => $filename, "path" => $dest_file);
     return $tmpfile;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/naver_syndi.lib.php b/lib/naver_syndi.lib.php
index cbe0b8c8b..7cf82b804 100644
--- a/lib/naver_syndi.lib.php
+++ b/lib/naver_syndi.lib.php
@@ -50,5 +50,4 @@ function naver_syndi_ping($bo_table, $wr_id)
     curl_close($ping);
 
     return $response;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/outlogin.lib.php b/lib/outlogin.lib.php
index 73aa028b3..d9b3fd805 100644
--- a/lib/outlogin.lib.php
+++ b/lib/outlogin.lib.php
@@ -63,5 +63,4 @@ function outlogin($skin_dir='basic')
     ob_end_clean();
 
     return run_replace('outlogin_content', $content, $is_auth, $outlogin_url, $outlogin_action_url);
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/poll.lib.php b/lib/poll.lib.php
index 3ffa1d770..27491a14c 100644
--- a/lib/poll.lib.php
+++ b/lib/poll.lib.php
@@ -44,5 +44,4 @@ function poll($skin_dir='basic', $po_id=false)
     ob_end_clean();
 
     return $content;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/popular.lib.php b/lib/popular.lib.php
index b2b264aa6..4cda2af46 100644
--- a/lib/popular.lib.php
+++ b/lib/popular.lib.php
@@ -47,5 +47,4 @@ function popular($skin_dir='basic', $pop_cnt=7, $date_cnt=3)
     ob_end_clean();
 
     return $content;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/register.lib.php b/lib/register.lib.php
index 254f08779..5eb7bc0e2 100644
--- a/lib/register.lib.php
+++ b/lib/register.lib.php
@@ -179,5 +179,4 @@ function exist_mb_hp($reg_mb_hp, $reg_mb_id)
         return " 이미 사용 중인 휴대폰번호입니다. ".$reg_mb_hp;
     else
         return "";
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index 5d190f507..f983100ff 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -11,8 +11,9 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
     $edt = false;
 
     $row = get_thumbnail_find_cache($bo_table, $wr_id, 'file');
+    $empty_array = array('src'=>'', 'ori'=>'', 'alt'=>'');
 
-    if($row['bf_file']) {
+    if(isset($row['bf_file']) && $row['bf_file']) {
         $filename = $row['bf_file'];
         $filepath = G5_DATA_PATH.'/file/'.$bo_table;
         $alt = get_text($row['bf_content']);
@@ -41,7 +42,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
                     $filepath = dirname($srcfile);
 
                     preg_match("/alt=[\"\']?([^\"\']*)[\"\']?/", $matches[0][$i], $malt);
-                    $alt = get_text($malt[1]);
+                    $alt = isset($malt[1]) ? get_text($malt[1]) : '';
 
                     break;
                 }
@@ -52,7 +53,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
     }
 
     if(!$filename)
-        return false;
+        return $empty_array;
     
     if( $thumbnail_info = run_replace('get_list_thumbnail_info', array(), array('bo_table'=>$bo_table, 'wr_id'=>$wr_id, 'data_path'=>$data_path, 'edt'=>$edt, 'filename'=>$filename, 'filepath'=>$filepath, 'thumb_width'=>$thumb_width, 'thumb_height'=>$thumb_height, 'is_create'=>$is_create, 'is_crop'=>$is_crop, 'crop_mode'=>$crop_mode, 'is_sharpen'=>$is_sharpen, 'um_value'=>$um_value)) ){
         return $thumbnail_info;
@@ -71,7 +72,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
             $src = G5_DATA_URL.'/file/'.$bo_table.'/'.$tname;
         }
     } else {
-        return false;
+        return $empty_array;
     }
 
     $thumb = array("src"=>$src, "ori"=>$ori, "alt"=>$alt);
@@ -113,15 +114,15 @@ function get_view_thumbnail($contents, $thumb_width=0)
         $img_tag = isset($matches[0][$i]) ? $matches[0][$i] : '';
 
         preg_match("/src=[\'\"]?([^>\'\"]+[^>\'\"]+)/i", $img, $m);
-        $src = $m[1];
+        $src = isset($m[1]) ? $m[1] : '';
         preg_match("/style=[\"\']?([^\"\'>]+)/i", $img, $m);
-        $style = $m[1];
+        $style = isset($m[1]) ? $m[1] : '';
         preg_match("/width:\s*(\d+)px/", $style, $m);
-        $width = $m[1];
+        $width = isset($m[1]) ? $m[1] : '';
         preg_match("/height:\s*(\d+)px/", $style, $m);
-        $height = $m[1];
+        $height = isset($m[1]) ? $m[1] : '';
         preg_match("/alt=[\"\']?([^\"\']*)[\"\']?/", $img, $m);
-        $alt = get_text($m[1]);
+        $alt = isset($m[1]) ? get_text($m[1]) : '';
 
         // 이미지 path 구함
         $p = parse_url($src);
@@ -226,7 +227,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
         return;
 
     $size = @getimagesize($source_file);
-    if($size[2] < 1 || $size[2] > 3) // gif, jpg, png 에 대해서만 적용
+    if(!isset($size[2]) || $size[2] < 1 || $size[2] > 3) // gif, jpg, png 에 대해서만 적용
         return;
 
     if (!is_dir($target_path)) {
@@ -730,5 +731,4 @@ function is_animated_gif($filename) {
     run_event('is_animated_gif_after', $filename, $cache[$key]);
 
     return $cache[$key];
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/uri.lib.php b/lib/uri.lib.php
index ed889d711..5561cd839 100644
--- a/lib/uri.lib.php
+++ b/lib/uri.lib.php
@@ -28,7 +28,7 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
             if( $config['cf_bbs_rewrite'] > 1 ){
 
                 $get_content = get_content_db( $no , true);
-                $segments[2] = $get_content['co_seo_title'] ? urlencode($get_content['co_seo_title']).'/' : urlencode($no);
+                $segments[2] = (isset($get_content['co_seo_title']) && $get_content['co_seo_title']) ? urlencode($get_content['co_seo_title']).'/' : urlencode($no);
 
             } else {
                 $segments[2] = urlencode($no);
@@ -44,7 +44,7 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
 
                 $get_write = get_write( $g5['write_prefix'].$folder, $no , true);
 
-                $segments[2] = $get_write['wr_seo_title'] ? urlencode($get_write['wr_seo_title']).'/' : urlencode($no);
+                $segments[2] = (isset($get_write['wr_seo_title']) && $get_write['wr_seo_title']) ? urlencode($get_write['wr_seo_title']).'/' : urlencode($no);
 
                 } else {
                     $segments[2] = urlencode($no);
@@ -91,7 +91,7 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
                 $url .= ($folder === 'content') ? '?co_id='. $no : '?'. $no;
             }
             if($query_string) {
-                $url .= ($no ? '?' : '&amp;'). $query_string;
+                $url .= (!$no ? '?' : '&amp;'). $query_string;
             }
         }
 
@@ -109,7 +109,7 @@ function short_url_clean($string_url, $add_qry=''){
 
         $string_url = str_replace('&amp;', '&', $string_url);
         $url=parse_url($string_url);
-        $page_name = basename($url['path'],".php");
+        $page_name = isset($url['path']) ? basename($url['path'],".php") : '';
 
         $array_page_names = run_replace('url_clean_page_names', array('board', 'write', 'content'));
 
@@ -236,14 +236,14 @@ function exist_seo_url($type, $seo_title, $write_table, $sql_id=0){
         $sql = "select wr_seo_title FROM {$write_table} WHERE wr_seo_title = '".sql_real_escape_string($seo_title)."' AND wr_id <> '$sql_id' limit 1";
         $row = sql_fetch($sql);
 
-        $exists_title = $row['wr_seo_title'];
+        $exists_title = isset($row['wr_seo_title']) ? $row['wr_seo_title'] : '';
 
     } else if ( $type === 'content' ){
 
         $sql = "select co_seo_title FROM {$write_table} WHERE co_seo_title = '".sql_real_escape_string($seo_title)."' AND co_id <> '$sql_id' limit 1";
         $row = sql_fetch($sql);
 
-        $exists_title = $row['co_seo_title'];
+        $exists_title = isset($row['co_seo_title']) ? $row['co_seo_title'] : '';
 
     } else {
         return run_replace('exist_check_seo_title', $seo_title, $type, $write_table, $sql_id);
@@ -282,7 +282,7 @@ function seo_title_update($db_table, $pk_id, $type='bbs'){
     if( $type === 'bbs' ){
 
         $write = get_write($db_table, $pk_id, true);
-        if( ! $write['wr_seo_title'] && $write['wr_subject'] ){
+        if( ! (isset($write['wr_seo_title']) && $write['wr_seo_title']) && (isset($write['wr_subject']) && $write['wr_subject']) ){
             $wr_seo_title = exist_seo_title_recursive('bbs', generate_seo_title($write['wr_subject']), $db_table, $pk_id);
 
             $sql = " update `{$db_table}` set wr_seo_title = '{$wr_seo_title}' where wr_id = '{$pk_id}' ";
@@ -291,7 +291,7 @@ function seo_title_update($db_table, $pk_id, $type='bbs'){
     } else if ( $type === 'content' ){
 
         $co = get_content_db($pk_id, true);
-        if( ! $co['co_seo_title'] && $co['co_subject'] ){
+        if( ! (isset($co['co_seo_title']) && $co['co_seo_title']) && (isset($co['co_subject']) && $co['co_subject']) ){
             $co_seo_title = exist_seo_title_recursive('content', generate_seo_title($co['co_subject']), $db_table, $pk_id);
 
             $sql = " update `{$db_table}` set co_seo_title = '{$co_seo_title}' where co_id = '{$pk_id}' ";
@@ -426,5 +426,4 @@ function update_rewrite_rules(){
 
     return false;
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/visit.lib.php b/lib/visit.lib.php
index 1808fd5f7..6ab45ba2e 100644
--- a/lib/visit.lib.php
+++ b/lib/visit.lib.php
@@ -96,5 +96,4 @@ function get_os($agent)
     else { $s = "기타"; }
 
     return $s;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/mobile/_head.php b/mobile/_head.php
index 6f97d69de..86e9d0e0b 100644
--- a/mobile/_head.php
+++ b/mobile/_head.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_MOBILE_PATH.'/head.php');
-?>
\ No newline at end of file
+include_once(G5_MOBILE_PATH.'/head.php');
\ No newline at end of file
diff --git a/mobile/_tail.php b/mobile/_tail.php
index c9cb4b7c7..167736060 100644
--- a/mobile/_tail.php
+++ b/mobile/_tail.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_MOBILE_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_MOBILE_PATH.'/tail.php');
\ No newline at end of file
diff --git a/mobile/content.php b/mobile/content.php
index 08387f012..21f7f0132 100644
--- a/mobile/content.php
+++ b/mobile/content.php
@@ -1,7 +1,7 @@
 <?php
 include_once('./_common.php');
 
-if (!$co['co_id'])
+if (! (isset($co['co_id']) && $co['co_id']))
     alert('등록된 내용이 없습니다.');
 
 $g5['title'] = $co['co_subject'];
@@ -11,35 +11,35 @@ $co_content = $co['co_mobile_content'] ? $co['co_mobile_content'] : $co['co_cont
 $str = conv_content($co_content, $co['co_html'], $co['co_tag_filter_use']);
 
 // $src 를 $dst 로 변환
-unset($src);
-unset($dst);
+$src = $dst = array();
 $src[] = "/{{쇼핑몰명}}|{{홈페이지제목}}/";
 $dst[] = $config['cf_title'];
-$src[] = "/{{회사명}}|{{상호}}/";
-$dst[] = $default['de_admin_company_name'];
-$src[] = "/{{대표자명}}/";
-$dst[] = $default['de_admin_company_owner'];
-$src[] = "/{{사업자등록번호}}/";
-$dst[] = $default['de_admin_company_saupja_no'];
-$src[] = "/{{대표전화번호}}/";
-$dst[] = $default['de_admin_company_tel'];
-$src[] = "/{{팩스번호}}/";
-$dst[] = $default['de_admin_company_fax'];
-$src[] = "/{{통신판매업신고번호}}/";
-$dst[] = $default['de_admin_company_tongsin_no'];
-$src[] = "/{{사업장우편번호}}/";
-$dst[] = $default['de_admin_company_zip'];
-$src[] = "/{{사업장주소}}/";
-$dst[] = $default['de_admin_company_addr'];
-$src[] = "/{{운영자명}}|{{관리자명}}/";
-$dst[] = $default['de_admin_name'];
-$src[] = "/{{운영자e-mail}}|{{관리자e-mail}}/i";
-$dst[] = $default['de_admin_email'];
-$src[] = "/{{정보관리책임자명}}/";
-$dst[] = $default['de_admin_info_name'];
-$src[] = "/{{정보관리책임자e-mail}}|{{정보책임자e-mail}}/i";
-$dst[] = $default['de_admin_info_email'];
-
+if(isset($default) && isset($default['de_admin_company_name'])){
+    $src[] = "/{{회사명}}|{{상호}}/";
+    $dst[] = isset($default['de_admin_company_name']) ? $default['de_admin_company_name'] : '';
+    $src[] = "/{{대표자명}}/";
+    $dst[] = isset($default['de_admin_company_owner']) ? $default['de_admin_company_owner'] : '';
+    $src[] = "/{{사업자등록번호}}/";
+    $dst[] = isset($default['de_admin_company_saupja_no']) ? $default['de_admin_company_saupja_no'] : '';
+    $src[] = "/{{대표전화번호}}/";
+    $dst[] = isset($default['de_admin_company_tel']) ? $default['de_admin_company_tel'] : '';
+    $src[] = "/{{팩스번호}}/";
+    $dst[] = isset($default['de_admin_company_fax']) ? $default['de_admin_company_fax'] : '';
+    $src[] = "/{{통신판매업신고번호}}/";
+    $dst[] = isset($default['de_admin_company_tongsin_no']) ? $default['de_admin_company_tongsin_no'] : '';
+    $src[] = "/{{사업장우편번호}}/";
+    $dst[] = isset($default['de_admin_company_zip']) ? $default['de_admin_company_zip'] : '';
+    $src[] = "/{{사업장주소}}/";
+    $dst[] = isset($default['de_admin_company_addr']) ? $default['de_admin_company_addr'] : '';
+    $src[] = "/{{운영자명}}|{{관리자명}}/";
+    $dst[] = isset($default['de_admin_name']) ? $default['de_admin_name'] : '';
+    $src[] = "/{{운영자e-mail}}|{{관리자e-mail}}/i";
+    $dst[] = isset($default['de_admin_email']) ? $default['de_admin_email'] : '';
+    $src[] = "/{{정보관리책임자명}}/";
+    $dst[] = isset($default['de_admin_info_name']) ? $default['de_admin_info_name'] : '';
+    $src[] = "/{{정보관리책임자e-mail}}|{{정보책임자e-mail}}/i";
+    $dst[] = isset($default['de_admin_info_email']) ? $default['de_admin_info_email'] : '';
+}
 $str = preg_replace($src, $dst, $str);
 
 // 스킨경로
@@ -56,5 +56,4 @@ if(is_file($skin_file)) {
     echo '<p>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</p>';
 }
 
-include_once('./_tail.php');
-?>
+include_once('./_tail.php');
\ No newline at end of file
diff --git a/mobile/group.php b/mobile/group.php
index 386be7202..07c9a3523 100644
--- a/mobile/group.php
+++ b/mobile/group.php
@@ -31,5 +31,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <!-- 메인화면 최신글 끝 -->
 
 <?php
-include_once(G5_MOBILE_PATH.'/_tail.php');
-?>
+include_once(G5_MOBILE_PATH.'/_tail.php');
\ No newline at end of file
diff --git a/mobile/head.php b/mobile/head.php
index 1cbdee410..120655238 100644
--- a/mobile/head.php
+++ b/mobile/head.php
@@ -185,4 +185,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
     	<h2 id="container_title" class="top" title="<?php echo get_text($g5['title']); ?>">
     		<a href="javascript:history.back();"><i class="fa fa-chevron-left" aria-hidden="true"></i><span class="sound_only">뒤로가기</span></a> <?php echo get_head_title($g5['title']); ?>
     	</h2>
-    <?php } ?>
+    <?php }
\ No newline at end of file
diff --git a/mobile/index.php b/mobile/index.php
index 23a7dcacf..7a81fd0de 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -32,5 +32,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <!-- 메인화면 최신글 끝 -->
 
 <?php
-include_once(G5_MOBILE_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_MOBILE_PATH.'/tail.php');
\ No newline at end of file
diff --git a/mobile/newwin.inc.php b/mobile/newwin.inc.php
index bfd3eadfc..4e1c051fc 100644
--- a/mobile/newwin.inc.php
+++ b/mobile/newwin.inc.php
@@ -16,7 +16,7 @@ $result = sql_query($sql, false);
 for ($i=0; $nw=sql_fetch_array($result); $i++)
 {
     // 이미 체크 되었다면 Continue
-    if ($_COOKIE["hd_pops_{$nw['nw_id']}"])
+    if (isset($_COOKIE["hd_pops_{$nw['nw_id']}"]) && $_COOKIE["hd_pops_{$nw['nw_id']}"])
         continue;
 ?>
 
diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css
index 17b5be269..6d548bfe0 100644
--- a/mobile/skin/board/basic/style.css
+++ b/mobile/skin/board/basic/style.css
@@ -44,7 +44,7 @@
 #bo_list .bo_subject .fa-link {width:16px;line-height:16px;background:#edd3fd;color:#b451fd;text-align:center;font-size:10px;border-radius:2px;vertical-align:baseline}
 #bo_list .bo_subject .fa-heart {color:#ff0000;text-align:center;font-size:10px;border-radius:2px}
 #bo_list .bo_subject .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin:0 4px;font-weight:bold;vertical-align:middle}
-#bo_list .bo_subject .fa-lock {display:inline-block;line-height:16px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:baseline}
+#bo_list .bo_subject .fa-lock {display:inline-block;line-height:16px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:baseline}
 
 
 #bo_cate h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
@@ -77,7 +77,7 @@
 .bo_fx {margin-bottom:5px;padding:0 10px}
 .bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_fx ul {margin:0;padding:0;list-style:none}
-#bo_list_total {margin:10px;text-align:center;padding:10px;text-align:center;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
+#bo_list_total {margin:10px;padding:10px;text-align:center;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
 
 .btn_bo_user > li {float:left;text-align:center;margin-left:5px}
 .btn_bo_adm button {border:0;padding:0 10px;background:#d13f4a;color:#fff;text-decoration:none;vertical-align:middle}
@@ -142,7 +142,7 @@
 #bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 #bo_sch select {border:0;height:38px;border-right:1px solid #f8f8f8;float:left;width:30%}
-#bo_sch .sch_input {height:38px;border:0;padding:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
+#bo_sch .sch_input {height:38px;border:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
 #bo_sch .sch_btn {height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
 .view_is_list.btn_top {position:relative;z-index:auto;top:0;left:0}
@@ -165,7 +165,7 @@
 #bo_v_table {padding:10px;color:#999;font-size:0.9em;font-weight:bold}
 
 #bo_v_title {}
-.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;border-radius:13px;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
+.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
 .bo_v_tit {display:block;font-size:1.5em;margin:10px 0 0}
 
 #bo_v_info {padding:15px 0;color:#8e8e8e;line-height:20px}
diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php
index 1810b6f39..8a3f2dd57 100644
--- a/mobile/skin/board/basic/view.skin.php
+++ b/mobile/skin/board/basic/view.skin.php
@@ -83,8 +83,8 @@ jQuery(function($){
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
             echo "</div>\n";
 		}
@@ -124,8 +124,8 @@ jQuery(function($){
     </section>
     
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -143,7 +143,7 @@ jQuery(function($){
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
          ?>
             <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <i class="fa fa-download" aria-hidden="true"></i>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong>
                     <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php
index eda34f3fa..8ddd30dd8 100644
--- a/mobile/skin/board/basic/view_comment.skin.php
+++ b/mobile/skin/board/basic/view_comment.skin.php
@@ -341,4 +341,4 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         });
     });
     </script>
-    <?php } ?>
+    <?php }
\ No newline at end of file
diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css
index a1a7762b2..e30d5014b 100644
--- a/mobile/skin/board/gallery/style.css
+++ b/mobile/skin/board/gallery/style.css
@@ -66,7 +66,7 @@
 .bo_fx {margin-bottom:5px;padding:0 10px}
 .bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_fx ul {margin:0;padding:0;list-style:none}
-#bo_list_total {margin:10px;text-align:center;padding:10px;text-align:center;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
+#bo_list_total {margin:10px;text-align:center;padding:10px;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
 
 .btn_bo_user > li {float:left;text-align:center;margin-left:5px}
 .btn_bo_adm button {border:0;padding:0 10px;background:#d13f4a;color:#fff;text-decoration:none;vertical-align:middle}
@@ -108,7 +108,7 @@
 #bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 #bo_sch select {border:0;height:38px;border-right:1px solid #f8f8f8;float:left;width:30%}
-#bo_sch .sch_input {height:38px;border:0;padding:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
+#bo_sch .sch_input {height:38px;border:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
 #bo_sch .sch_btn {height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
 .view_is_list.btn_top {position:relative;z-index:auto;top:0;left:0}
@@ -197,7 +197,7 @@
 #bo_v_table {padding:10px;color:#999;font-size:0.9em;font-weight:bold}
 
 #bo_v_title {}
-.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;border-radius:13px;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
+.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
 .bo_v_tit {display:block;font-size:1.5em;margin:10px 0 0}
 
 #bo_v_info {padding:15px 0;color:#8e8e8e;line-height:20px}
diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php
index e003a7faf..37237904e 100644
--- a/mobile/skin/board/gallery/view.skin.php
+++ b/mobile/skin/board/gallery/view.skin.php
@@ -85,8 +85,8 @@ jQuery(function($){
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
             echo "</div>\n";
 		}
@@ -126,8 +126,8 @@ jQuery(function($){
     </section>
     
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -145,7 +145,7 @@ jQuery(function($){
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
          ?>
             <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <i class="fa fa-download" aria-hidden="true"></i>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong>
                     <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php
index eda34f3fa..8ddd30dd8 100644
--- a/mobile/skin/board/gallery/view_comment.skin.php
+++ b/mobile/skin/board/gallery/view_comment.skin.php
@@ -341,4 +341,4 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         });
     });
     </script>
-    <?php } ?>
+    <?php }
\ No newline at end of file
diff --git a/mobile/skin/connect/basic/connect.skin.php b/mobile/skin/connect/basic/connect.skin.php
index 96d2da394..d1f695a6c 100644
--- a/mobile/skin/connect/basic/connect.skin.php
+++ b/mobile/skin/connect/basic/connect.skin.php
@@ -5,4 +5,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$connect_skin_url.'/style.css">', 0);
 ?>
-<?php echo $row['total_cnt'] ?>
+<?php echo $row['total_cnt'];
\ No newline at end of file
diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php
index 434bbc945..79079ec68 100644
--- a/mobile/skin/latest/basic/latest.skin.php
+++ b/mobile/skin/latest/basic/latest.skin.php
@@ -28,7 +28,8 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
             $img = $thumb['src'] ? $thumb['src'] : '';
             $img_content = $img ? '<img src="'.$img.'" alt="'.$thumb['alt'].'" >' : '';
-            
+            $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
+
             $echo_ul = ( $i && (($i % $divisor_count) === 0) ) ? '</ul><ul class="item">'.PHP_EOL : '';
 
             echo $echo_ul;
@@ -38,10 +39,10 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
                 //echo $list[$i]['icon_reply']." ";
                 
                 if( $img_content ){
-                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
+                    echo "<a href=\"".$wr_href."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
                 }
                 
-                echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
+                echo "<a href=\"".$wr_href."\" class=\"lt_tit\">";
                 if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i> ";
                 if ($list[$i]['is_notice'])
                     echo "<strong>".$list[$i]['subject']."</strong>";
diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css
index b5730bdb2..bc5efbeb0 100644
--- a/mobile/skin/latest/basic/style.css
+++ b/mobile/skin/latest/basic/style.css
@@ -19,7 +19,7 @@
 .lt .lt_cmt {background:#e9eff5;color:#3a8afd;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle}
 
 .lt .profile_img img {border-radius:50%;vertical-align:top}
-.lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
+.lt li .fa-lock {display:inline-block;line-height:14px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
 .lt li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .lt li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 .lt li .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#ff0000;background:#ffb9b9;text-align:center;border-radius:2px;vertical-align:middle}
diff --git a/mobile/skin/latest/comment/latest.skin.php b/mobile/skin/latest/comment/latest.skin.php
index 961c48b0c..9ad7b04d9 100644
--- a/mobile/skin/latest/comment/latest.skin.php
+++ b/mobile/skin/latest/comment/latest.skin.php
@@ -15,7 +15,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         <li>
             <span class="cm_lt_nick"><?php echo get_member_profile_img($member['mb_id']); ?></span>
             <div class="cm_lt_info">
-            	<a href="<?php echo $list[$i]['href']; ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
+            	<a href="<?php echo get_pretty_url($bo_table, $list[$i]['wr_id']); ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
 				<br>
 				<span class="lt_nick"><?php echo $list[$i]['name'] ?></span>
             	<span class="lt_date"><?php echo $list[$i]['datetime2'] ?></span>              
diff --git a/mobile/skin/latest/notice/latest.skin.php b/mobile/skin/latest/notice/latest.skin.php
index c59f74c6a..a59e0fb48 100644
--- a/mobile/skin/latest/notice/latest.skin.php
+++ b/mobile/skin/latest/notice/latest.skin.php
@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/mobile/skin/member/basic/login_check.skin.php b/mobile/skin/member/basic/login_check.skin.php
index 1b182915e..aea2ee5aa 100644
--- a/mobile/skin/member/basic/login_check.skin.php
+++ b/mobile/skin/member/basic/login_check.skin.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
 
-// 자신만의 코드를 넣어주세요.
-?>
+// 자신만의 코드를 넣어주세요.
\ No newline at end of file
diff --git a/mobile/skin/member/basic/point.skin.php b/mobile/skin/member/basic/point.skin.php
index 1e7c7e48a..020a6cf29 100644
--- a/mobile/skin/member/basic/point.skin.php
+++ b/mobile/skin/member/basic/point.skin.php
@@ -18,13 +18,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <ul class="point_list">
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
-
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_list">자료가 없습니다.</li>';
diff --git a/mobile/skin/qa/basic/list.skin.php b/mobile/skin/qa/basic/list.skin.php
index 0bf98e366..6d3b8cd3c 100644
--- a/mobile/skin/qa/basic/list.skin.php
+++ b/mobile/skin/qa/basic/list.skin.php
@@ -5,6 +5,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
 ?>
 
+<form name="fqalist" id="fqalist" action="./qadelete.php" onsubmit="return fqalist_submit(this);" method="post">
+<input type="hidden" name="stx" value="<?php echo $stx; ?>">
+<input type="hidden" name="sca" value="<?php echo $sca; ?>">
+<input type="hidden" name="page" value="<?php echo $page; ?>">
+<input type="hidden" name="token" value="<?php echo get_text($token); ?>">
+
 <?php if ($admin_href || $write_href) { ?>
 <ul class="btn_top top btn_bo_user">
     <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
@@ -41,11 +47,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <!-- } 카테고리 끝 -->
     <?php } ?>
 
-    <form name="fqalist" id="fqalist" action="./qadelete.php" onsubmit="return fqalist_submit(this);" method="post">
-    <input type="hidden" name="stx" value="<?php echo $stx; ?>">
-    <input type="hidden" name="sca" value="<?php echo $sca; ?>">
-    <input type="hidden" name="page" value="<?php echo $page; ?>">
-
     <?php if ($is_checkbox) { ?>
     <div class="all_chk chk_box">
         <input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);" class="selec_chk">
@@ -92,8 +93,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
             <?php if ($i == 0) { echo '<li class="empty_list">게시물이 없습니다.</li>'; } ?>
         </ul>
     </div>
-    </form>
 </div>
+</form>
 
 <?php if($is_checkbox) { ?>
 <noscript>
diff --git a/mobile/skin/qa/basic/style.css b/mobile/skin/qa/basic/style.css
index 83c9c056d..add0d9d45 100644
--- a/mobile/skin/qa/basic/style.css
+++ b/mobile/skin/qa/basic/style.css
@@ -259,6 +259,7 @@
 #bo_v_ans #ans_msg {padding:40px 0;background:#f2f5f9;text-align:center}
 #bo_v_ans .btn_submit {width:100%;height:40px;border-radius:5px}
 #bo_v_ans .btn_confirm {margin:0 10px}
+#bo_v_ans form{padding:1em}
 
 #bo_v_rel {}
 #bo_v_rel h2 {margin:0 10px 10px;font-size:1.2em}
diff --git a/mobile/skin/qa/basic/view.answerform.skin.php b/mobile/skin/qa/basic/view.answerform.skin.php
index 3eea2b9e4..671e97fef 100644
--- a/mobile/skin/qa/basic/view.answerform.skin.php
+++ b/mobile/skin/qa/basic/view.answerform.skin.php
@@ -9,12 +9,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     ?>
     <h2>답변등록</h2>
 
-    <form name="fanswer" method="post" action="./qawrite_update.php" autocomplete="off">
+    <form name="fanswer" method="post" action="./qawrite_update.php" onsubmit="return fwrite_submit(this);" autocomplete="off">
     <input type="hidden" name="qa_id" value="<?php echo $view['qa_id']; ?>">
     <input type="hidden" name="w" value="a">
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx; ?>">
     <input type="hidden" name="page" value="<?php echo $page; ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -104,6 +105,23 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
             return false;
         }
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/mobile/skin/qa/basic/view.skin.php b/mobile/skin/qa/basic/view.skin.php
index 9f1bc742b..cb88e44a0 100644
--- a/mobile/skin/qa/basic/view.skin.php
+++ b/mobile/skin/qa/basic/view.skin.php
@@ -15,15 +15,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <?php } ?>
 	<li>
 		<button type="button" class="btn_more_opt btn_b03 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
-    	<?php ob_start(); ?>
         <ul class="more_opt">
+            <?php if ($update_href) { ?><li><a href="<?php echo $update_href ?>"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 수정</a></li><?php } ?>
         	<?php if ($delete_href) { ?><li><a href="<?php echo $delete_href ?>" onclick="del(this.href); return false;"><i class="fa fa-trash-o" aria-hidden="true"></i> 삭제</a></li><?php } ?>
-			<?php if ($update_href) { ?><li><a href="<?php echo $update_href ?>"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 수정</a></li><?php } ?>
 		</ul>
-		<?php
-        $link_buttons = ob_get_contents();
-        ob_end_flush();
-		?>
 	</li>
 </ul>
 <script>
@@ -44,8 +39,6 @@ $(".btn_more_opt").on("click", function() {
 	        <h2>페이지 정보</h2>
 	        <span class="sound_only">작성자</span><strong><?php echo $view['name'] ?></strong>
 	        <span class="sound_only">작성일</span><strong><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $view['datetime']; ?></strong>
-	    	<span class="sound_only">조회</span><strong><i class="fa fa-eye" aria-hidden="true"></i> <?php echo number_format($view['wr_hit']) ?></strong>
-			<span class="sound_only">댓글</span><strong><i class="fa fa-commenting-o" aria-hidden="true"></i> <?php echo number_format($view['wr_comment']) ?></strong>
 		</div>
 		<?php if($view['email'] || $view['hp']) { ?>
         <div id="bo_v_contact">
@@ -115,8 +108,8 @@ $(".btn_more_opt").on("click", function() {
     
     <?php if ($prev_href || $next_href) { ?>
     <ul class="bo_v_nb">
-        <?php if ($prev_href) { ?><li class="bo_v_prev"><a href="<?php echo $prev_href ?>"><i class="fa fa-chevron-up" aria-hidden="true"></i><span class="sound_only">이전글</span> <?php echo $prev_wr_subject;?></a></li><?php } ?>
-        <?php if ($next_href) { ?><li class="bo_v_next"><a href="<?php echo $next_href ?>"><i class="fa fa-chevron-down" aria-hidden="true"></i><span class="sound_only">다음글</span> <?php echo $next_wr_subject;?></a></li><?php } ?>
+        <?php if ($prev_href) { ?><li class="bo_v_prev"><a href="<?php echo $prev_href ?>"><i class="fa fa-chevron-up" aria-hidden="true"></i><span class="sound_only">이전글</span> <?php echo $prev_qa_subject;?></a></li><?php } ?>
+        <?php if ($next_href) { ?><li class="bo_v_next"><a href="<?php echo $next_href ?>"><i class="fa fa-chevron-down" aria-hidden="true"></i><span class="sound_only">다음글</span> <?php echo $next_qa_subject;?></a></li><?php } ?>
     </ul>
     <?php } ?>
 </article>
diff --git a/mobile/skin/qa/basic/write.skin.php b/mobile/skin/qa/basic/write.skin.php
index e8c8c61b6..4d879f73e 100644
--- a/mobile/skin/qa/basic/write.skin.php
+++ b/mobile/skin/qa/basic/write.skin.php
@@ -13,6 +13,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -173,6 +174,25 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
         }
         <?php } ?>
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/mobile/skin/search/basic/search.skin.php b/mobile/skin/search/basic/search.skin.php
index b4db95436..5993c1c10 100644
--- a/mobile/skin/search/basic/search.skin.php
+++ b/mobile/skin/search/basic/search.skin.php
@@ -31,11 +31,11 @@ if ($stx) {
 
         <label for="sfl" class="sound_only">검색조건</label>
         <select name="sfl" id="sfl">
-            <option value="wr_subject||wr_content"<?php echo get_selected($_GET['sfl'], "wr_subject||wr_content") ?>>제목+내용</option>
-            <option value="wr_subject"<?php echo get_selected($_GET['sfl'], "wr_subject") ?>>제목</option>
-            <option value="wr_content"<?php echo get_selected($_GET['sfl'], "wr_content") ?>>내용</option>
-            <option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id") ?>>회원아이디</option>
-            <option value="wr_name"<?php echo get_selected($_GET['sfl'], "wr_name") ?>>이름</option>
+            <option value="wr_subject||wr_content"<?php echo get_selected($sfl, "wr_subject||wr_content") ?>>제목+내용</option>
+            <option value="wr_subject"<?php echo get_selected($sfl, "wr_subject") ?>>제목</option>
+            <option value="wr_content"<?php echo get_selected($sfl, "wr_content") ?>>내용</option>
+            <option value="mb_id"<?php echo get_selected($sfl, "mb_id") ?>>회원아이디</option>
+            <option value="wr_name"<?php echo get_selected($sfl, "wr_name") ?>>이름</option>
         </select>
 
         <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
diff --git a/mobile/skin/social/img/sns_gp_s.png b/mobile/skin/social/img/sns_gp_s.png
index aa0884594..0bf8c73e9 100644
Binary files a/mobile/skin/social/img/sns_gp_s.png and b/mobile/skin/social/img/sns_gp_s.png differ
diff --git a/mobile/skin/social/social_login.skin.php b/mobile/skin/social/social_login.skin.php
index 0e2871875..e52419688 100644
--- a/mobile/skin/social/social_login.skin.php
+++ b/mobile/skin/social/social_login.skin.php
@@ -41,7 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
         <?php if( social_service_check('google') ) {     //구글 로그인을 사용한다면 ?>
         <a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-google" title="구글">
             <span class="ico"></span>
-            <span class="txt">구글+<i> 로그인</i></span>
+            <span class="txt">구글<i> 로그인</i></span>
         </a>
         <?php }     //end if ?>
         <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
diff --git a/mobile/skin/social/social_outlogin.skin.1.php b/mobile/skin/social/social_outlogin.skin.1.php
index 039fee2a0..0a01a3065 100644
--- a/mobile/skin/social/social_outlogin.skin.1.php
+++ b/mobile/skin/social/social_outlogin.skin.1.php
@@ -41,7 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
         <?php if( social_service_check('google') ) {     //구글 로그인을 사용한다면 ?>
         <a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-google" title="구글">
             <span class="ico"></span>
-            <span class="txt">구글+<i> 로그인</i></span>
+            <span class="txt">구글<i> 로그인</i></span>
         </a>
         <?php }     //end if ?>
         <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
diff --git a/mobile/skin/social/social_register.skin.php b/mobile/skin/social/social_register.skin.php
index 5d8048038..f9e119ffc 100644
--- a/mobile/skin/social/social_register.skin.php
+++ b/mobile/skin/social/social_register.skin.php
@@ -42,13 +42,13 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
             <?php if( social_service_check('google') ) {     //구글 로그인을 사용한다면 ?>
             <a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-google" title="구글">
                 <span class="ico"></span>
-                <span class="txt">구글+<i> 로그인</i></span>
+                <span class="txt">구글<i> 로그인</i></span>
             </a>
             <?php }     //end if ?>
             <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
             <a href="<?php echo $self_url;?>?provider=twitter&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-twitter" title="트위터">
                 <span class="ico"></span>
-                <span class="txt">트위터+<i> 트위터</i></span>
+                <span class="txt">트위터<i> 트위터</i></span>
             </a>
             <?php }     //end if ?>
             <?php if( social_service_check('payco') ) {     //페이코 로그인을 사용한다면 ?>
diff --git a/mobile/skin/social/style.css b/mobile/skin/social/style.css
index 8897d25bd..86cebdda5 100644
--- a/mobile/skin/social/style.css
+++ b/mobile/skin/social/style.css
@@ -65,12 +65,13 @@
 /*로그인 */
 #sns_login {border:0;margin-top:15px;padding:0; border-top:1px solid #edeaea}
 #sns_login h3 {padding:0;font-weight:bold;color:#888;text-align:center}
-#sns_login .sns-icon {display:block;height:40px;line-height:40px;width:100%;margin:0 0 5px;padding-left:40px;text-align:left;color:#fff;border-radius:2px}
+#sns_login .sns-icon {position:relative;display:block;height:40px;line-height:40px;width:100%;margin:0 0 5px;padding-left:40px;text-align:left;color:#fff;border-radius:2px}
 #sns_login .sns-naver {background-color:#1fc800;background-position:5px 5px;border-bottom:1px solid #1ea505}
 #sns_login .sns-kakao {background-color:#ffeb00;background-position:5px 5px;border-bottom:1px solid #e2c10a}
 #sns_login .sns-kakao {color:#3c1e1e}
 #sns_login .sns-facebook {background-color:#3b579d;background-position:5px 5px;border-bottom:1px solid #28458f}
-#sns_login .sns-google {background-color:#db4a3a;background-position:5px 5px;border-bottom:1px solid #c03121}
+#sns_login .sns-google {background-color:#4285F4;background-position:5px 5px;border-bottom:1px solid #3567c6}
+#sns_login .sns-google .ico {position:absolute;top:3px;left:3px;width:33px;height:33px;background:url('./img/sns_gp_s.png') no-repeat center center;background-color:#fff;background-size:28px 28px!important;border-radius:2px}
 #sns_login .sns-twitter {background-color:#1ea1f2;background-position:5px 5px;border-bottom:1px solid #1e82c0}
 #sns_login .sns-payco {background-color:#df0b00;background-position:5px 5px;border-bottom:1px solid #9d0800}
 #sns_login .txt {text-align:left;padding-left:10px;border-left:1px solid rgba(0,0,0,0.1);display:block;font-weight:bold}
@@ -80,13 +81,14 @@
 #sns_register h2 {font-size:1.167em;text-align:left;padding:15px 20px;border-bottom:1px solid #dbdbdb}
 #sns_register .sns-wrap:after {display:block;visibility:hidden;clear:both;content:""}
 #sns_register .sns-wrap {display:inline-block;padding:20px;vertical-align:top;margin:0}
-#sns_register .sns-icon {display:inline-block;height:40px;line-height:40px;width:100%;margin:0 0 5px;padding-left:40px;text-align:left;color:#fff;border-radius:2px;float:left}
+#sns_register .sns-icon {position:relative;display:inline-block;height:40px;line-height:40px;width:100%;margin:0 0 5px;padding-left:40px;text-align:left;color:#fff;border-radius:2px;float:left}
 #sns_register .sns-icon:nth-child(3n+1) {clear:both}
 #sns_register .sns-naver {background-color:#1fc800;background-position:5px 5px;border-bottom:1px solid #1ea505}
 #sns_register .sns-kakao {background-color:#ffeb00;background-position:5px 5px;border-bottom:1px solid #e2c10a}
 #sns_register .sns-kakao {color:#3c1e1e}
 #sns_register .sns-facebook {background-color:#3b579d;background-position:5px 5px;border-bottom:1px solid #28458f}
-#sns_register .sns-google {background-color:#db4a3a;background-position:5px 5px;border-bottom:1px solid #c03121}
+#sns_register .sns-google {background-color:#4285F4;background-position:5px 5px;border-bottom:1px solid #3567c6}
+#sns_register .sns-google .ico {position:absolute;top:3px;left:3px;width:33px;height:33px;background:url('./img/sns_gp_s.png') no-repeat center center;background-color:#fff;background-size:28px 28px!important;border-radius:2px}
 #sns_register .sns-twitter {background-color:#1ea1f2;background-position:5px 5px;border-bottom:1px solid #1e82c0}
 #sns_register .sns-payco {background-color:#df0b00;background-position:5px 5px;border-bottom:1px solid #9d0800}
 #sns_register .txt {display:block;padding-left:10px;border-left:1px solid rgba(0,0,0,0.1);font-weight:bold}
diff --git a/mobile/tail.php b/mobile/tail.php
index f3df10c9e..5d8d10811 100644
--- a/mobile/tail.php
+++ b/mobile/tail.php
@@ -78,5 +78,4 @@ jQuery(function($) {
 </script>
 
 <?php
-include_once(G5_PATH."/tail.sub.php");
-?>
\ No newline at end of file
+include_once(G5_PATH."/tail.sub.php");
\ No newline at end of file
diff --git a/plugin/PHPMailer/LICENSE b/plugin/PHPMailer/LICENSE
index 8e0763d1c..f166cc57b 100644
--- a/plugin/PHPMailer/LICENSE
+++ b/plugin/PHPMailer/LICENSE
@@ -1,8 +1,8 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,8 +111,8 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -312,7 +312,7 @@ of these things:
     from a designated place, offer equivalent access to copy the above
     specified materials from the same place.
 
-    e) verify that the user has already received a copy of these
+    e) Verify that the user has already received a copy of these
     materials or that you have already sent this user a copy.
 
   For an executable, the required form of the "work that uses the
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,8 +455,8 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
+                     END OF TERMS AND CONDITIONS
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -499,6 +499,4 @@ necessary.  Here is a sample; alter the names:
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
-That's all there is to it!
-
-
+That's all there is to it!
\ No newline at end of file
diff --git a/plugin/PHPMailer/PHPMailerAutoload.php b/plugin/PHPMailer/PHPMailerAutoload.php
index eaa2e3034..dc066c258 100644
--- a/plugin/PHPMailer/PHPMailerAutoload.php
+++ b/plugin/PHPMailer/PHPMailerAutoload.php
@@ -30,20 +30,9 @@ function PHPMailerAutoload($classname)
     }
 }
 
-if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
-    //SPL autoloading was introduced in PHP 5.1.2
-    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-        spl_autoload_register('PHPMailerAutoload', true, true);
-    } else {
-        spl_autoload_register('PHPMailerAutoload');
-    }
+//SPL autoloading was introduced in PHP 5.1.2
+if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+    spl_autoload_register('PHPMailerAutoload', true, true);
 } else {
-    /**
-     * Fall back to traditional autoload for old PHP versions
-     * @param string $classname The name of the class to load
-     */
-    function __autoload($classname)
-    {
-        PHPMailerAutoload($classname);
-    }
-}
+    spl_autoload_register('PHPMailerAutoload');
+}
\ No newline at end of file
diff --git a/plugin/PHPMailer/VERSION b/plugin/PHPMailer/VERSION
index 07b26572f..e25a44787 100644
--- a/plugin/PHPMailer/VERSION
+++ b/plugin/PHPMailer/VERSION
@@ -1 +1 @@
-5.2.22
+5.2.28
\ No newline at end of file
diff --git a/plugin/PHPMailer/class.phpmailer.php b/plugin/PHPMailer/class.phpmailer.php
index 477ee826e..abb679614 100644
--- a/plugin/PHPMailer/class.phpmailer.php
+++ b/plugin/PHPMailer/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
      * The PHPMailer Version number.
      * @var string
      */
-    public $Version = '5.2.22';
+    public $Version = '5.2.28';
 
     /**
      * Email priority.
@@ -440,9 +440,9 @@ class PHPMailer
      *
      * Parameters:
      *   boolean $result        result of the send action
-     *   string  $to            email address of the recipient
-     *   string  $cc            cc email addresses
-     *   string  $bcc           bcc email addresses
+     *   array   $to            email addresses of the recipients
+     *   array   $cc            cc email addresses
+     *   array   $bcc           bcc email addresses
      *   string  $subject       the subject
      *   string  $body          the email body
      *   string  $from          email address of sender
@@ -659,6 +659,8 @@ class PHPMailer
         if ($exceptions !== null) {
             $this->exceptions = (boolean)$exceptions;
         }
+        //Pick an appropriate debug output format automatically
+        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
     }
 
     /**
@@ -1294,9 +1296,12 @@ class PHPMailer
 
             // Sign with DKIM if enabled
             if (!empty($this->DKIM_domain)
-                && !empty($this->DKIM_selector)
-                && (!empty($this->DKIM_private_string)
-                   || (!empty($this->DKIM_private) && file_exists($this->DKIM_private))
+                and !empty($this->DKIM_selector)
+                and (!empty($this->DKIM_private_string)
+                    or (!empty($this->DKIM_private)
+                        and self::isPermittedPath($this->DKIM_private)
+                        and file_exists($this->DKIM_private)
+                    )
                 )
             ) {
                 $header_dkim = $this->DKIM_Add(
@@ -1461,6 +1466,18 @@ class PHPMailer
         return true;
     }
 
+    /**
+     * Check whether a file path is of a permitted type.
+     * Used to reject URLs and phar files from functions that access local file paths,
+     * such as addAttachment.
+     * @param string $path A relative or absolute path to a file.
+     * @return bool
+     */
+    protected static function isPermittedPath($path)
+    {
+        return !preg_match('#^[a-z]+://#i', $path);
+    }
+
     /**
      * Send mail using the PHP mail() function.
      * @param string $header The message headers
@@ -1622,8 +1639,13 @@ class PHPMailer
 
         foreach ($hosts as $hostentry) {
             $hostinfo = array();
-            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
+            if (!preg_match(
+                '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/',
+                trim($hostentry),
+                $hostinfo
+            )) {
                 // Not a valid host entry
+                $this->edebug('Ignoring invalid host: ' . $hostentry);
                 continue;
             }
             // $hostinfo[2]: optional ssl or tls prefix
@@ -1742,6 +1764,7 @@ class PHPMailer
             'dk' => 'da',
             'no' => 'nb',
             'se' => 'sv',
+            'sr' => 'rs'
         );
 
         if (isset($renamed_langcodes[$langcode])) {
@@ -1783,7 +1806,7 @@ class PHPMailer
         // There is no English translation file
         if ($langcode != 'en') {
             // Make sure language file path is readable
-            if (!is_readable($lang_file)) {
+            if (!self::isPermittedPath($lang_file) or !is_readable($lang_file)) {
                 $foundlang = false;
             } else {
                 // Overwrite language-specific strings.
@@ -2024,10 +2047,7 @@ class PHPMailer
     {
         $result = '';
 
-        if ($this->MessageDate == '') {
-            $this->MessageDate = self::rfcDate();
-        }
-        $result .= $this->headerLine('Date', $this->MessageDate);
+        $result .= $this->headerLine('Date', $this->MessageDate == '' ? self::rfcDate() : $this->MessageDate);
 
         // To be created automatically by mail()
         if ($this->SingleTo) {
@@ -2494,6 +2514,8 @@ class PHPMailer
      * Add an attachment from a path on the filesystem.
      * Never use a user-supplied path to a file!
      * Returns false if the file could not be found or read.
+     * Explicitly *does not* support passing URLs; PHPMailer is not an HTTP client.
+     * If you need to do that, fetch the resource yourself and pass it in via a local file or string.
      * @param string $path Path to the attachment.
      * @param string $name Overrides the attachment name.
      * @param string $encoding File encoding (see $Encoding).
@@ -2505,7 +2527,7 @@ class PHPMailer
     public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
     {
         try {
-            if (!@is_file($path)) {
+            if (!self::isPermittedPath($path) or !@is_file($path)) {
                 throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
             }
 
@@ -2686,10 +2708,13 @@ class PHPMailer
     protected function encodeFile($path, $encoding = 'base64')
     {
         try {
-            if (!is_readable($path)) {
+            if (!self::isPermittedPath($path) or !file_exists($path)) {
                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
-            $magic_quotes = get_magic_quotes_runtime();
+            $magic_quotes = false;
+            if( version_compare(PHP_VERSION, '7.4.0', '<') ) {
+                $magic_quotes = get_magic_quotes_runtime();
+            }
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
                     set_magic_quotes_runtime(false);
@@ -3030,7 +3055,7 @@ class PHPMailer
      */
     public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
     {
-        if (!@is_file($path)) {
+        if (!self::isPermittedPath($path) or !@is_file($path)) {
             $this->setError($this->lang('file_access') . $path);
             return false;
         }
@@ -4033,7 +4058,7 @@ class phpmailerException extends Exception
      */
     public function errorMessage()
     {
-        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+        $errorMsg = '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
         return $errorMsg;
     }
 }
diff --git a/plugin/PHPMailer/class.pop3.php b/plugin/PHPMailer/class.pop3.php
index f10e688e3..e07a5697b 100644
--- a/plugin/PHPMailer/class.pop3.php
+++ b/plugin/PHPMailer/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
      * @var string
      * @access public
      */
-    public $Version = '5.2.22';
+    public $Version = '5.2.28';
 
     /**
      * Default POP3 port number.
diff --git a/plugin/PHPMailer/class.smtp.php b/plugin/PHPMailer/class.smtp.php
index 89321171b..d2b9a0ab2 100644
--- a/plugin/PHPMailer/class.smtp.php
+++ b/plugin/PHPMailer/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @var string
      */
-    const VERSION = '5.2.22';
+    const VERSION = '5.2.28';
 
     /**
      * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
      * @deprecated Use the `VERSION` constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.22';
+    public $Version = '5.2.28';
 
     /**
      * SMTP server port number.
@@ -150,16 +150,21 @@ class SMTP
      */
     public $Timelimit = 300;
 
-	/**
-	 * @var array patterns to extract smtp transaction id from smtp reply
-	 * Only first capture group will be use, use non-capturing group to deal with it
-	 * Extend this class to override this property to fulfil your needs.
-	 */
-	protected $smtp_transaction_id_patterns = array(
-		'exim' => '/[0-9]{3} OK id=(.*)/',
-		'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
-		'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
-	);
+    /**
+     * @var array Patterns to extract an SMTP transaction id from reply to a DATA command.
+     * The first capture group in each regex will be used as the ID.
+     */
+    protected $smtp_transaction_id_patterns = array(
+        'exim' => '/[0-9]{3} OK id=(.*)/',
+        'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
+        'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
+    );
+
+    /**
+     * @var string The last transaction ID issued in response to a DATA command,
+     * if one was detected
+     */
+    protected $last_smtp_transaction_id;
 
     /**
      * The socket for the server connection.
@@ -227,12 +232,11 @@ class SMTP
                 break;
             case 'html':
                 //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
+                echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
                     preg_replace('/[\r\n]+/', '', $str),
                     ENT_QUOTES,
                     'UTF-8'
-                )
-                . "<br>\n";
+                ) . "<br>\n";
                 break;
             case 'echo':
             default:
@@ -242,7 +246,7 @@ class SMTP
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
-                )."\n";
+                ) . "\n";
         }
     }
 
@@ -276,7 +280,8 @@ class SMTP
         }
         // Connect to the SMTP server
         $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true),
+            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            var_export($options, true),
             self::DEBUG_CONNECTION
         );
         $errno = 0;
@@ -362,14 +367,14 @@ class SMTP
         }
 
         // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
+        set_error_handler(array($this, 'errorHandler'));
+        $crypto_ok = stream_socket_enable_crypto(
             $this->smtp_conn,
             true,
             $crypto_method
-        )) {
-            return false;
-        }
-        return true;
+        );
+        restore_error_handler();
+        return $crypto_ok;
     }
 
     /**
@@ -398,8 +403,7 @@ class SMTP
         }
 
         if (array_key_exists('EHLO', $this->server_caps)) {
-        // SMTP extensions are available. Let's try to find a proper authentication method
-
+            // SMTP extensions are available; try to find a proper authentication method
             if (!array_key_exists('AUTH', $this->server_caps)) {
                 $this->setError('Authentication is not allowed at this stage');
                 // 'at this stage' means that auth may be allowed after the stage changes
@@ -424,7 +428,7 @@ class SMTP
                     $this->setError('No supported authentication methods found');
                     return false;
                 }
-                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
+                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
             }
 
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
@@ -550,7 +554,7 @@ class SMTP
      * Works like hash_hmac('md5', $data, $key)
      * in case that function is not available
      * @param string $data The data to hash
-     * @param string $key  The key to hash with
+     * @param string $key The key to hash with
      * @access protected
      * @return string
      */
@@ -710,6 +714,7 @@ class SMTP
         $savetimelimit = $this->Timelimit;
         $this->Timelimit = $this->Timelimit * 2;
         $result = $this->sendCommand('DATA END', '.', 250);
+        $this->recordLastTransactionID();
         //Restore timelimit
         $this->Timelimit = $savetimelimit;
         return $result;
@@ -893,7 +898,8 @@ class SMTP
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
             // Cut off error code from each response line
             $detail = preg_replace(
-                "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
+                "/{$code}[ -]" .
+                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . "/m",
                 '',
                 $this->last_reply
             );
@@ -989,7 +995,10 @@ class SMTP
     public function client_send($data)
     {
         $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
-        return fwrite($this->smtp_conn, $data);
+        set_error_handler(array($this, 'errorHandler'));
+        $result = fwrite($this->smtp_conn, $data);
+        restore_error_handler();
+        return $result;
     }
 
     /**
@@ -1089,8 +1098,10 @@ class SMTP
             $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
             $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
             $data .= $str;
-            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
+            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            // or 4th character is a space, we are done reading, break the loop,
+            // string array access is a micro-optimisation over strlen
+            if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) {
                 break;
             }
             // Timed-out? Log and break
@@ -1105,7 +1116,7 @@ class SMTP
             // Now check if reads took too long
             if ($endtime and time() > $endtime) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached ('.
+                    'SMTP -> get_lines(): timelimit reached (' .
                     $this->Timelimit . ' sec)',
                     self::DEBUG_LOWLEVEL
                 );
@@ -1208,42 +1219,58 @@ class SMTP
      * Reports an error number and string.
      * @param integer $errno The error number returned by PHP.
      * @param string $errmsg The error message returned by PHP.
+     * @param string $errfile The file the error occurred in
+     * @param integer $errline The line number the error occurred on
      */
-    protected function errorHandler($errno, $errmsg)
+    protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0)
     {
-        $notice = 'Connection: Failed to connect to server.';
+        $notice = 'Connection failed.';
         $this->setError(
             $notice,
             $errno,
             $errmsg
         );
         $this->edebug(
-            $notice . ' Error number ' . $errno . '. "Error notice: ' . $errmsg,
+            $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]",
             self::DEBUG_CONNECTION
         );
     }
 
-	/**
-	 * Will return the ID of the last smtp transaction based on a list of patterns provided
-	 * in SMTP::$smtp_transaction_id_patterns.
-	 * If no reply has been received yet, it will return null.
-	 * If no pattern has been matched, it will return false.
-	 * @return bool|null|string
-	 */
-	public function getLastTransactionID()
-	{
-		$reply = $this->getLastReply();
+    /**
+     * Extract and return the ID of the last SMTP transaction based on
+     * a list of patterns provided in SMTP::$smtp_transaction_id_patterns.
+     * Relies on the host providing the ID in response to a DATA command.
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     */
+    protected function recordLastTransactionID()
+    {
+        $reply = $this->getLastReply();
 
-		if (empty($reply)) {
-			return null;
-		}
+        if (empty($reply)) {
+            $this->last_smtp_transaction_id = null;
+        } else {
+            $this->last_smtp_transaction_id = false;
+            foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
+                if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
+                    $this->last_smtp_transaction_id = $matches[1];
+                }
+            }
+        }
 
-		foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
-			if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
-				return $matches[1];
-			}
-		}
+        return $this->last_smtp_transaction_id;
+    }
 
-		return false;
+    /**
+     * Get the queue/transaction ID of the last SMTP transaction
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     * @see recordLastTransactionID()
+     */
+    public function getLastTransactionID()
+    {
+        return $this->last_smtp_transaction_id;
     }
 }
diff --git a/plugin/PHPMailer/composer.json b/plugin/PHPMailer/composer.json
index 1112fb99a..a0ac29649 100644
--- a/plugin/PHPMailer/composer.json
+++ b/plugin/PHPMailer/composer.json
@@ -20,11 +20,28 @@
         }
     ],
     "require": {
+        "ext-ctype": "*",
         "php": ">=5.0.0"
     },
     "require-dev": {
-        "phpdocumentor/phpdocumentor": "*",
-        "phpunit/phpunit": "4.7.*"
+        "doctrine/annotations": "1.2.*",
+        "jms/serializer": "0.16.*",
+        "phpdocumentor/phpdocumentor": "2.*",
+        "phpunit/phpunit": "4.8.*",
+        "symfony/debug": "2.8.*",
+        "symfony/filesystem": "2.8.*",
+        "symfony/translation": "2.8.*",
+        "symfony/yaml": "2.8.*",
+        "zendframework/zend-cache": "2.5.1",
+        "zendframework/zend-config": "2.5.1",
+        "zendframework/zend-eventmanager": "2.5.1",
+        "zendframework/zend-filter": "2.5.1",
+        "zendframework/zend-i18n": "2.5.1",
+        "zendframework/zend-json": "2.5.1",
+        "zendframework/zend-math": "2.5.1",
+        "zendframework/zend-serializer": "2.5.*",
+        "zendframework/zend-servicemanager": "2.5.*",
+        "zendframework/zend-stdlib": "2.5.1"
     },
     "suggest": {
         "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
diff --git a/plugin/PHPMailer/composer.lock b/plugin/PHPMailer/composer.lock
index 9edbf55c9..9808f2832 100644
--- a/plugin/PHPMailer/composer.lock
+++ b/plugin/PHPMailer/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ca5abc72444d9608a35c39f9064c139b",
-    "content-hash": "8b66ed71ae9ca8cd0258c814615d624f",
+    "content-hash": "7e4b1bef833056eed0df39fad5399d7a",
     "packages": [],
     "packages-dev": [
         {
@@ -65,7 +64,7 @@
                 "cli",
                 "microframework"
             ],
-            "time": "2014-03-29 14:03:13"
+            "time": "2014-03-29T14:03:13+00:00"
         },
         {
             "name": "cilex/console-service-provider",
@@ -124,34 +123,7 @@
                 "service-provider",
                 "silex"
             ],
-            "time": "2012-12-19 10:50:58"
-        },
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
-                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "time": "2014-12-30 15:22:37"
+            "time": "2012-12-19T10:50:58+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -219,7 +191,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2015-08-31 12:32:49"
+            "time": "2015-08-31T12:32:49+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -273,7 +245,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -327,22 +299,25 @@
                 "lexer",
                 "parser"
             ],
-            "time": "2014-09-09 13:34:57"
+            "time": "2014-09-09T13:34:57+00:00"
         },
         {
             "name": "erusev/parsedown",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
-                "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -366,19 +341,19 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2015-10-04 16:44:32"
+            "time": "2016-11-02T15:56:58+00:00"
         },
         {
             "name": "herrera-io/json",
             "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/kherge-abandoned/php-json.git",
+                "url": "https://github.com/kherge-php/json.git",
                 "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kherge-abandoned/php-json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1",
+                "url": "https://api.github.com/repos/kherge-php/json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1",
                 "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1",
                 "shasum": ""
             },
@@ -427,7 +402,8 @@
                 "schema",
                 "validate"
             ],
-            "time": "2013-10-30 16:51:34"
+            "abandoned": "kherge/json",
+            "time": "2013-10-30T16:51:34+00:00"
         },
         {
             "name": "herrera-io/phar-update",
@@ -485,27 +461,29 @@
                 "phar",
                 "update"
             ],
-            "time": "2013-10-30 17:23:01"
+            "abandoned": true,
+            "time": "2013-10-30T17:23:01+00:00"
         },
         {
             "name": "jms/metadata",
-            "version": "1.5.1",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/metadata.git",
-                "reference": "22b72455559a25777cfd28c4ffda81ff7639f353"
+                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353",
-                "reference": "22b72455559a25777cfd28c4ffda81ff7639f353",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab",
+                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "doctrine/cache": "~1.0"
+                "doctrine/cache": "~1.0",
+                "symfony/cache": "~3.1"
             },
             "type": "library",
             "extra": {
@@ -520,14 +498,12 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache"
+                "Apache-2.0"
             ],
             "authors": [
                 {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
             "description": "Class/method/property metadata management in PHP",
@@ -537,7 +513,7 @@
                 "xml",
                 "yaml"
             ],
-            "time": "2014-07-12 07:13:19"
+            "time": "2016-12-05T10:18:33+00:00"
         },
         {
             "name": "jms/parser-lib",
@@ -572,45 +548,40 @@
                 "Apache2"
             ],
             "description": "A library for easily creating recursive-descent parsers.",
-            "time": "2012-11-18 18:08:43"
+            "time": "2012-11-18T18:08:43+00:00"
         },
         {
             "name": "jms/serializer",
-            "version": "1.1.0",
+            "version": "0.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48"
+                "reference": "c8a171357ca92b6706e395c757f334902d430ea9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48",
-                "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9",
+                "reference": "c8a171357ca92b6706e395c757f334902d430ea9",
                 "shasum": ""
             },
             "require": {
                 "doctrine/annotations": "1.*",
-                "doctrine/instantiator": "~1.0.3",
                 "jms/metadata": "~1.1",
                 "jms/parser-lib": "1.*",
-                "php": ">=5.4.0",
+                "php": ">=5.3.2",
                 "phpcollection/phpcollection": "~0.1"
             },
-            "conflict": {
-                "twig/twig": "<1.12"
-            },
             "require-dev": {
                 "doctrine/orm": "~2.1",
                 "doctrine/phpcr-odm": "~1.0.1",
                 "jackalope/jackalope-doctrine-dbal": "1.0.*",
-                "phpunit/phpunit": "~4.0",
                 "propel/propel1": "~1.7",
                 "symfony/filesystem": "2.*",
                 "symfony/form": "~2.1",
                 "symfony/translation": "~2.0",
                 "symfony/validator": "~2.0",
                 "symfony/yaml": "2.*",
-                "twig/twig": "~1.12|~2.0"
+                "twig/twig": ">=1.8,<2.0-dev"
             },
             "suggest": {
                 "symfony/yaml": "Required if you'd like to serialize data to YAML format."
@@ -618,7 +589,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "0.15-dev"
                 }
             },
             "autoload": {
@@ -632,8 +603,10 @@
             ],
             "authors": [
                 {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "https://github.com/schmittjoh",
+                    "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
             "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
@@ -645,7 +618,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2015-10-27 09:24:41"
+            "time": "2014-03-18T08:39:00+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -711,7 +684,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2016-01-25 15:43:01"
+            "time": "2016-01-25T15:43:01+00:00"
         },
         {
             "name": "kherge/version",
@@ -754,20 +727,21 @@
             ],
             "description": "A parsing and comparison library for semantic versioning.",
             "homepage": "http://github.com/kherge/Version",
-            "time": "2012-08-16 17:13:03"
+            "abandoned": true,
+            "time": "2012-08-16T17:13:03+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "1.19.0",
+            "version": "1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf"
+                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf",
-                "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
+                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
                 "shasum": ""
             },
             "require": {
@@ -778,7 +752,7 @@
                 "psr/log-implementation": "1.0.0"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "^2.4.9",
+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
                 "jakub-onderka/php-parallel-lint": "0.9",
@@ -786,8 +760,8 @@
                 "php-console/php-console": "^3.1.3",
                 "phpunit/phpunit": "~4.5",
                 "phpunit/phpunit-mock-objects": "2.3.0",
-                "raven/raven": "^0.13",
                 "ruflin/elastica": ">=0.90 <3.0",
+                "sentry/sentry": "^0.13",
                 "swiftmailer/swiftmailer": "~5.3"
             },
             "suggest": {
@@ -799,9 +773,9 @@
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
                 "php-console/php-console": "Allow sending log messages to Google Chrome",
-                "raven/raven": "Allow sending log messages to a Sentry server",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+                "sentry/sentry": "Allow sending log messages to a Sentry server"
             },
             "type": "library",
             "extra": {
@@ -832,7 +806,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2016-04-12 18:29:35"
+            "time": "2017-03-13T07:08:03+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -877,20 +851,20 @@
                 "parser",
                 "php"
             ],
-            "time": "2015-09-19 14:15:08"
+            "time": "2015-09-19T14:15:08+00:00"
         },
         {
             "name": "phpcollection/phpcollection",
-            "version": "0.4.0",
+            "version": "0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-collection.git",
-                "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83"
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/b8bf55a0a929ca43b01232b36719f176f86c7e83",
-                "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
                 "shasum": ""
             },
             "require": {
@@ -899,7 +873,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.3-dev"
+                    "dev-master": "0.4-dev"
                 }
             },
             "autoload": {
@@ -914,9 +888,7 @@
             "authors": [
                 {
                     "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
             "description": "General-Purpose Collection Library for PHP",
@@ -927,7 +899,7 @@
                 "sequence",
                 "set"
             ],
-            "time": "2014-03-11 13:46:42"
+            "time": "2015-05-17T12:39:23+00:00"
         },
         {
             "name": "phpdocumentor/fileset",
@@ -970,7 +942,7 @@
                 "fileset",
                 "phpdoc"
             ],
-            "time": "2013-08-06 21:07:42"
+            "time": "2013-08-06T21:07:42+00:00"
         },
         {
             "name": "phpdocumentor/graphviz",
@@ -1011,7 +983,7 @@
                     "email": "mike.vanriel@naenius.com"
                 }
             ],
-            "time": "2016-02-02 13:00:08"
+            "time": "2016-02-02T13:00:08+00:00"
         },
         {
             "name": "phpdocumentor/phpdocumentor",
@@ -1100,7 +1072,7 @@
                 "documentation",
                 "phpdoc"
             ],
-            "time": "2016-05-22 09:50:56"
+            "time": "2016-05-22T09:50:56+00:00"
         },
         {
             "name": "phpdocumentor/reflection",
@@ -1154,7 +1126,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2016-05-21 08:42:32"
+            "time": "2016-05-21T08:42:32+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -1203,7 +1175,7 @@
                     "email": "mike.vanriel@naenius.com"
                 }
             ],
-            "time": "2015-02-03 12:10:50"
+            "time": "2015-02-03T12:10:50+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -1253,31 +1225,32 @@
                 "php",
                 "type"
             ],
-            "time": "2015-07-25 16:39:46"
+            "time": "2015-07-25T16:39:46+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.6.1",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0"
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.0"
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
             },
             "type": "library",
             "extra": {
@@ -1315,7 +1288,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-06-07 08:13:47"
+            "time": "2017-03-02T20:05:34+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1377,20 +1350,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-06 15:47:00"
+            "time": "2015-10-06T15:47:00+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
                 "shasum": ""
             },
             "require": {
@@ -1424,7 +1397,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2015-06-21 13:08:43"
+            "time": "2016-10-03T07:40:28+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -1465,29 +1438,34 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.8",
+            "version": "1.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4|~5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1509,20 +1487,20 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2017-02-26T11:10:40+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
+            "version": "1.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
                 "shasum": ""
             },
             "require": {
@@ -1558,20 +1536,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-09-15 10:49:45"
+            "time": "2017-02-27T10:12:30+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.7.7",
+            "version": "4.8.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "9b97f9d807b862c2de2a36e86690000801c85724"
+                "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724",
-                "reference": "9b97f9d807b862c2de2a36e86690000801c85724",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87",
+                "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
                 "shasum": ""
             },
             "require": {
@@ -1581,15 +1559,15 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpspec/prophecy": "^1.3.1",
                 "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/php-timer": "^1.0.6",
                 "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
+                "sebastian/comparator": "~1.2.2",
                 "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.2",
+                "sebastian/environment": "~1.3",
                 "sebastian/exporter": "~1.2",
                 "sebastian/global-state": "~1.0",
                 "sebastian/version": "~1.0",
@@ -1604,7 +1582,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.7.x-dev"
+                    "dev-master": "4.8.x-dev"
                 }
             },
             "autoload": {
@@ -1630,7 +1608,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-07-13 11:28:34"
+            "time": "2017-02-06T05:18:07+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1686,7 +1664,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-10-02 06:51:40"
+            "time": "2015-10-02T06:51:40+00:00"
         },
         {
             "name": "pimple/pimple",
@@ -1734,26 +1712,34 @@
                 "container",
                 "dependency injection"
             ],
-            "time": "2013-11-22 08:30:29"
+            "time": "2013-11-22T08:30:29+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.0.0",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3.0"
+            },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
             "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1767,31 +1753,32 @@
                 }
             ],
             "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
             "keywords": [
                 "log",
                 "psr",
                 "psr-3"
             ],
-            "time": "2012-12-21 11:40:51"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.2.0",
+            "version": "1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
                 "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
+                "sebastian/exporter": "~1.2 || ~2.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.4"
@@ -1836,7 +1823,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2015-07-26 15:48:44"
+            "time": "2017-01-29T09:50:25+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -1888,27 +1875,27 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08 07:14:41"
+            "time": "2015-12-08T07:14:41+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "1.3.7",
+            "version": "1.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^4.8 || ^5.0"
             },
             "type": "library",
             "extra": {
@@ -1938,7 +1925,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-05-17 03:18:57"
+            "time": "2016-08-18T05:49:44+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -2005,7 +1992,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17 09:04:28"
+            "time": "2016-06-17T09:04:28+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -2056,20 +2043,20 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12 03:26:01"
+            "time": "2015-10-12T03:26:01+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "1.0.2",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                 "shasum": ""
             },
             "require": {
@@ -2109,7 +2096,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
+            "time": "2016-10-03T07:41:43+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2144,25 +2131,28 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
+            "time": "2015-06-21T13:59:46+00:00"
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.4.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "66834d3e3566bb5798db7294619388786ae99394"
+                "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/66834d3e3566bb5798db7294619388786ae99394",
-                "reference": "66834d3e3566bb5798db7294619388786ae99394",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/791f8c594f300d246cdf01c6b3e1e19611e301d8",
+                "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3 || ^7.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
             "bin": [
                 "bin/jsonlint"
             ],
@@ -2190,26 +2180,29 @@
                 "parser",
                 "validator"
             ],
-            "time": "2015-11-21 02:21:41"
+            "time": "2017-03-06T16:42:24+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v2.8.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "a2edd59c2163c65747fc3f35d132b5a39266bd05"
+                "reference": "06ce6bb46c24963ec09323da45d0f4f85d3cecd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/a2edd59c2163c65747fc3f35d132b5a39266bd05",
-                "reference": "a2edd59c2163c65747fc3f35d132b5a39266bd05",
+                "url": "https://api.github.com/repos/symfony/config/zipball/06ce6bb46c24963ec09323da45d0f4f85d3cecd2",
+                "reference": "06ce6bb46c24963ec09323da45d0f4f85d3cecd2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
                 "symfony/filesystem": "~2.3|~3.0.0"
             },
+            "require-dev": {
+                "symfony/yaml": "~2.7|~3.0.0"
+            },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
             },
@@ -2243,24 +2236,25 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2017-03-01T18:13:50+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3"
+                "reference": "81508e6fac4476771275a3f4f53c3fee9b956bfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
-                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/81508e6fac4476771275a3f4f53c3fee9b956bfa",
+                "reference": "81508e6fac4476771275a3f4f53c3fee9b956bfa",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
+                "symfony/debug": "^2.7.2|~3.0.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
@@ -2303,20 +2297,77 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 15:06:25"
+            "time": "2017-03-04T11:00:12+00:00"
         },
         {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.8.7",
+            "name": "symfony/debug",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "2a6b8713f8bdb582058cfda463527f195b066110"
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110",
-                "reference": "2a6b8713f8bdb582058cfda463527f195b066110",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e90099a2958d4833a02d05b504cc06e1c234abcc",
+                "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/class-loader": "~2.2|~3.0.0",
+                "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18T19:13:35+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "bb4ec47e8e109c1c1172145732d0aa468d967cd0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bb4ec47e8e109c1c1172145732d0aa468d967cd0",
+                "reference": "bb4ec47e8e109c1c1172145732d0aa468d967cd0",
                 "shasum": ""
             },
             "require": {
@@ -2324,7 +2375,7 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/config": "^2.0.5|~3.0.0",
                 "symfony/dependency-injection": "~2.6|~3.0.0",
                 "symfony/expression-language": "~2.6|~3.0.0",
                 "symfony/stopwatch": "~2.3|~3.0.0"
@@ -2363,29 +2414,29 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2017-02-21T08:33:48+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.0.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "74fec3511b62cb934b64bce1d96f06fffa4beafd"
+                "reference": "e542d4765092d22552b1bf01ddccfb01d98ee325"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/74fec3511b62cb934b64bce1d96f06fffa4beafd",
-                "reference": "74fec3511b62cb934b64bce1d96f06fffa4beafd",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e542d4765092d22552b1bf01ddccfb01d98ee325",
+                "reference": "e542d4765092d22552b1bf01ddccfb01d98ee325",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": ">=5.3.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -2412,20 +2463,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2016-04-12 18:09:53"
+            "time": "2017-02-18T17:06:33+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.8.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "3ec095fab1800222732ca522a95dce8fa124007b"
+                "reference": "5fc4b5cab38b9d28be318fcffd8066988e7d9451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3ec095fab1800222732ca522a95dce8fa124007b",
-                "reference": "3ec095fab1800222732ca522a95dce8fa124007b",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5fc4b5cab38b9d28be318fcffd8066988e7d9451",
+                "reference": "5fc4b5cab38b9d28be318fcffd8066988e7d9451",
                 "shasum": ""
             },
             "require": {
@@ -2461,20 +2512,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2017-02-21T08:33:48+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594"
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
                 "shasum": ""
             },
             "require": {
@@ -2486,7 +2537,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -2520,20 +2571,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-05-18 14:26:46"
+            "time": "2016-11-14T01:06:16+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v2.8.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c"
+                "reference": "41336b20b52f5fd5b42a227e394e673c8071118f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/115347d00c342198cdc52a7bd8bc15b5ab43500c",
-                "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c",
+                "url": "https://api.github.com/repos/symfony/process/zipball/41336b20b52f5fd5b42a227e394e673c8071118f",
+                "reference": "41336b20b52f5fd5b42a227e394e673c8071118f",
                 "shasum": ""
             },
             "require": {
@@ -2569,20 +2620,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2017-03-04T12:20:59+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v2.8.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "5e628055488bcc42dbace3af65be435d094e37e4"
+                "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5e628055488bcc42dbace3af65be435d094e37e4",
-                "reference": "5e628055488bcc42dbace3af65be435d094e37e4",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9e4369666d02ee9b8830da878b7f6a769eb96f4b",
+                "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b",
                 "shasum": ""
             },
             "require": {
@@ -2618,34 +2669,34 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2017-02-18T17:06:33+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.0.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7"
+                "reference": "b538355bc99db2ec7cc35284ec76d92ae7d1d256"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7",
-                "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b538355bc99db2ec7cc35284ec76d92ae7d1d256",
+                "reference": "b538355bc99db2ec7cc35284ec76d92ae7d1d256",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": ">=5.3.9",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/config": "<2.8"
+                "symfony/config": "<2.7"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "~2.8|~3.0",
-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/config": "~2.8",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+                "symfony/yaml": "~2.2|~3.0.0"
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
@@ -2655,7 +2706,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -2682,20 +2733,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:33:26"
+            "time": "2017-03-04T12:20:59+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v2.8.7",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "4c8f9fd8e2150dbc4745ef13378e690588365df0"
+                "reference": "8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/4c8f9fd8e2150dbc4745ef13378e690588365df0",
-                "reference": "4c8f9fd8e2150dbc4745ef13378e690588365df0",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63",
+                "reference": "8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63",
                 "shasum": ""
             },
             "require": {
@@ -2706,13 +2757,13 @@
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
-                "egulias/email-validator": "~1.2,>=1.2.1",
+                "egulias/email-validator": "^1.2.1",
                 "symfony/config": "~2.2|~3.0.0",
                 "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/http-foundation": "~2.1|~3.0.0",
-                "symfony/intl": "~2.7.4|~2.8|~3.0.0",
+                "symfony/http-foundation": "~2.3|~3.0.0",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
                 "symfony/property-access": "~2.3|~3.0.0",
-                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
+                "symfony/yaml": "^2.0.5|~3.0.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
@@ -2755,29 +2806,29 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2016-04-14 08:48:44"
+            "time": "2017-02-28T02:24:56+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.1.1",
+            "version": "v2.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623"
+                "reference": "2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623",
-                "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d",
+                "reference": "2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": ">=5.3.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -2804,33 +2855,34 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-14 11:18:07"
+            "time": "2017-03-01T18:13:50+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.24.1",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
+                "reference": "9935b662e24d6e634da88901ab534cc12e8c728f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512",
-                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9935b662e24d6e634da88901ab534cc12e8c728f",
+                "reference": "9935b662e24d6e634da88901ab534cc12e8c728f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.7"
             },
             "require-dev": {
+                "psr/container": "^1.0",
                 "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~2.7"
+                "symfony/phpunit-bridge": "~3.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.24-dev"
+                    "dev-master": "1.32-dev"
                 }
             },
             "autoload": {
@@ -2865,45 +2917,40 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2016-05-30 09:11:59"
+            "time": "2017-02-27T00:07:03+00:00"
         },
         {
             "name": "zendframework/zend-cache",
-            "version": "2.7.1",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-cache.git",
-                "reference": "2c68def8f96ce842d2f2a9a69e2f3508c2f5312d"
+                "reference": "5999e5a03f7dcf82abbbe67eea74da641f959684"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/2c68def8f96ce842d2f2a9a69e2f3508c2f5312d",
-                "reference": "2c68def8f96ce842d2f2a9a69e2f3508c2f5312d",
+                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/5999e5a03f7dcf82abbbe67eea74da641f959684",
+                "reference": "5999e5a03f7dcf82abbbe67eea74da641f959684",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-serializer": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5",
+                "zendframework/zend-stdlib": "~2.5"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "1.7.*",
-                "phpbench/phpbench": "^0.10.0",
-                "phpunit/phpunit": "^4.5",
-                "zendframework/zend-serializer": "^2.6",
-                "zendframework/zend-session": "^2.6.2"
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-session": "~2.5"
             },
             "suggest": {
-                "ext-apc": "APC or compatible extension, to use the APC storage adapter",
-                "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter",
+                "ext-apc": "APC >= 3.1.6 to use the APC storage adapter",
                 "ext-dba": "DBA, to use the DBA storage adapter",
-                "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
                 "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
                 "ext-mongo": "Mongo, to use MongoDb storage adapter",
-                "ext-redis": "Redis, to use Redis storage adapter",
                 "ext-wincache": "WinCache, to use the WinCache storage adapter",
-                "ext-xcache": "XCache, to use the XCache storage adapter",
                 "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement",
                 "zendframework/zend-serializer": "Zend\\Serializer component",
                 "zendframework/zend-session": "Zend\\Session component"
@@ -2911,12 +2958,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Cache",
-                    "config-provider": "Zend\\Cache\\ConfigProvider"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -2934,33 +2977,34 @@
                 "cache",
                 "zf2"
             ],
-            "time": "2016-05-12 21:47:55"
+            "time": "2015-06-03T15:31:59+00:00"
         },
         {
             "name": "zendframework/zend-config",
-            "version": "2.6.0",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-config.git",
-                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
+                "reference": "ec49b1df1bdd9772df09dc2f612fbfc279bf4c27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/ec49b1df1bdd9772df09dc2f612fbfc279bf4c27",
+                "reference": "ec49b1df1bdd9772df09dc2f612fbfc279bf4c27",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "1.7.*",
                 "phpunit/phpunit": "~4.0",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-i18n": "^2.5",
-                "zendframework/zend-json": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-i18n": "~2.5",
+                "zendframework/zend-json": "~2.5",
+                "zendframework/zend-mvc": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5"
             },
             "suggest": {
                 "zendframework/zend-filter": "Zend\\Filter component",
@@ -2971,8 +3015,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -2990,41 +3034,35 @@
                 "config",
                 "zf2"
             ],
-            "time": "2016-02-04 23:01:10"
+            "time": "2015-06-03T15:32:00+00:00"
         },
         {
             "name": "zendframework/zend-eventmanager",
-            "version": "3.0.1",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-eventmanager.git",
-                "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e"
+                "reference": "d94a16039144936f107f906896349900fd634443"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e",
-                "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e",
+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d94a16039144936f107f906896349900fd634443",
+                "reference": "d94a16039144936f107f906896349900fd634443",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
             },
             "require-dev": {
-                "athletic/athletic": "^0.1",
-                "container-interop/container-interop": "^1.1.0",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.0",
-                "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
-            },
-            "suggest": {
-                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
-                "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev",
-                    "dev-develop": "3.1-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3036,57 +3074,52 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Trigger and listen to events within a PHP application",
             "homepage": "https://github.com/zendframework/zend-eventmanager",
             "keywords": [
-                "event",
                 "eventmanager",
-                "events",
                 "zf2"
             ],
-            "time": "2016-02-18 20:53:00"
+            "time": "2015-06-03T15:32:01+00:00"
         },
         {
             "name": "zendframework/zend-filter",
-            "version": "2.7.1",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-filter.git",
-                "reference": "84c50246428efb0a1e52868e162dab3e149d5b80"
+                "reference": "93e6990a198e6cdd811064083acac4693f4b29ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/84c50246428efb0a1e52868e162dab3e149d5b80",
-                "reference": "84c50246428efb0a1e52868e162dab3e149d5b80",
+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/93e6990a198e6cdd811064083acac4693f4b29ae",
+                "reference": "93e6990a198e6cdd811064083acac4693f4b29ae",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "1.7.*",
-                "pear/archive_tar": "^1.4",
                 "phpunit/phpunit": "~4.0",
-                "zendframework/zend-crypt": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-uri": "^2.5"
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-crypt": "~2.5",
+                "zendframework/zend-i18n": "~2.5",
+                "zendframework/zend-loader": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5",
+                "zendframework/zend-uri": "~2.5"
             },
             "suggest": {
-                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
-                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
-                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
+                "zendframework/zend-crypt": "Zend\\Crypt component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Filter",
-                    "config-provider": "Zend\\Filter\\ConfigProvider"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3104,94 +3137,36 @@
                 "filter",
                 "zf2"
             ],
-            "time": "2016-04-18 18:32:43"
-        },
-        {
-            "name": "zendframework/zend-hydrator",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-hydrator.git",
-                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.0@dev",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-inputfilter": "^2.6",
-                "zendframework/zend-serializer": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-            },
-            "suggest": {
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
-                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-release-1.0": "1.0-dev",
-                    "dev-release-1.1": "1.1-dev",
-                    "dev-master": "2.0-dev",
-                    "dev-develop": "2.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Hydrator\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-hydrator",
-            "keywords": [
-                "hydrator",
-                "zf2"
-            ],
-            "time": "2016-02-18 22:38:26"
+            "time": "2015-06-03T15:32:01+00:00"
         },
         {
             "name": "zendframework/zend-i18n",
-            "version": "2.7.3",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-i18n.git",
-                "reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8"
+                "reference": "509271eb7947e4aabebfc376104179cffea42696"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
-                "reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/509271eb7947e4aabebfc376104179cffea42696",
+                "reference": "509271eb7947e4aabebfc376104179cffea42696",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "1.7.*",
                 "phpunit/phpunit": "~4.0",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-config": "^2.6",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-filter": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-validator": "^2.6",
-                "zendframework/zend-view": "^2.6.3"
+                "zendframework/zend-cache": "~2.5",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5",
+                "zendframework/zend-validator": "~2.5",
+                "zendframework/zend-view": "~2.5"
             },
             "suggest": {
                 "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
@@ -3199,7 +3174,7 @@
                 "zendframework/zend-config": "Zend\\Config component",
                 "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
                 "zendframework/zend-filter": "You should install this package to use the provided filters",
-                "zendframework/zend-i18n-resources": "Translation resources",
+                "zendframework/zend-resources": "Translation resources",
                 "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
                 "zendframework/zend-validator": "You should install this package to use the provided validators",
                 "zendframework/zend-view": "You should install this package to use the provided view helpers"
@@ -3207,12 +3182,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
-                },
-                "zf": {
-                    "component": "Zend\\I18n",
-                    "config-provider": "Zend\\I18n\\ConfigProvider"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3229,39 +3200,43 @@
                 "i18n",
                 "zf2"
             ],
-            "time": "2016-06-07 21:08:30"
+            "time": "2015-06-03T15:32:01+00:00"
         },
         {
             "name": "zendframework/zend-json",
-            "version": "3.0.0",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-json.git",
-                "reference": "f42a1588e75c2a3e338cd94c37906231e616daab"
+                "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/f42a1588e75c2a3e338cd94c37906231e616daab",
-                "reference": "f42a1588e75c2a3e338cd94c37906231e616daab",
+                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/c74eaf17d2dd37dc1e964be8dfde05706a821ebc",
+                "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
             },
             "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
                 "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.3",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "zendframework/zend-http": "~2.5",
+                "zendframework/zend-server": "~2.5",
+                "zendframework/zendxml": "~1.0"
             },
             "suggest": {
-                "zendframework/zend-json-server": "For implementing JSON-RPC servers",
-                "zendframework/zend-xml2json": "For converting XML documents to JSON"
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-server": "Zend\\Server component",
+                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev",
-                    "dev-develop": "3.1-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3279,46 +3254,93 @@
                 "json",
                 "zf2"
             ],
-            "time": "2016-04-01 02:34:00"
+            "time": "2015-06-03T15:32:01+00:00"
         },
         {
-            "name": "zendframework/zend-serializer",
-            "version": "2.8.0",
+            "name": "zendframework/zend-math",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-serializer.git",
-                "reference": "ff74ea020f5f90866eb28365327e9bc765a61a6e"
+                "url": "https://github.com/zendframework/zend-math.git",
+                "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/ff74ea020f5f90866eb28365327e9bc765a61a6e",
-                "reference": "ff74ea020f5f90866eb28365327e9bc765a61a6e",
+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/9f02a1ac4d3374d3332c80f9215deec9c71558fc",
+                "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-json": "^2.5 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": ">=5.3.23"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5",
-                "squizlabs/php_codesniffer": "^2.3.1",
-                "zendframework/zend-math": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "fabpot/php-cs-fixer": "1.7.*",
+                "ircmaxell/random-lib": "~1.1",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-servicemanager": "~2.5"
             },
             "suggest": {
-                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+                "ext-bcmath": "If using the bcmath functionality",
+                "ext-gmp": "If using the gmp functionality",
+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Serializer",
-                    "config-provider": "Zend\\Serializer\\ConfigProvider"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Math\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-math",
+            "keywords": [
+                "math",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:02+00:00"
+        },
+        {
+            "name": "zendframework/zend-serializer",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-serializer.git",
+                "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/b7208eb17dc4a4fb3a660b85e6c4af035eeed40c",
+                "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-json": "~2.5",
+                "zendframework/zend-math": "~2.5",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3336,28 +3358,26 @@
                 "serializer",
                 "zf2"
             ],
-            "time": "2016-06-21 17:01:55"
+            "time": "2015-06-03T15:32:02+00:00"
         },
         {
             "name": "zendframework/zend-servicemanager",
-            "version": "2.7.6",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "a6db4d13b9141fccce5dcb553df0295d6ad7d477"
+                "reference": "3b22c403e351d92526c642cba0bd810bc22e1c56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/a6db4d13b9141fccce5dcb553df0295d6ad7d477",
-                "reference": "a6db4d13b9141fccce5dcb553df0295d6ad7d477",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/3b22c403e351d92526c642cba0bd810bc22e1c56",
+                "reference": "3b22c403e351d92526c642cba0bd810bc22e1c56",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "~1.0",
-                "php": "^5.5 || ^7.0"
+                "php": ">=5.3.23"
             },
             "require-dev": {
-                "athletic/athletic": "dev-master",
                 "fabpot/php-cs-fixer": "1.7.*",
                 "phpunit/phpunit": "~4.0",
                 "zendframework/zend-di": "~2.5",
@@ -3370,8 +3390,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "3.0-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3388,28 +3408,26 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2016-04-27 19:07:40"
+            "time": "2015-06-03T15:32:02+00:00"
         },
         {
             "name": "zendframework/zend-stdlib",
-            "version": "2.7.7",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f"
+                "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f",
-                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cc8e90a60dd5d44b9730b77d07b97550091da1ae",
+                "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-hydrator": "~1.1"
+                "php": ">=5.3.23"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1",
                 "fabpot/php-cs-fixer": "1.7.*",
                 "phpunit/phpunit": "~4.0",
                 "zendframework/zend-config": "~2.5",
@@ -3428,9 +3446,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-release-2.7": "2.7-dev",
-                    "dev-master": "3.0-dev",
-                    "dev-develop": "3.1-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3447,7 +3464,7 @@
                 "stdlib",
                 "zf2"
             ],
-            "time": "2016-04-12 21:17:31"
+            "time": "2015-06-03T15:32:03+00:00"
         },
         {
             "name": "zetacomponents/base",
@@ -3510,7 +3527,7 @@
             ],
             "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2014-09-19 03:28:34"
+            "time": "2014-09-19T03:28:34+00:00"
         },
         {
             "name": "zetacomponents/document",
@@ -3561,7 +3578,7 @@
             ],
             "description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
             "homepage": "https://github.com/zetacomponents",
-            "time": "2013-12-19 11:40:00"
+            "time": "2013-12-19T11:40:00+00:00"
         }
     ],
     "aliases": [],
diff --git a/plugin/PHPMailer/examples/code_generator.phps b/plugin/PHPMailer/examples/code_generator.phps
index 23458561b..2182663d6 100644
--- a/plugin/PHPMailer/examples/code_generator.phps
+++ b/plugin/PHPMailer/examples/code_generator.phps
@@ -58,46 +58,53 @@ class phpmailerAppException extends phpmailerException
 $example_code .= "\n\nclass phpmailerAppException extends phpmailerException {}";
 $example_code .= "\n\ntry {";
 
+// Convert a string to its JavaScript representation.
+function JSString($s) {
+  static $from = array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"');
+  static $to = array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\\"');
+  return is_null($s)? 'null': '"' . str_replace($from, $to, "$s") . '"';
+}
+
 try {
     if (isset($_POST["submit"]) && $_POST['submit'] == "Submit") {
-        $to = $_POST['To_Email'];
+        $to = $to_email;
         if (!PHPMailer::validateAddress($to)) {
             throw new phpmailerAppException("Email address " . $to . " is invalid -- aborting!");
         }
 
-        $example_code .= "\n\$to = '{$_POST['To_Email']}';";
+        $example_code .= "\n\$to = '" . addslashes($to_email) . "';";
         $example_code .= "\nif(!PHPMailer::validateAddress(\$to)) {";
         $example_code .= "\n  throw new phpmailerAppException(\"Email address \" . " .
             "\$to . \" is invalid -- aborting!\");";
         $example_code .= "\n}";
 
-        switch ($_POST['test_type']) {
+        switch ($test_type) {
             case 'smtp':
                 $mail->isSMTP(); // telling the class to use SMTP
-                $mail->SMTPDebug = (integer)$_POST['smtp_debug'];
-                $mail->Host = $_POST['smtp_server']; // SMTP server
-                $mail->Port = (integer)$_POST['smtp_port']; // set the SMTP port
-                if ($_POST['smtp_secure']) {
-                    $mail->SMTPSecure = strtolower($_POST['smtp_secure']);
+                $mail->SMTPDebug = (integer)$smtp_debug;
+                $mail->Host = $smtp_server; // SMTP server
+                $mail->Port = (integer)$smtp_port; // set the SMTP port
+                if ($smtp_secure) {
+                    $mail->SMTPSecure = strtolower($smtp_secure);
                 }
                 $mail->SMTPAuth = array_key_exists('smtp_authenticate', $_POST); // enable SMTP authentication?
                 if (array_key_exists('smtp_authenticate', $_POST)) {
-                    $mail->Username = $_POST['authenticate_username']; // SMTP account username
-                    $mail->Password = $_POST['authenticate_password']; // SMTP account password
+                    $mail->Username = $authenticate_username; // SMTP account username
+                    $mail->Password = $authenticate_password; // SMTP account password
                 }
 
                 $example_code .= "\n\$mail->isSMTP();";
-                $example_code .= "\n\$mail->SMTPDebug  = " . $_POST['smtp_debug'] . ";";
-                $example_code .= "\n\$mail->Host       = \"" . $_POST['smtp_server'] . "\";";
-                $example_code .= "\n\$mail->Port       = \"" . $_POST['smtp_port'] . "\";";
-                $example_code .= "\n\$mail->SMTPSecure = \"" . strtolower($_POST['smtp_secure']) . "\";";
+                $example_code .= "\n\$mail->SMTPDebug  = " . (integer) $smtp_debug . ";";
+                $example_code .= "\n\$mail->Host       = \"" . addslashes($smtp_server) . "\";";
+                $example_code .= "\n\$mail->Port       = \"" . addslashes($smtp_port) . "\";";
+                $example_code .= "\n\$mail->SMTPSecure = \"" . addslashes(strtolower($smtp_secure)) . "\";";
                 $example_code .= "\n\$mail->SMTPAuth   = " . (array_key_exists(
                     'smtp_authenticate',
                     $_POST
                 ) ? 'true' : 'false') . ";";
                 if (array_key_exists('smtp_authenticate', $_POST)) {
-                    $example_code .= "\n\$mail->Username   = \"" . $_POST['authenticate_username'] . "\";";
-                    $example_code .= "\n\$mail->Password   = \"" . $_POST['authenticate_password'] . "\";";
+                    $example_code .= "\n\$mail->Username   = \"" . addslashes($authenticate_username) . "\";";
+                    $example_code .= "\n\$mail->Password   = \"" . addslashes($authenticate_password) . "\";";
                 }
                 break;
             case 'mail':
@@ -118,59 +125,59 @@ try {
 
         try {
             if ($_POST['From_Name'] != '') {
-                $mail->addReplyTo($_POST['From_Email'], $_POST['From_Name']);
-                $mail->setFrom($_POST['From_Email'], $_POST['From_Name']);
+                $mail->addReplyTo($from_email, $from_name);
+                $mail->setFrom($from_email, $from_name);
 
                 $example_code .= "\n\$mail->addReplyTo(\"" .
-                    $_POST['From_Email'] . "\", \"" . $_POST['From_Name'] . "\");";
+                    addslashes($from_email) . "\", \"" . addslashes($from_name) . "\");";
                 $example_code .= "\n\$mail->setFrom(\"" .
-                    $_POST['From_Email'] . "\", \"" . $_POST['From_Name'] . "\");";
+                    addslashes($from_email) . "\", \"" . addslashes($from_name) . "\");";
             } else {
-                $mail->addReplyTo($_POST['From_Email']);
-                $mail->setFrom($_POST['From_Email'], $_POST['From_Email']);
+                $mail->addReplyTo($from_email);
+                $mail->setFrom($from_email, $from_email);
 
-                $example_code .= "\n\$mail->addReplyTo(\"" . $_POST['From_Email'] . "\");";
+                $example_code .= "\n\$mail->addReplyTo(\"" . addslashes($from_email) . "\");";
                 $example_code .= "\n\$mail->setFrom(\"" .
-                    $_POST['From_Email'] . "\", \"" . $_POST['From_Email'] . "\");";
+                    addslashes($from_email) . "\", \"" . addslashes($from_email) . "\");";
             }
 
             if ($_POST['To_Name'] != '') {
-                $mail->addAddress($to, $_POST['To_Name']);
-                $example_code .= "\n\$mail->addAddress(\"$to\", \"" . $_POST['To_Name'] . "\");";
+                $mail->addAddress($to, $to_name);
+                $example_code .= "\n\$mail->addAddress(\"$to\", \"" . addslashes($to_name) . "\");";
             } else {
                 $mail->addAddress($to);
                 $example_code .= "\n\$mail->addAddress(\"$to\");";
             }
 
             if ($_POST['bcc_Email'] != '') {
-                $indiBCC = explode(" ", $_POST['bcc_Email']);
+                $indiBCC = explode(" ", $bcc_email);
                 foreach ($indiBCC as $key => $value) {
                     $mail->addBCC($value);
-                    $example_code .= "\n\$mail->addBCC(\"$value\");";
+                    $example_code .= "\n\$mail->addBCC(\"" . addslashes($value) . "\");";
                 }
             }
 
             if ($_POST['cc_Email'] != '') {
-                $indiCC = explode(" ", $_POST['cc_Email']);
+                $indiCC = explode(" ", $cc_Email);
                 foreach ($indiCC as $key => $value) {
                     $mail->addCC($value);
-                    $example_code .= "\n\$mail->addCC(\"$value\");";
+                    $example_code .= "\n\$mail->addCC(\"" . addslashes($value) . "\");";
                 }
             }
         } catch (phpmailerException $e) { //Catch all kinds of bad addressing
             throw new phpmailerAppException($e->getMessage());
         }
-        $mail->Subject = $_POST['Subject'] . ' (PHPMailer test using ' . strtoupper($_POST['test_type']) . ')';
-        $example_code .= "\n\$mail->Subject  = \"" . $_POST['Subject'] .
-            ' (PHPMailer test using ' . strtoupper($_POST['test_type']) . ')";';
+        $mail->Subject = $subject . ' (PHPMailer test using ' . strtoupper($test_type) . ')';
+        $example_code .= "\n\$mail->Subject  = \"" . addslashes($subject) .
+            ' (PHPMailer test using ' . addslashes(strtoupper($test_type)) . ')";';
 
         if ($_POST['Message'] == '') {
             $body = file_get_contents('contents.html');
         } else {
-            $body = $_POST['Message'];
+            $body = $message;
         }
 
-        $example_code .= "\n\$body = <<<'EOT'\n" . htmlentities($body) . "\nEOT;";
+        $example_code .= "\n\$body = <<<'EOT'\n$body\nEOT;";
 
         $mail->WordWrap = 78; // set word wrap to the RFC2822 limit
         $mail->msgHTML($body, dirname(__FILE__), true); //Create message bodies and embed images
@@ -187,7 +194,7 @@ try {
         $example_code .= "\n\ntry {";
         $example_code .= "\n  \$mail->send();";
         $example_code .= "\n  \$results_messages[] = \"Message has been sent using " .
-            strtoupper($_POST['test_type']) . "\";";
+            addslashes(strtoupper($test_type)) . "\";";
         $example_code .= "\n}";
         $example_code .= "\ncatch (phpmailerException \$e) {";
         $example_code .= "\n  throw new phpmailerAppException('Unable to send to: ' . \$to. ': '.\$e->getMessage());";
@@ -195,7 +202,7 @@ try {
 
         try {
             $mail->send();
-            $results_messages[] = "Message has been sent using " . strtoupper($_POST["test_type"]);
+            $results_messages[] = "Message has been sent using " . strtoupper($test_type);
         } catch (phpmailerException $e) {
             throw new phpmailerAppException("Unable to send to: " . $to . ': ' . $e->getMessage());
         }
@@ -309,22 +316,22 @@ $example_code .= "\n}";
 
         function startAgain() {
             var post_params = {
-                "From_Name": "<?php echo $from_name; ?>",
-                "From_Email": "<?php echo $from_email; ?>",
-                "To_Name": "<?php echo $to_name; ?>",
-                "To_Email": "<?php echo $to_email; ?>",
-                "cc_Email": "<?php echo $cc_email; ?>",
-                "bcc_Email": "<?php echo $bcc_email; ?>",
-                "Subject": "<?php echo $subject; ?>",
-                "Message": "<?php echo $message; ?>",
-                "test_type": "<?php echo $test_type; ?>",
-                "smtp_debug": "<?php echo $smtp_debug; ?>",
-                "smtp_server": "<?php echo $smtp_server; ?>",
-                "smtp_port": "<?php echo $smtp_port; ?>",
-                "smtp_secure": "<?php echo $smtp_secure; ?>",
-                "smtp_authenticate": "<?php echo $smtp_authenticate; ?>",
-                "authenticate_username": "<?php echo $authenticate_username; ?>",
-                "authenticate_password": "<?php echo $authenticate_password; ?>"
+                "From_Name": <?php echo JSString($from_name); ?>,
+                "From_Email": <?php echo JSString($from_email); ?>,
+                "To_Name": <?php echo JSString($to_name); ?>,
+                "To_Email": <?php echo JSString($to_email); ?>,
+                "cc_Email": <?php echo JSString($cc_email); ?>,
+                "bcc_Email": <?php echo JSString($bcc_email); ?>,
+                "Subject": <?php echo JSString($subject); ?>,
+                "Message": <?php echo JSString($message); ?>,
+                "test_type": <?php echo JSString($test_type); ?>,
+                "smtp_debug": <?php echo JSString($smtp_debug); ?>,
+                "smtp_server": <?php echo JSString($smtp_server); ?>,
+                "smtp_port": <?php echo JSString($smtp_port); ?>,
+                "smtp_secure": <?php echo JSString($smtp_secure); ?>,
+                "smtp_authenticate": <?php echo JSString($smtp_authenticate); ?>,
+                "authenticate_username": <?php echo JSString($authenticate_username); ?>,
+                "authenticate_password": <?php echo JSString($authenticate_password); ?>
             };
 
             var resetForm = document.createElement("form");
@@ -374,7 +381,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
     echo "<button type=\"submit\" onclick=\"startAgain();\">Start Over</button><br>\n";
     echo "<br><span>Script:</span>\n";
     echo "<pre class=\"brush: php;\">\n";
-    echo $example_code;
+    echo htmlentities($example_code);
     echo "\n</pre>\n";
     echo "\n<hr style=\"margin: 3em;\">\n";
 }
@@ -390,7 +397,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <label for="From_Name"><strong>From</strong> Name</label>
                         </td>
                         <td class="colrite">
-                            <input type="text" id="From_Name" name="From_Name" value="<?php echo $from_name; ?>"
+                            <input type="text" id="From_Name" name="From_Name" value="<?php echo htmlentities($from_name); ?>"
                                    style="width:95%;" autofocus placeholder="Your Name">
                         </td>
                     </tr>
@@ -399,7 +406,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <label for="From_Email"><strong>From</strong> Email Address</label>
                         </td>
                         <td class="colrite">
-                            <input type="text" id="From_Email" name="From_Email" value="<?php echo $from_email; ?>"
+                            <input type="text" id="From_Email" name="From_Email" value="<?php echo htmlentities($from_email); ?>"
                                    style="width:95%;" required placeholder="Your.Email@example.com">
                         </td>
                     </tr>
@@ -408,7 +415,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <label for="To_Name"><strong>To</strong> Name</label>
                         </td>
                         <td class="colrite">
-                            <input type="text" id="To_Name" name="To_Name" value="<?php echo $to_name; ?>"
+                            <input type="text" id="To_Name" name="To_Name" value="<?php echo htmlentities($to_name); ?>"
                                    style="width:95%;" placeholder="Recipient's Name">
                         </td>
                     </tr>
@@ -417,7 +424,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <label for="To_Email"><strong>To</strong> Email Address</label>
                         </td>
                         <td class="colrite">
-                            <input type="text" id="To_Email" name="To_Email" value="<?php echo $to_email; ?>"
+                            <input type="text" id="To_Email" name="To_Email" value="<?php echo htmlentities($to_email); ?>"
                                    style="width:95%;" required placeholder="Recipients.Email@example.com">
                         </td>
                     </tr>
@@ -428,7 +435,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             </label>
                         </td>
                         <td class="colrite">
-                            <input type="text" id="cc_Email" name="cc_Email" value="<?php echo $cc_email; ?>"
+                            <input type="text" id="cc_Email" name="cc_Email" value="<?php echo htmlentities($cc_email); ?>"
                                    style="width:95%;" placeholder="cc1@example.com, cc2@example.com">
                         </td>
                     </tr>
@@ -439,7 +446,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             </label>
                         </td>
                         <td class="colrite">
-                            <input type="text" id="bcc_Email" name="bcc_Email" value="<?php echo $bcc_email; ?>"
+                            <input type="text" id="bcc_Email" name="bcc_Email" value="<?php echo htmlentities($bcc_email); ?>"
                                    style="width:95%;" placeholder="bcc1@example.com, bcc2@example.com">
                         </td>
                     </tr>
@@ -448,7 +455,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <label for="Subject"><strong>Subject</strong></label>
                         </td>
                         <td class="colrite">
-                            <input type="text" name="Subject" id="Subject" value="<?php echo $subject; ?>"
+                            <input type="text" name="Subject" id="Subject" value="<?php echo htmlentities($subject); ?>"
                                    style="width:95%;" placeholder="Email Subject">
                         </td>
                     </tr>
@@ -460,7 +467,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                         </td>
                         <td class="colrite">
                             <textarea name="Message" id="Message" style="width:95%;height:5em;"
-                                      placeholder="Body of your email"><?php echo $message; ?></textarea>
+                                      placeholder="Body of your email"><?php echo htmlentities($message); ?></textarea>
                         </td>
                     </tr>
                 </table>
@@ -531,7 +538,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <td class="colleft"><label for="smtp_server">SMTP Server</label></td>
                             <td class="colrite">
                                 <input type="text" id="smtp_server" name="smtp_server"
-                                       value="<?php echo $smtp_server; ?>" style="width:95%;"
+                                       value="<?php echo htmlentities($smtp_server); ?>" style="width:95%;"
                                        placeholder="smtp.server.com">
                             </td>
                         </tr>
@@ -539,7 +546,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <td class="colleft" style="width: 5em;"><label for="smtp_port">SMTP Port</label></td>
                             <td class="colrite">
                                 <input type="text" name="smtp_port" id="smtp_port" size="3"
-                                       value="<?php echo $smtp_port; ?>" placeholder="Port">
+                                       value="<?php echo htmlentities($smtp_port); ?>" placeholder="Port">
                             </td>
                         </tr>
                         <tr>
@@ -560,14 +567,14 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
 <?php if ($smtp_authenticate != '') {
     echo "checked";
 } ?>
-                                       value="<?php echo $smtp_authenticate; ?>">
+                                       value="true">
                             </td>
                         </tr>
                         <tr>
                             <td class="colleft"><label for="authenticate_username">Authenticate Username</label></td>
                             <td class="colrite">
                                 <input type="text" id="authenticate_username" name="authenticate_username"
-                                       value="<?php echo $authenticate_username; ?>" style="width:95%;"
+                                       value="<?php echo htmlentities($authenticate_username); ?>" style="width:95%;"
                                        placeholder="SMTP Server Username">
                             </td>
                         </tr>
@@ -575,7 +582,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") {
                             <td class="colleft"><label for="authenticate_password">Authenticate Password</label></td>
                             <td class="colrite">
                                 <input type="password" name="authenticate_password" id="authenticate_password"
-                                       value="<?php echo $authenticate_password; ?>" style="width:95%;"
+                                       value="<?php echo htmlentities($authenticate_password); ?>" style="width:95%;"
                                        placeholder="SMTP Server Password">
                             </td>
                         </tr>
diff --git a/plugin/PHPMailer/examples/gmail.phps b/plugin/PHPMailer/examples/gmail.phps
index b3cc02d53..121ca70a2 100644
--- a/plugin/PHPMailer/examples/gmail.phps
+++ b/plugin/PHPMailer/examples/gmail.phps
@@ -1,6 +1,7 @@
 <?php
 /**
  * This example shows settings to use when sending via Google's Gmail servers.
+ * The IMAP section shows how to save this message to the 'Sent Mail' folder using IMAP commands.
  */
 
 //SMTP needs accurate times, and the PHP time zone MUST be set
@@ -72,4 +73,27 @@ if (!$mail->send()) {
     echo "Mailer Error: " . $mail->ErrorInfo;
 } else {
     echo "Message sent!";
+    //Section 2: IMAP
+    //Uncomment these to save your message in the 'Sent Mail' folder.
+    #if (save_mail($mail)) {
+    #    echo "Message saved!";
+    #}
+}
+
+//Section 2: IMAP
+//IMAP commands requires the PHP IMAP Extension, found at: https://php.net/manual/en/imap.setup.php
+//Function to call which uses the PHP imap_*() functions to save messages: https://php.net/manual/en/book.imap.php
+//You can use imap_getmailboxes($imapStream, '/imap/ssl') to get a list of available folders or labels, this can
+//be useful if you are trying to get this working on a non-Gmail IMAP server.
+function save_mail($mail) {
+    //You can change 'Sent Mail' to any other folder or tag
+    $path = "{imap.gmail.com:993/imap/ssl}[Gmail]/Sent Mail";
+
+    //Tell your server to open an IMAP connection using the same username and password as you used for SMTP
+    $imapStream = imap_open($path, $mail->Username, $mail->Password);
+
+    $result = imap_append($imapStream, $path, $mail->getSentMIMEMessage());
+    imap_close($imapStream);
+
+    return $result;
 }
diff --git a/plugin/PHPMailer/examples/gmail_xoauth.phps b/plugin/PHPMailer/examples/gmail_xoauth.phps
index d64483a4d..2aec1814d 100644
--- a/plugin/PHPMailer/examples/gmail_xoauth.phps
+++ b/plugin/PHPMailer/examples/gmail_xoauth.phps
@@ -43,8 +43,8 @@ $mail->SMTPAuth = true;
 //Set AuthType
 $mail->AuthType = 'XOAUTH2';
 
-//User Email to use for SMTP authentication - Use the same Email used in Google Developer Console
-$mail->oauthUserEmail = "someone@gmail.com";
+//User Email to use for SMTP authentication - user who gave consent to our app
+$mail->oauthUserEmail = "from@gmail.com";
 
 //Obtained From Google Developer Console
 $mail->oauthClientId = "RANDOMCHARS-----duv1n2.apps.googleusercontent.com";
diff --git a/plugin/PHPMailer/extras/README.md b/plugin/PHPMailer/extras/README.md
index dac79e05f..df8ca0925 100644
--- a/plugin/PHPMailer/extras/README.md
+++ b/plugin/PHPMailer/extras/README.md
@@ -1,17 +1,17 @@
-#PHPMailer Extras
+# PHPMailer Extras
 
 These classes provide optional additional functions to PHPMailer.
 
 These are not loaded by the PHPMailer autoloader, so in some cases you may need to `require` them yourself before using them.
 
-##EasyPeasyICS
+## EasyPeasyICS
 
 This class was originally written by Manuel Reinhard and provides a simple means of generating ICS/vCal files that are used in sending calendar events. PHPMailer does not use it directly, but you can use it to generate content appropriate for placing in the `Ical` property of PHPMailer. The PHPMailer project is now its official home as Manuel has given permission for that and is no longer maintaining it himself.
 
-##htmlfilter
+## htmlfilter
 
 This class by Konstantin Riabitsev and Jim Jagielski implements HTML filtering to remove potentially malicious tags, such as `<script>` or `onclick=` attributes that can result in XSS attacks. This is a simple filter and is not as comprehensive as [HTMLawed](http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/) or [HTMLPurifier](http://htmlpurifier.org), but it's easier to use and considerably better than nothing! PHPMailer does not use it directly, but you may want to apply it to user-supplied HTML before using it as a message body.
 
-##NTLM_SASL_client
+## NTLM_SASL_client
 
 This class by Manuel Lemos (bundled with permission) adds the ability to authenticate with Microsoft Windows mail servers that use NTLM-based authentication. It is used by PHPMailer if you send via SMTP and set the `AuthType` property to `NTLM`; you will also need to use the `Realm` and `Workstation` properties. The original source is [here](http://www.phpclasses.org/browse/file/7495.html).
diff --git a/plugin/PHPMailer/extras/htmlfilter.php b/plugin/PHPMailer/extras/htmlfilter.php
index a86ef579d..b4b2d878a 100644
--- a/plugin/PHPMailer/extras/htmlfilter.php
+++ b/plugin/PHPMailer/extras/htmlfilter.php
@@ -44,9 +44,9 @@ function tln_tagprint($tagname, $attary, $tagtype)
         $fulltag = '</' . $tagname . '>';
     } else {
         $fulltag = '<' . $tagname;
-        if (is_array($attary) && sizeof($attary)) {
+        if (is_array($attary) && count($attary)) {
             $atts = array();
-            while (list($attname, $attvalue) = each($attary)) {
+            foreach($attary as $attname => $attvalue) {
                 array_push($atts, "$attname=$attvalue");
             }
             $fulltag .= ' ' . join(' ', $atts);
@@ -84,7 +84,7 @@ function tln_casenormalize(&$val)
 function tln_skipspace($body, $offset)
 {
     preg_match('/^(\s*)/s', substr($body, $offset), $matches);
-    if (sizeof($matches[1])) {
+    if (count($matches[1])) {
         $count = strlen($matches[1]);
         $offset += $count;
     }
@@ -439,9 +439,9 @@ function tln_getnxtag($body, $offset)
 function tln_deent(&$attvalue, $regex, $hex = false)
 {
     preg_match_all($regex, $attvalue, $matches);
-    if (is_array($matches) && sizeof($matches[0]) > 0) {
+    if (is_array($matches) && count($matches[0]) > 0) {
         $repl = array();
-        for ($i = 0; $i < sizeof($matches[0]); $i++) {
+        for ($i = 0; $i < count($matches[0]); $i++) {
             $numval = $matches[1][$i];
             if ($hex) {
                 $numval = hexdec($numval);
@@ -520,7 +520,7 @@ function tln_fixatts(
     $trans_image_path,
     $block_external_images
 ) {
-    while (list($attname, $attvalue) = each($attary)) {
+    foreach($attary as $attname => $attvalue) {
         /**
          * See if this attribute should be removed.
          */
@@ -794,7 +794,7 @@ function tln_body2div($attary, $trans_image_path)
     $text = '#000000';
     $has_bgc_stl = $has_txt_stl = false;
     $styledef = '';
-    if (is_array($attary) && sizeof($attary) > 0){
+    if (is_array($attary) && count($attary) > 0){
         foreach ($attary as $attname=>$attvalue){
             $quotchar = substr($attvalue, 0, 1);
             $attvalue = str_replace($quotchar, "", $attvalue);
@@ -970,7 +970,7 @@ function tln_sanitize(
                             /**
                              * This is where we run other checks.
                              */
-                            if (is_array($attary) && sizeof($attary) > 0) {
+                            if (is_array($attary) && count($attary) > 0) {
                                 $attary = tln_fixatts(
                                     $tagname,
                                     $attary,
diff --git a/plugin/PHPMailer/language/phpmailer.lang-ba.php b/plugin/PHPMailer/language/phpmailer.lang-ba.php
new file mode 100644
index 000000000..095dee3e2
--- /dev/null
+++ b/plugin/PHPMailer/language/phpmailer.lang-ba.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Bosnian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ermin Islamagić <ermin@islamagic.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Greška: Neuspjela prijava.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Greška: Ne moguće se spojiti sa SMTP serverom.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Greška: Podatci nisu prihvaćeni.';
+$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznata kriptografija: ';
+$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
+$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
+$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP Greška: Slanje sa navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Greška: Slanje na navedene e-mail adrese nije uspjelo: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne mogu pokrenuti mail funkcionalnost.';
+$PHPMAILER_LANG['invalid_address']      = 'E-mail nije poslan. Neispravna e-mail adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nije podržan.';
+$PHPMAILER_LANG['provide_address']      = 'Definišite barem jednu adresu primaoca.';
+$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP server nije uspjelo.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP greška: ';
+$PHPMAILER_LANG['variable_set']         = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje ekstenzija: ';
\ No newline at end of file
diff --git a/plugin/PHPMailer/language/phpmailer.lang-cs.php b/plugin/PHPMailer/language/phpmailer.lang-cs.php
index 8cb1a3d80..1160cf0cc 100644
--- a/plugin/PHPMailer/language/phpmailer.lang-cs.php
+++ b/plugin/PHPMailer/language/phpmailer.lang-cs.php
@@ -22,4 +22,4 @@ $PHPMAILER_LANG['signing']              = 'Chyba přihlašování: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() selhal.';
 $PHPMAILER_LANG['smtp_error']           = 'Chyba SMTP serveru: ';
 $PHPMAILER_LANG['variable_set']         = 'Nelze nastavit nebo změnit proměnnou: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['extension_missing']    = 'Chybí rozšíření: ';
diff --git a/plugin/PHPMailer/language/phpmailer.lang-nb.php b/plugin/PHPMailer/language/phpmailer.lang-nb.php
index 383dd5165..446105422 100644
--- a/plugin/PHPMailer/language/phpmailer.lang-nb.php
+++ b/plugin/PHPMailer/language/phpmailer.lang-nb.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * Norwegian PHPMailer language file: refer to English translation for definitive list
+ * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.';
 $PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Data ble ikke akseptert.';
-$PHPMAILER_LANG['empty_message']        = 'Meldingsinnholdet er tomt';
-$PHPMAILER_LANG['encoding']             = 'Ukjent tegnkoding: ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Datainnhold ikke akseptert.';
+$PHPMAILER_LANG['empty_message']        = 'Melding kropp tomt';
+$PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
 $PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: ';
 $PHPMAILER_LANG['file_access']          = 'Får ikke tilgang til filen: ';
-$PHPMAILER_LANG['file_open']            = 'Fil feil: Kunne ikke åpne filen: ';
-$PHPMAILER_LANG['from_failed']          = 'Følgende avsenderadresse feilet: ';
-$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere mailfunksjonen.';
-$PHPMAILER_LANG['invalid_address']      = 'Meldingen ble ikke sendt, følgende adresse er ugyldig: ';
-$PHPMAILER_LANG['provide_address']      = 'Du må angi minst en mottakeradresse.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer er ikke supportert.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottagere feilet: ';
-$PHPMAILER_LANG['signing']              = 'Signeringsfeil: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() feilet.';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfeil: ';
-$PHPMAILER_LANG['variable_set']         = 'Kan ikke sette eller resette variabelen: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['file_open']            = 'Fil Feil: Kunne ikke åpne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende Frå adresse feilet: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere post funksjon.';
+$PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
+$PHPMAILER_LANG['provide_address']      = 'Du må opppgi minst en mottakeradresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
+$PHPMAILER_LANG['signing']              = 'Signering Feil: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() feilet.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server feil: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan ikke skrive eller omskrive variabel: ';
+$PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';
diff --git a/plugin/PHPMailer/language/phpmailer.lang-pt_br.php b/plugin/PHPMailer/language/phpmailer.lang-pt_br.php
index fecbbe346..4ec10f777 100644
--- a/plugin/PHPMailer/language/phpmailer.lang-pt_br.php
+++ b/plugin/PHPMailer/language/phpmailer.lang-pt_br.php
@@ -5,6 +5,7 @@
  * @author Paulo Henrique Garcia <paulo@controllerweb.com.br>
  * @author Lucas Guimarães <lucas@lucasguimaraes.com>
  * @author Phelipe Alves <phelipealvesdesouza@gmail.com>
+ * @author Fabio Beneditto <fabiobeneditto@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
@@ -15,7 +16,7 @@ $PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
 $PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
 $PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
 $PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
-$PHPMAILER_LANG['from_failed']          = 'Os seguintes remententes falharam: ';
+$PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: ';
 $PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
 $PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
diff --git a/plugin/PHPMailer/language/phpmailer.lang-rs.php b/plugin/PHPMailer/language/phpmailer.lang-rs.php
new file mode 100644
index 000000000..0502f0214
--- /dev/null
+++ b/plugin/PHPMailer/language/phpmailer.lang-rs.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Serbian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Александар Јевремовић <ajevremovic@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: аутентификација није успела.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: није могуће повезивање са SMTP сервером.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: подаци нису прихваћени.';
+$PHPMAILER_LANG['empty_message']        = 'Садржај поруке је празан.';
+$PHPMAILER_LANG['encoding']             = 'Непознато кодовање: ';
+$PHPMAILER_LANG['execute']              = 'Није могуће извршити наредбу: ';
+$PHPMAILER_LANG['file_access']          = 'Није могуће приступити датотеци: ';
+$PHPMAILER_LANG['file_open']            = 'Није могуће отворити датотеку: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP грешка: слање са следећих адреса није успело: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: слање на следеће адресе није успело: ';
+$PHPMAILER_LANG['instantiate']          = 'Није могуће покренути mail функцију.';
+$PHPMAILER_LANG['invalid_address']      = 'Порука није послата због неисправне адресе: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' мејлер није подржан.';
+$PHPMAILER_LANG['provide_address']      = 'Потребно је задати најмање једну адресу.';
+$PHPMAILER_LANG['signing']              = 'Грешка приликом пријављивања: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.';
+$PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Није могуће задати променљиву, нити је вратити уназад: ';
+$PHPMAILER_LANG['extension_missing']    = 'Недостаје проширење: ';
diff --git a/plugin/PHPMailer/language/phpmailer.lang-tr.php b/plugin/PHPMailer/language/phpmailer.lang-tr.php
index 323fb4b5f..cfe8eaae2 100644
--- a/plugin/PHPMailer/language/phpmailer.lang-tr.php
+++ b/plugin/PHPMailer/language/phpmailer.lang-tr.php
@@ -6,6 +6,7 @@
  * @author Can Yılmaz
  * @author Mehmet Benlioğlu
  * @author @yasinaydin
+ * @author Ogün Karakuş
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.';
@@ -26,4 +27,4 @@ $PHPMAILER_LANG['signing']              = 'İmzalama hatası: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: ';
 $PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';
diff --git a/plugin/PHPMailer/language/phpmailer.lang-zh_cn.php b/plugin/PHPMailer/language/phpmailer.lang-zh_cn.php
index d85a0b1a7..37537802a 100644
--- a/plugin/PHPMailer/language/phpmailer.lang-zh_cn.php
+++ b/plugin/PHPMailer/language/phpmailer.lang-zh_cn.php
@@ -4,13 +4,14 @@
  * @package PHPMailer
  * @author liqwei <liqwei@liqwei.com>
  * @author young <masxy@foxmail.com>
+ * @author Teddysun <i@teddysun.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP 错误：登录失败。';
 $PHPMAILER_LANG['connect_host']         = 'SMTP 错误：无法连接到 SMTP 主机。';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误：数据不被接受。';
 $PHPMAILER_LANG['empty_message']        = '邮件正文为空。';
-$PHPMAILER_LANG['encoding']             = '未知编码: ';
+$PHPMAILER_LANG['encoding']             = '未知编码：';
 $PHPMAILER_LANG['execute']              = '无法执行：';
 $PHPMAILER_LANG['file_access']          = '无法访问文件：';
 $PHPMAILER_LANG['file_open']            = '文件错误：无法打开文件：';
@@ -22,6 +23,6 @@ $PHPMAILER_LANG['provide_address']      = '必须提供至少一个收件人地
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误：收件人地址错误：';
 $PHPMAILER_LANG['signing']              = '登录失败：';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错：';
 $PHPMAILER_LANG['variable_set']         = '无法设置或重置变量：';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['extension_missing']    = '丢失模块 Extension：';
diff --git a/plugin/browscap/Browscap.php b/plugin/browscap/Browscap.php
index 921cc9449..03c8959c0 100644
--- a/plugin/browscap/Browscap.php
+++ b/plugin/browscap/Browscap.php
@@ -1455,5 +1455,4 @@ class Browscap
 class Exception extends \Exception
 {
     // nothing to do here
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/cheditor.js b/plugin/editor/cheditor5/cheditor.js
index 7321de001..9e39e3408 100644
--- a/plugin/editor/cheditor5/cheditor.js
+++ b/plugin/editor/cheditor5/cheditor.js
@@ -1,9 +1,9 @@
 // ================================================================
-//                       CHEditor 5.1.9.3
+//                       CHEditor 5.1.9.3-p4
 // ----------------------------------------------------------------
 // Homepage: http://www.chcode.com
 // EMail: support@chcode.com
-// Copyright (c) 1997-2016 CHSOFT
+// Copyright (c) 1997-2020 CHSOFT
 // ================================================================
 var GB = {
     colors: ['#000000','#313131','#434343','#535353','#666666','#999999','#a0a0a0','#b5b5b5','#c0c0c0','#dcdcdc','#eeeeee','#ffffff',
@@ -517,7 +517,7 @@ function setConfig() {
         useModifyTable      : true,
         useMap              : true,
         useTextBlock        : true,
-        useFullScreen       : true,
+        useFullScreen       : false,
         usePageBreak        : false
     },
     base, elem, i, editorUri, locationAbs;
@@ -557,9 +557,9 @@ function setConfig() {
     this.currentRS = {};
     this.resizeEditor = {};
     this.setFullScreenMode = false;
-    this.modalElementZIndex = 1001;
+    this.modalElementZIndex = 10001;
     this.config = config;
-    this.templateFile = 'template.xml';
+    this.templateFile = this.undefined(this.browser.mobile) ? 'template.xml' : 'template-mobile.xml';
     this.templatePath = config.editorPath + this.templateFile;
     this.W3CRange = !(this.undefined(window.getSelection));
     this.inputForm = 'textAreaId';
@@ -1082,31 +1082,10 @@ cheditor.prototype = {
             showError('현재 브라우저에서 ' + self.templateFile + ' 파일을 사용할 수 없습니다.');
         }
     },
-/*
-    getCDATASection : function (node) {
-        var elem, data;
-        if (node.hasChildNodes()) {
-            elem = node.firstChild;
-            while (elem && elem.nodeType !== GB.node.cdata_section) {
-                elem = elem.nextSibling;
-            }
-            if (elem && elem.nodeType === GB.node.cdata_section) {
-                data = elem.data;
-                data = data.replace(/\n/g, '');
-                data = data.replace(/(\s+?)<([^>]*)>/g, '<$2>');
-                data = this.trimSpace(data);
-                return data;
-            }
-        }
-        return null;
-    },
-*/
+
     getCDATASection : function (node) {
         var text = node.textContent || node.text;
-        text = text.replace(/\n/g, '');
-        text = text.replace(/(\s+?)<([^>]*)>/g, '<$2>');
-        text = this.trimSpace(text);
-        return text;
+        return this.trimSpace(text.replace(/\n/g, '').replace(/(\s+?)<([^>]*)>/g, '<$2>'));
     },
 
     setToolbarBgPosition : function (elem, attr) {
@@ -2044,7 +2023,7 @@ cheditor.prototype = {
         container.style.width = self.config.editorWidth;
         self.cheditor.container = container;
     },
-/*
+
     loadTemplate : function (xmlDoc) {
         var self = this,
             tmpl = xmlDoc.getElementsByTagName('Template').item(0),
@@ -2091,55 +2070,6 @@ cheditor.prototype = {
         self.cheditor.htmlEditable.style.visibility = 'hidden';
         container.appendChild(self.cheditor.htmlEditable);
     },
-*/
-
-    loadTemplate : function (xmlDoc) {
-        var cdata, container, dragHandle, html, modalFrame, popupWindow, tmpDiv, tmpl, toolbar;
-        tmpl = xmlDoc.getElementsByTagName('Template').item(0);
-        if (!tmpl) {
-            throw 'Template 노드를 설정할 수 없습니다.';
-        }
-        cdata = tmpl.getElementsByTagName('Container').item(0).getElementsByTagName('Html').item(0);
-        if (!cdata) {
-            throw 'XML CDATA 오류';
-        }
-        html = this.getCDATASection(cdata);
-        tmpDiv = document.createElement('div');
-        tmpDiv.innerHTML = html;
-        container = tmpDiv.firstChild;
-
-        toolbar = tmpl.getElementsByTagName('Toolbar').item(0);
-        this.createEditorElement(container, toolbar);
-
-        cdata = tmpl.getElementsByTagName('PopupWindow').item(0).getElementsByTagName('Html').item(0);
-        if (!cdata) {
-            throw 'XML CDATA 오류';
-        }
-        html = this.getCDATASection(cdata);
-        tmpDiv.innerHTML = html;
-        popupWindow = tmpDiv.firstChild;
-        this.cheditor.popupElem = popupWindow;
-
-        dragHandle = popupWindow.firstChild;
-        this.cheditor.dragHandle = dragHandle;
-        this.cheditor.popupTitle = dragHandle.getElementsByTagName('label')[0];
-        this.cheditor.popupFrameWrapper = dragHandle.nextSibling;
-        container.appendChild(popupWindow);
-
-        modalFrame = document.createElement('div');
-        modalFrame.className = 'cheditor-modalPopupTransparent';
-        this.cheditor.modalBackground = modalFrame;
-        this.cheditor.modalBackground.id = 'popupModalBackground';
-        this.cheditor.modalBackground.className = 'cheditor-popupModalBackground';
-        container.parentNode.insertBefore(modalFrame, container);
-
-        this.cheditor.htmlEditable = document.createElement('iframe');
-        this.cheditor.htmlEditable.style.display = 'none';
-        this.cheditor.htmlEditable.style.width = '1px';
-        this.cheditor.htmlEditable.style.height = '1px';
-        this.cheditor.htmlEditable.style.visibility = 'hidden';
-        container.appendChild(this.cheditor.htmlEditable);
-    },
 
     imageEvent : function (img, action) {
         var self = this,
@@ -5063,7 +4993,12 @@ cheditor.prototype = {
         if (!(this.undefined(GB.popupWindow[popupName]))) {
             var popup = GB.popupWindow[popupName];
             if (popupName === 'ImageUpload' && window.File && window.FileReader && window.FileList && window.Blob) {
-                popup.tmpl = 'image.html5.html';
+                if (this.browser.mobile) {
+                    popup.tmpl = 'image.html5.m.html';
+                    popup.width = 450; // 팝업 윈도우 가로 폭 크기(px)
+                } else {
+                    popup.tmpl = 'image.html5.html';
+                }
             }
             this.popupWinLoad(popup);
         } else {
diff --git a/plugin/editor/cheditor5/css/imageupload.css b/plugin/editor/cheditor5/css/imageupload.css
index 0589dd629..6efb56a84 100644
--- a/plugin/editor/cheditor5/css/imageupload.css
+++ b/plugin/editor/cheditor5/css/imageupload.css
@@ -133,4 +133,15 @@ body {
     line-height: 1em;
     font-family: 'Malgun Gothic', gulim, tahoma, helvetica;
     font-size: 12px;
+}
+
+.webgl_logo_wrapper {
+	text-align: center;
+	margin-top: 40px;
+	border-top: #cccccc 1px solid;
+}
+.webgl_logo_wrapper img {
+	width: 50px;
+	height: 50px;
+	vertical-align: middle;
 }
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/css/imageupload.m.css b/plugin/editor/cheditor5/css/imageupload.m.css
new file mode 100644
index 000000000..11d2ed5b8
--- /dev/null
+++ b/plugin/editor/cheditor5/css/imageupload.m.css
@@ -0,0 +1,136 @@
+#uploadWindow {
+    display: none;
+}
+
+.clear { clear: both; }
+
+#container {
+	padding: 0;
+}
+
+.imageListWrapperHtml5, .imageListWrapper, .dragOver {
+	background-color: #fff;
+	position: absolute;
+    height: 250px;
+    width: 255px;
+    overflow-y: scroll;
+    border-radius: 4px;
+	border: 2px #66b2ff solid;
+}
+/* .imageListWrapperHtml5 {
+    border: 2px #66b2ff dashed;
+} */
+.imageListWrapper {
+    border: 1px #aaa solid;
+    box-shadow: 0 0 3px #aaa;
+}
+.dragOver {
+    border: 2px #ff3399 dashed;
+}
+#imageInfoBox {
+    position: absolute;
+	left: 300px;
+}
+.imageInfoTitle {
+    text-align: center;
+    background-color: #e0e0e0;
+    width: 130px;
+    font-family: "Malgun Gothic",gulim;
+    font-weight: bold;
+    font-size: 12px;
+}
+.imageInfoTitle span {
+    display: inline-block;
+    margin-top: -1px;
+    line-height: 22px;
+}
+.remove-button {
+	width: 93px;
+	height: 22px;
+	cursor: pointer;
+	vertical-align: middle;
+}
+.imageBox, .imageBoxHighlighted {
+	width: 120px;
+	height: 90px;
+	margin: 3px 3px;
+	float: left;
+}
+.imageBox_theImage,.imageBox_theImage_over {
+	width: 100%;
+	height: 100%;
+    position: relative;
+    display: block;
+    background-color: #fff;
+}
+.imageBox .imageBox_theImage{
+	border: 1px solid #e0e0e0;
+	background-image: url('../icons/dot.gif');
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.imageBox .imageBox_theImage_over {
+	border: 1px solid #a0a0a0;
+	background-image: url('../icons/dot.gif');
+	background-position: center center;
+	background-repeat: no-repeat;
+    cursor: pointer;
+}
+.imageBoxHighlighted .imageBox_theImage {
+	border: 1px solid #ff6600;
+}
+.imageBoxHighlighted .imageBox_theImage_over {
+	border: 1px solid #ff6600;
+	background-image: url('../icons/dot.gif');
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+
+.removeButton, .removeButton_over {
+	display: none;
+	position: absolute;
+	cursor: pointer;
+    background-image: url(../icons/imageUpload/cross-small.png);
+    background-repeat: no-repeat;
+    background-position: center center;
+}
+.removeButton {
+    border: 1px solid #a0a0a0;
+}
+.removeButton_over {
+    border: 1px solid #808080;
+}
+#insertionMarker {
+	height: 102px;
+	width: 6px;
+	position: absolute;
+	display: none;
+}
+
+#insertionMarker img {
+	float: left;
+}
+	
+#dragDropContent{
+	position: absolute;
+	z-index: 10;
+	display: none;
+}
+
+.button {
+    width: 64px;
+    height: 22px;
+    margin: 0 2px;
+    cursor: pointer;
+    vertical-align: middle;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	overflow: hidden;
+    background-color: #fff;
+    line-height: 1em;
+    font-family: 'Malgun Gothic', gulim, tahoma, helvetica;
+    font-size: 12px;
+}
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/css/ui.css b/plugin/editor/cheditor5/css/ui.css
index 2273f4034..060335500 100644
--- a/plugin/editor/cheditor5/css/ui.css
+++ b/plugin/editor/cheditor5/css/ui.css
@@ -14,6 +14,8 @@ a.cheditor-tag-path-elem:hover {
     border-top: 1px #ccc solid;
     position: relative;
     text-align: left;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
 }
 .cheditor-tb-wrapper {
     border-right: 1px #ccc solid;
@@ -21,11 +23,10 @@ a.cheditor-tag-path-elem:hover {
     border-bottom: 1px #ccc solid;
     position: relative;
     display: block;
+    -webkit-box-sizing: inherit;
+    box-sizing: inherit;
     background-color: #f0f0f0;
-    zoom:1;
-    height:auto ! important;
 }
-.cheditor-tb-wrapper:after{display:block;visibility:hidden;clear:both;content:""}
 .cheditor-tb-wrapper-readonly {
     border-right: 1px #ccc solid;
     border-left: 1px #ccc solid;
@@ -423,6 +424,8 @@ a.cheditor-tag-path-elem:hover {
     box-shadow: 0 0 10px #bbb;
     padding: 0;
     overflow: hidden;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
 }
 .cheditor-popup-cmd-button {
     width: 64px;
@@ -437,6 +440,8 @@ a.cheditor-tag-path-elem:hover {
     padding: 10px;
     border: none;
     text-align: center;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
 }
 
 .cheditor-popup-cframe iframe {
diff --git a/plugin/editor/cheditor5/editor.lib.php b/plugin/editor/cheditor5/editor.lib.php
index bb91e300b..8446e022d 100644
--- a/plugin/editor/cheditor5/editor.lib.php
+++ b/plugin/editor/cheditor5/editor.lib.php
@@ -160,5 +160,4 @@ if(!function_exists('ft_nonce_generate_hash')){
 		}
 		return $o;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/icons/imageUpload/webgl-off.png b/plugin/editor/cheditor5/icons/imageUpload/webgl-off.png
new file mode 100644
index 000000000..71adb4872
Binary files /dev/null and b/plugin/editor/cheditor5/icons/imageUpload/webgl-off.png differ
diff --git a/plugin/editor/cheditor5/icons/imageUpload/webgl.png b/plugin/editor/cheditor5/icons/imageUpload/webgl.png
new file mode 100644
index 000000000..a5501de9a
Binary files /dev/null and b/plugin/editor/cheditor5/icons/imageUpload/webgl.png differ
diff --git a/plugin/editor/cheditor5/imageUpload/_common.php b/plugin/editor/cheditor5/imageUpload/_common.php
index 6d489dacb..c7f00802e 100644
--- a/plugin/editor/cheditor5/imageUpload/_common.php
+++ b/plugin/editor/cheditor5/imageUpload/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once("../../../../common.php");
-?>
\ No newline at end of file
+include_once("../../../../common.php");
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/imageUpload/config.php b/plugin/editor/cheditor5/imageUpload/config.php
index dc5f2ba8b..0f81cdcb8 100644
--- a/plugin/editor/cheditor5/imageUpload/config.php
+++ b/plugin/editor/cheditor5/imageUpload/config.php
@@ -30,8 +30,14 @@ define("SAVE_DIR", $data_dir);
 define("SAVE_URL", $data_url);
 
 function che_get_user_id() {
-    @session_start();
-    return session_id();
+    global $member;
+
+    if(session_id() == '') {
+        @session_start();
+    }
+
+    $add_str = (isset($member['mb_id']) && $member['mb_id']) ? $member['mb_id'] : '';
+    return session_id().$add_str;
 }
 
 function che_get_file_passname(){
@@ -61,7 +67,4 @@ function che_replace_filename($filename){
     $file_arr = explode('_', $filename);
 
     return $file_arr[0].'_'.$passname.'_'.$random_str.'.'.$ext;
-}
-
-// ---------------------------------------------------------------------------
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/imageUpload/delete.php b/plugin/editor/cheditor5/imageUpload/delete.php
index 82e65bedb..d59c4eb39 100644
--- a/plugin/editor/cheditor5/imageUpload/delete.php
+++ b/plugin/editor/cheditor5/imageUpload/delete.php
@@ -48,6 +48,4 @@ if (file_exists($filepath)) {
 	}
 }
 
-echo $r ? true : false;
-
-?>
\ No newline at end of file
+echo $r ? true : false;
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/imageUpload/upload.php b/plugin/editor/cheditor5/imageUpload/upload.php
index 96d7d51ab..0c345ed86 100644
--- a/plugin/editor/cheditor5/imageUpload/upload.php
+++ b/plugin/editor/cheditor5/imageUpload/upload.php
@@ -129,5 +129,4 @@ $rdata = sprintf('{"fileUrl": "%s", "filePath": "%s", "fileName": "%s", "fileSiz
 	$filename,
 	$filesize );
 
-echo $rdata;
-?>
\ No newline at end of file
+echo $rdata;
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/popup/image.html5.html b/plugin/editor/cheditor5/popup/image.html5.html
index c5f0f9b85..ed91fd34e 100644
--- a/plugin/editor/cheditor5/popup/image.html5.html
+++ b/plugin/editor/cheditor5/popup/image.html5.html
@@ -6,7 +6,7 @@
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<link rel="stylesheet" type="text/css" href="../css/imageupload.css" />
 		<script src="js/dialog.js" type="text/javascript"></script>
-		<script src="js/image.html5.js" type="text/javascript"></script>
+        <script src="js/image.html5.js" type="text/javascript"></script>
 	</head>
     <body>
 		<div id="uploadWindow">
@@ -65,9 +65,7 @@
                             <div style="margin-top:5px;font-size: 12px">
                                 <input type="checkbox" name="use_spacer" value="1" checked="checked" />사진 여백 넣기
                             </div>
-                            <div style="text-align:center;margin-top:15px">
-                                <span style="font-size:12px;font-family:Malgun Gothic,dotum,tahoma;">(전체 사진에 적용됨)</span>
-                            </div>
+                            <div id="webgl_logo_wrapper" class="webgl_logo_wrapper"></div>
                         </form>
                     </div>
 				</div>
diff --git a/plugin/editor/cheditor5/popup/image.html5.m.html b/plugin/editor/cheditor5/popup/image.html5.m.html
new file mode 100644
index 000000000..0e88dd423
--- /dev/null
+++ b/plugin/editor/cheditor5/popup/image.html5.m.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+	<head>
+        <title>CHEditor</title>
+		<meta name="robots" content="noindex, nofollow" />
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<link rel="stylesheet" type="text/css" href="../css/imageupload.m.css" />
+		<script src="js/dialog.js" type="text/javascript"></script>
+        <script src="js/image.html5.m.js" type="text/javascript"></script>
+	</head>
+    <body>
+		<div id="uploadWindow">
+ 			<div id="container">
+                <div style="margin: 0px 0px 10px 0px;">
+                    <img src="../icons/imageUpload/remove_all.gif" class="remove-button" onclick="removeImages();"
+                         alt="" style="vertical-align: middle" />
+                    <input type="file" name="imageUpload[]" accept="image/jpeg,image/png,image/gif" id="inputImageUpload" multiple="multiple"
+                         onchange="selectedFiles(event)" style="vertical-align: middle; visibility: hidden; width: 0px"/>
+                    <img id="fileSelectButton" src="../icons/imageUpload/add.gif" alt="image button" onclick="inputImageUpload.click()"
+                         style="vertical-align: middle; margin-left: -5px; cursor: pointer"/>
+                    <span style="left:308px; top:5px;position:absolute;"><span id="imageCount">0</span>장 / 최대 <span id="maxImageNum"></span>장 사진</span>
+                </div>
+                <div id="imageListWrapper" class="imageListWrapperHtml5"></div>
+                <div id="imageInfoBox">
+                    <div>
+                        <div class="imageInfoTitle"><span>크기 줄이기</span></div>
+                        <div style="text-align:left;font-size:12px;margin-top:7px;line-height:1.4em; padding-left: 5px">
+                            <div>
+                                <span style="vertical-align: middle">가로:</span>
+                                <select name="resizeSelectBox" id="idResizeSelectBox" style="font-size: 12px; vertical-align: middle"></select>
+                                <span style="vertical-align: middle">픽셀</span>
+                                <div style="margin-top: 5px; display:none" id="idUserInputWrapper">
+                                    <span style="vertical-align: middle">입력:</span>
+                                    <input type="text" maxlength="4"
+                                           style="font-size: 12px; width:40px; vertical-align: middle" name="resizeWidth" id="idResizeWidth" />
+                                    <span style="vertical-align: middle">픽셀</span>
+                                </div>
+                            </div>
+                            <div style="margin-top: 10px">사진 높이는 자동으로 설정됩니다.</div>
+                        </div>
+                    </div>
+                    <div style="margin-top: 20px">
+                        <div class="imageInfoTitle"><span>정렬</span></div>
+                        <form name="fm_alignment" id="id_alignment" style="display: inline">
+                            <table style="margin:7px auto 10px auto;border:0;padding:0;border-spacing:0">
+                                <tr>
+                                    <td style="text-align: center">
+                                        <img src="../icons/image_align_left.png" alt="" /><br />
+                                        <input type="radio" name="alignment" value="left" checked="checked" />
+                                    </td>
+                                    <td style="text-align: center">
+                                        <img src="../icons/image_align_center.png" style="margin: 0px 5px" alt="" /><br />
+                                        <input type="radio" name="alignment" value="center" />
+                                    </td>
+                                    <td style="text-align: center">
+                                        <img src="../icons/image_align_right.png" alt="" /><br />
+                                        <input type="radio" name="alignment" value="right" />
+                                    </td>
+                                </tr>
+                            </table>
+                            <div style="margin-top:5px;font-size: 12px">
+                                <input type="checkbox" name="para" value="1" checked="checked" />한줄에 한 장씩 넣기
+                            </div>
+                            <div style="margin-top:5px;font-size: 12px">
+                                <input type="checkbox" name="use_spacer" value="1" checked="checked" />사진 여백 넣기
+                            </div>
+                        </form>
+                    </div>
+				</div>
+			</div>
+ 			<div class="clear"></div>
+ 			<div style="text-align:center;top:310px;width:100%;position:absolute;" id="buttonWrapper"></div>
+		</div>
+		<div id="dragDropContent"></div>
+        <div id="removeImageButton" class="removeButton" style="width:13px;height:13px"></div>
+		<div id="insertionMarker"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/popup/js/fragment-shader.glsl b/plugin/editor/cheditor5/popup/js/fragment-shader.glsl
new file mode 100644
index 000000000..b344ffd17
--- /dev/null
+++ b/plugin/editor/cheditor5/popup/js/fragment-shader.glsl
@@ -0,0 +1,75 @@
+// -------------------------------------------------------
+// CHEditor WebGL Fragment Shader
+// -------------------------------------------------------
+precision highp float;
+
+uniform sampler2D u_image;
+uniform vec2 u_resolution;
+uniform vec2 u_srcResolution;
+
+vec4 getTextureColor(vec2 loc) {
+    return texture2D(u_image, loc / u_srcResolution);
+}
+
+void main() {
+    vec2 ratio = u_srcResolution / u_resolution;
+    vec2 ratioHalf = ceil(ratio / 1.0);
+    vec2 loc = gl_FragCoord.xy;
+
+    loc.y = u_resolution.y - loc.y;
+
+    float weight = 0.0;
+    float weights = 0.0;
+    float weights_alpha = 0.0;
+    vec3 gx_rgb = vec3(0.0);
+    float gx_a = 0.0;
+    float center_y = (loc.y + 0.5) * ratio.y;
+
+    float y = floor(loc.y * ratio.y);
+    float y_length = (loc.y + 1.0) * ratio.y;
+
+    for (int i = 0; i < 5000; i++) {
+        if (y >= y_length) {
+           break;
+        }
+        float dy = abs(center_y - (y + 0.5)) / ratioHalf.y;
+        float center_x = (loc.x + 0.5) * ratio.x;
+        float part_w = dy * dy;
+        float x = floor(loc.x * ratio.x);
+        float x_length = (loc.x + 1.0) * ratio.x;
+
+        for (int j = 0; j < 5000; j++) {
+            if (x >= x_length) {
+                break;
+            }
+
+            float dx = abs(center_x - (x + 0.5)) / ratioHalf.x;
+            float w = sqrt(part_w + dx * dx);
+
+            if (w >= -1.0 && w <= 1.0) {
+                // Hermite 필터
+                weight = 2.0 * w * w * w - 3.0 * w * w + 1.0;
+                if (weight > 0.0) {
+                    vec4 pixel = getTextureColor(vec2(x, y)) * 255.0;
+
+                    // 알파 채널
+                    gx_a += weight * pixel.a;
+                    weights_alpha += weight;
+
+                    if (pixel.a < 255.0) {
+                        weight = weight * pixel.a / 250.0;
+                    }
+                    gx_rgb += weight * pixel.rgb;
+                    weights += weight;
+                }
+            }
+            x++;
+        }
+        y++;
+    }
+
+    gx_rgb = (gx_rgb / weights) / 255.0;
+    gx_a = (gx_a / weights_alpha) / 255.0;
+
+    gl_FragColor = vec4(gx_rgb, gx_a);
+}
diff --git a/plugin/editor/cheditor5/popup/js/image.html5.js b/plugin/editor/cheditor5/popup/js/image.html5.js
index fc97d6cd0..37b9a4559 100644
--- a/plugin/editor/cheditor5/popup/js/image.html5.js
+++ b/plugin/editor/cheditor5/popup/js/image.html5.js
@@ -1,6 +1,7 @@
 // ================================================================
 //                           CHEditor 5
 // ================================================================
+
 var activeImage = null,
     browser = null,
     button,
@@ -29,14 +30,160 @@ var activeImage = null,
     offsetX_marker = -3,
     offsetY_marker = -3,
     readyToMove = false,
-    selectedFilesNum = 0,
     showThumbnailSize = { width: 120, height: 90 },
     tmpLeft = 0,
     tmpTop = 0,
     uploadImagePath = '',
     uploadMaxNumber = 12,
-    uploadScript;
-//  deleteScript;
+    uploadScript,
+    useWebGL = false;
+
+if (ArrayBuffer && !ArrayBuffer.prototype.slice) {
+    ArrayBuffer.prototype.slice = function (start, end) {
+        var len = this.byteLength;
+        start || isFinite(start) && 0 < start && start < len || (start = 0);
+        end || (isFinite(end && start < end && end < len) || (end = len - 1));
+        return new DataView(this, start, end).buffer;
+    };
+}
+
+function GLScale(options) {
+    if (!(this instanceof GLScale)) {
+        return new GLScale(options);
+    }
+    this.precompile(options);
+    return this.scale.bind(this);
+}
+
+GLScale.prototype.precompile = function (options) {
+    var ctxOptions, vertex, fragment, resolutionLocation, positionLocation;
+
+    this.canvas = document.createElement('canvas');
+    this.canvas.width = options.width;
+    this.canvas.height = options.height;
+
+    ctxOptions = {preserveDrawingBuffer: true};
+    this.gl = this.canvas.getContext('webgl', ctxOptions) || this.canvas.getContext('experimental-webgl', ctxOptions);
+
+    if (!this.gl) {
+        throw new Error('Could not initialize webgl context');
+    }
+
+    vertex = GLScale.compileShader(this.gl, GLScale.Hermite.vertex, this.gl.VERTEX_SHADER);
+    fragment = GLScale.compileShader(this.gl, GLScale.Hermite.fragment, this.gl.FRAGMENT_SHADER);
+
+    this.program = GLScale.createProgram(this.gl, vertex, fragment);
+    this.gl.useProgram(this.program);
+
+    this.gl.bindTexture(this.gl.TEXTURE_2D, this.gl.createTexture());
+
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.NEAREST);
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.NEAREST);
+
+    resolutionLocation = this.gl.getUniformLocation(this.program, 'u_resolution');
+    this.gl.uniform2f(resolutionLocation, options.width, options.height);
+
+    this.gl.bindBuffer(this.gl.ARRAY_BUFFER, this.gl.createBuffer());
+    positionLocation = this.gl.getAttribLocation(this.program, 'a_position');
+    this.gl.enableVertexAttribArray(positionLocation);
+    this.gl.vertexAttribPointer(positionLocation, 2, this.gl.FLOAT, false, 0, 0);
+};
+
+GLScale.prototype.scale = function (image, cb) {
+    var srcResolutionLocation;
+    if (typeof image === 'string') {
+        return this.loadImage(image, function (err, image) {
+            if (!err) {
+                return this.scale(image, cb);
+            }
+        });
+    }
+
+    this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, this.gl.RGBA, this.gl.UNSIGNED_BYTE, image);
+
+    srcResolutionLocation = this.gl.getUniformLocation(this.program, 'u_srcResolution');
+    this.gl.uniform2f(srcResolutionLocation, image.width, image.height);
+
+    this.setRectangle(0, 0, image.width, image.height);
+    this.gl.drawArrays(this.gl.TRIANGLES, 0, 6);
+    this.gl.finish();
+
+    if (cb) {
+        cb(this.canvas);
+    }
+    return this;
+};
+
+GLScale.prototype.setRectangle = function (x, y, width, height) {
+    var x1 = x,
+        x2 = x + width,
+        y1 = y,
+        y2 = y + height;
+
+    this.gl.bufferData(this.gl.ARRAY_BUFFER, new Float32Array([
+        x1, y1,
+        x2, y1,
+        x1, y2,
+        x1, y2,
+        x2, y1,
+        x2, y2
+    ]), this.gl.STATIC_DRAW);
+};
+
+GLScale.loadImage = function (url, cb) {
+    var image = new Image();
+    image.onload = cb.bind(this, null, image);
+    image.onerror = cb.bind(this);
+    image.src = url;
+    return this;
+};
+GLScale.prototype.loadImage = GLScale.loadImage;
+
+GLScale.toBlob = (function toBlob() {
+    var CanvasPrototype = window.HTMLCanvasElement.prototype;
+
+    if (CanvasPrototype.toBlob) {
+        return CanvasPrototype.toBlob;
+    }
+
+    return function (callback, type, quality) {
+        var binStr = atob(this.toDataURL(type, quality).split(',')[1]),
+            len = binStr.length,
+            arr = new Uint8Array(len), i = 0;
+
+        for (; i < len; i++) {
+            arr[i] = binStr.charCodeAt(i);
+        }
+        callback(new Blob([arr], {type: type || 'image/png'}));
+    };
+})();
+
+GLScale.compileShader = function (gl, shaderSource, shaderType) {
+    var shader = gl.createShader(shaderType);
+    
+    gl.shaderSource(shader, shaderSource);
+    gl.compileShader(shader);
+    
+    if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+        throw new Error('Could not compile shader: ' + gl.getShaderInfoLog(shader));
+    }
+    return shader;
+};
+
+GLScale.createProgram = function (gl, vertexShader, fragmentShader) {
+    var program = gl.createProgram();
+
+    gl.attachShader(program, vertexShader);
+    gl.attachShader(program, fragmentShader);
+    gl.linkProgram(program);
+    
+    if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+        throw new Error('Program failed to link: ' + gl.getProgramInfoLog (program));
+    }
+    return program;
+};
 
 function createInsertionMaker() {
     var wrapper = document.getElementById('insertionMarker'),
@@ -76,7 +223,7 @@ function showContents() {
     spacerNo = 1, i, imgBox, theImg, lastSpacer;
 
     for (i = 0; i < uploadMaxNumber; i++) {
-        if (i > 0 && ((i % 4) === 0)) {
+        if (i > 0 && i % 4 === 0) {
             imageListWrapper.appendChild(spacer(spacerNo++));
         }
 
@@ -89,7 +236,7 @@ function showContents() {
         imgBox.appendChild(theImg);
 
         imageListWrapper.appendChild(imgBox);
-        if (i === (uploadMaxNumber - 1)) {
+        if (i === uploadMaxNumber - 1) {
             lastSpacer = spacer(spacerNo);
             lastSpacer.style.height = "7px";
             imageListWrapper.appendChild(lastSpacer);
@@ -130,7 +277,7 @@ function getTopPos(inputObj) {
     inputObj = inputObj.offsetParent;
     while (inputObj) {
         if (inputObj.tagName.toLowerCase() !== 'html') {
-            returnValue += (inputObj.offsetTop - inputObj.scrollTop);
+            returnValue += inputObj.offsetTop - inputObj.scrollTop;
             if (browser.msie) {
                 returnValue += inputObj.clientTop;
             }
@@ -182,7 +329,7 @@ function reOrder() {
         imgBox[i].className = 'imageBox';
         imgBox[i].firstChild.className = 'imageBox_theImage';
 
-        if (imgNum > 0 && (imgNum % 4) === 0) {
+        if (imgNum > 0 && imgNum % 4 === 0) {
             breakline.push(imgBox[i].id);
         }
 
@@ -199,28 +346,6 @@ function reOrder() {
     }
 }
 
-function img_delete_post(el){
-    if( el.firstChild.tagName.toLowerCase() === 'img' ){
-        var src = el.firstChild.getAttribute('src'),
-            filesrc = src.replace(/^.*[\\\/]/, ''),
-            data = "filesrc="+filesrc;
-
-        var xhr = new XMLHttpRequest();
-        xhr.open('POST', deleteScript, true);
-        //Send the proper header information along with the request
-        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-
-        xhr.addEventListener("error", function (evt) {
-            try {
-                console.log("파일 전송 중 오류: " + evt.target.error.code);
-            } catch(ex) {
-            }
-        }, false);
-
-        xhr.send(data);
-    }
-}
-
 function showDelete() {
     var self = this, btn;
 
@@ -231,7 +356,7 @@ function showDelete() {
     getDivCoordinates();
     self.className = 'imageBox_theImage_over';
     btn = document.getElementById('removeImageButton');
-    btn.style.left = (showThumbnailSize.width - parseInt(btn.style.width, 10) - 1) + 'px';
+    btn.style.left = showThumbnailSize.width - parseInt(btn.style.width, 10) - 1 + 'px';
     btn.style.top = '-1px';
 
     self.appendChild(btn);
@@ -250,7 +375,6 @@ function showDelete() {
         var images = self.getElementsByTagName('img'), i, moveobj, target;
 
         for (i = 0; i < images.length; i++) {
-            img_delete_post(self);
             self.removeChild(images[i]);
         }
 
@@ -279,6 +403,7 @@ function showDelete() {
         this.style.display = 'none';
         document.body.appendChild(ev.target);
         oEditor.removeEvent(self, 'mouseover', showDelete);
+        self.removeAttribute('title');
     };
 }
 
@@ -318,16 +443,16 @@ function imgComplete(img, imgSize, boxId) {
 
     if (imgSize.width > showThumbnailSize.width || imgSize.height > showThumbnailSize.height) {
         if (imgSize.width > imgSize.height) {
-            resizeW = (imgSize.width > showThumbnailSize.width) ? showThumbnailSize.width : imgSize.width;
-            resizeH = Math.round((imgSize.height * resizeW) / imgSize.width);
+            resizeW = imgSize.width > showThumbnailSize.width ? showThumbnailSize.width : imgSize.width;
+            resizeH = Math.round(imgSize.height * resizeW / imgSize.width);
         } else {
-            resizeH = (imgSize.height > showThumbnailSize.height) ? showThumbnailSize.height : imgSize.height;
-            resizeW = Math.round((imgSize.width * resizeH) / imgSize.height);
+            resizeH = imgSize.height > showThumbnailSize.height ? showThumbnailSize.height : imgSize.height;
+            resizeW = Math.round(imgSize.width * resizeH / imgSize.height);
         }
 
         if (resizeH > showThumbnailSize.height) {
-            resizeH = (imgSize.height > showThumbnailSize.height) ? showThumbnailSize.height : imgSize.height;
-            resizeW = Math.round((imgSize.width * resizeH) / imgSize.height);
+            resizeH = imgSize.height > showThumbnailSize.height ? showThumbnailSize.height : imgSize.height;
+            resizeW = Math.round(imgSize.width * resizeH / imgSize.height);
         }
 
     } else {
@@ -357,6 +482,7 @@ function imgComplete(img, imgSize, boxId) {
     }
 
     elem.style.backgroundImage = "url('" + uploadImagePath + "/dot.gif')";
+    setElemTitle(elem, imgSize.width, imgSize.height);
     oEditor.addEvent(elem, 'mouseover', showDelete);
     elem.onmouseout = function () {
         this.className = 'imageBox_theImage';
@@ -366,26 +492,30 @@ function imgComplete(img, imgSize, boxId) {
     setImageCount();
 }
 
+function setElemTitle(elem, width, height) {
+    elem.setAttribute('title', 'Width: ' + width + 'px, Height: ' + height + 'px');
+}
+
 function showUploadWindow() {
     // ----------------------------------------------------------------------------------
     var uploadWindow  = document.getElementById("uploadWindow"),
         uploadWindowWidth = 700,
         winWidth, el, i, j, imgBox, img;
 
-    if (!(oEditor.undefined(window.innerWidth))) {
+    if (!oEditor.undefined(window.innerWidth)) {
         winWidth  = window.innerWidth;
     } else if (document.documentElement &&
-        (!(oEditor.undefined(document.documentElement.clientWidth))) &&
+        !oEditor.undefined(document.documentElement.clientWidth) &&
              document.documentElement.clientWidth !== 0) {
         winWidth = document.documentElement.clientWidth;
-    } else if (document.body && (!(oEditor.undefined(document.body.clientWidth)))) {
+    } else if (document.body && !oEditor.undefined(document.body.clientWidth)) {
         winWidth = document.body.clientWidth;
     } else {
         alert('현재 브라우저를 지원하지 않습니다.');
         return;
     }
 
-    uploadWindow.style.left = winWidth / 2 - (uploadWindowWidth / 2) + 'px';
+    uploadWindow.style.left = winWidth / 2 - uploadWindowWidth / 2 + 'px';
     uploadWindow.style.display = "block";
     uploadWindow.style.width = uploadWindowWidth + 'px';
 
@@ -401,11 +531,9 @@ function showUploadWindow() {
                 if (imgBox.className !== 'imageBox_theImage') {
                     continue;
                 }
-
-                if (imgBox.firstChild && (imgBox.firstChild.src === modifyImages[i])) {
+                if (imgBox.firstChild && imgBox.firstChild.src === modifyImages[i]) {
                     break;
                 }
-
                 if (imgBox.firstChild === null) {
                     img = new Image();
                     img.src = modifyImages[i];
@@ -439,11 +567,11 @@ function removeImages() {
             remove = img.getElementsByTagName('img');
 
             for (j = 0; j < remove.length; j++) {
-                img_delete_post(img);
                 img.removeChild(remove[j]);
             }
 
             img.parentNode.className = 'imageBox';
+            img.removeAttribute('title');
             oEditor.removeEvent(img, 'mouseover', showDelete);
         }
     }
@@ -491,7 +619,7 @@ function startMoveTimer() {
 
     if (moveTimer >= 0 && moveTimer < 10) {
         moveTimer++;
-        setTimeout('startMoveTimer()', 8);
+        setTimeout(startMoveTimer(), 8);
     }
 
     if (moveTimer === 5) {
@@ -524,7 +652,7 @@ function getMouseButtn(e) {
 
     if (code) {
         if (browser.msie && browser.version < 9) {
-            code = code === 1 ? 0 : (code === 4 ? 1 : code);
+            code = code === 1 ? 0 : code === 4 ? 1 : code;
         }
     }
 
@@ -644,9 +772,9 @@ function dragDropMove(e) {
         }
 
         if (divXPositions[prop] < leftPos &&
-         (divXPositions[prop] + divWidth[prop] * 0.7) > leftPos &&
+         divXPositions[prop] + divWidth[prop] * 0.7 > leftPos &&
           divYPositions[prop] < topPos &&
-         (divYPositions[prop] + divWidth[prop]) > topPos) {
+         divYPositions[prop] + divWidth[prop] > topPos) {
             if (browser.msie) {
                 offsetX = offsetX_marker;
                 offsetY = offsetY_marker;
@@ -912,8 +1040,8 @@ DoUpload.prototype = {
                 offset += 2;
 
                 for (i = 0; i < tags; i++) {
-                    if (view.getUint16(offset + (i * 12), little) === 0x0112) {
-                        return view.getUint16(offset + (i * 12) + 8, little);
+                    if (view.getUint16(offset + i * 12, little) === 0x0112) {
+                        return view.getUint16(offset + i * 12 + 8, little);
                     }
                 }
             } else if ((marker & 0xff00) !== 0xff00) {
@@ -951,62 +1079,140 @@ DoUpload.prototype = {
     },
 
     imageResize : function (image, filetype, resizeWidth, orientation, addWaterMark) {
-        var canvas = document.createElement("canvas"),
-            width = image.width,
-            height = image.height,
-            bitmapData, ctx, rotateImg, rotateW, rotateH, angle, step, offcanvas, offctx, dHeight, dWidth;
-
-
-
-        // 카메라를 돌려서 찍은 경우, 높이를 가로 사이즈로 정한 다음 리사이징 처리. 이 경우, 파일 크기와 처리 속도가
-        // 증가한다.
-
-        // if (orientation === 6 || orientation === 8) {
-        //     var ratio = resizeWidth / height;
-        //     dHeight = height * ratio;
-        //     dWidth = width * ratio;
-        // } else {
-        dHeight = Math.ceil(resizeWidth / width * height);
-        dWidth = resizeWidth;
-        // }
-
-        canvas.width = dWidth;
-        canvas.height = dHeight;
-        ctx = canvas.getContext("2d");
-
-        step = Math.ceil(Math.log(image.width / resizeWidth) / Math.log(2));
-
-        if (step > 1) {
-            offcanvas = document.createElement('canvas');
-            offctx = offcanvas.getContext('2d');
-            offcanvas.width = width / 2;
-            offcanvas.height = height / 2;
-
-            offctx.drawImage(image, 0, 0, offcanvas.width, offcanvas.height);
-            offctx.drawImage(offcanvas, 0, 0, offcanvas.width / 2, offcanvas.height / 2);
-            ctx.drawImage(offcanvas, 0, 0, offcanvas.width / 2, offcanvas.height / 2, 0, 0, dWidth, dHeight);
-        } else {
-            ctx.drawImage(image, 0, 0, dWidth, dHeight);
-        }
-
-        if (orientation === 6 || orientation === 8 || orientation === 3) {
-            angle = orientation === 6 ? Math.PI / 2 : (orientation === 8 ? -Math.PI / 2 : 180 * Math.PI / 2);
-            bitmapData = canvas.toDataURL(filetype, oEditor.config.imgJpegQuality);
-
-            rotateImg = new Image();
-            rotateImg.src = bitmapData;
-            rotateW = orientation !== 3 ? dHeight : dWidth;
-            rotateH = orientation !== 3 ? dWidth : dHeight;
-
-            canvas.width = rotateW;
-            canvas.height = rotateH;
+        var canvas, source_w = image.width, source_h = image.height,
+            resize_h, resize_w, ratio_w, ratio_h, ratio_w_half, ratio_h_half,
+            source_img, resize_img, source_data, resize_data, j, i,
+            x2, weight, weights, weights_alpha, gx_a, gx_b, gx_g, gx_r, center_x, center_y, x_start, x_stop,
+            y_start, y_stop, y, dy, part_w, x, dx, w, pos_x,
+            ctx, gl, imageData = null;
 
+        // 카메라 로테이션 보정
+        if (orientation > 0) {
+            canvas = document.createElement("canvas");
+            canvas.width = source_w;
+            canvas.height = source_h;
+            ctx = canvas.getContext("2d");
             ctx.clearRect(0, 0, canvas.width, canvas.height);
             ctx.save();
-            ctx.translate(canvas.width / 2, canvas.height / 2);
-            ctx.rotate(angle);
-            ctx.drawImage(rotateImg, -dWidth / 2, -dHeight / 2);
+
+            switch (orientation) {
+                case 2 :
+                    ctx.translate(-1, 0, 0, 1, canvas.width, 0); break;
+                case 3 :
+                    ctx.translate(-1, 0, 0, -1, canvas.width, canvas.height); break;
+                case 4 :
+                    ctx.translate(1, 0, 0, -1, 0, canvas.height); break;
+                case 5 :
+                    ctx.translate(0, 1, 1, 0, 0, 0); break;
+                case 6 :
+                    ctx.translate(0, 1, -1, 0, canvas.height, 0); break;
+                case 7 :
+                    ctx.translate(0, -1, -1, 0, canvas.height, canvas.width); break;
+                case 8 :
+                    ctx.translate(0, -1, 1, 0, 0, canvas.width); break;
+                default: break;
+            }
+
+            ctx.drawImage(image, 0, 0);
+            imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
             ctx.restore();
+            source_w = canvas.width;
+            source_h = canvas.height;
+        }
+
+        if (source_w > resizeWidth) {
+            resize_w = resizeWidth;
+            resize_h = Math.ceil(resize_w / source_w * source_h);
+
+            try {
+                gl = GLScale({
+                    width: resize_w, height: resize_h
+                });
+                gl(imageData || image, function (gl_canvas) {
+                    canvas = gl_canvas;
+                });
+            } catch (ignore) {
+                canvas = document.createElement("canvas");
+                ctx = canvas.getContext("2d");
+                canvas.width = source_w;
+                canvas.height = source_h;
+
+                if (imageData) {
+                    ctx.putImageData(imageData, 0, 0);
+                } else {
+                    ctx.drawImage(image, 0, 0);
+                }
+
+                ratio_w = source_w / resize_w;
+                ratio_h = source_h / resize_h;
+                ratio_w_half = Math.ceil(ratio_w / 2);
+                ratio_h_half = Math.ceil(ratio_h / 2);
+                source_img = ctx.getImageData(0, 0, source_w, source_h);
+                resize_img = ctx.createImageData(resize_w, resize_h);
+                source_data = source_img.data;
+                resize_data = resize_img.data;
+
+                for (j = 0; j < resize_h; j++) {
+                    for (i = 0; i < resize_w; i++) {
+                        x2 = (i + j * resize_w) * 4;
+                        weight = weights = weights_alpha = 0;
+                        gx_r = gx_g = gx_b = gx_a = 0;
+                        center_y = (j + 0.5) * ratio_h;
+
+                        x_start = Math.floor(i * ratio_w);
+                        x_stop = Math.ceil((i + 1) * ratio_w);
+                        y_start = Math.floor(j * ratio_h);
+                        y_stop = Math.ceil((j + 1) * ratio_h);
+
+                        x_stop = Math.min(x_stop, source_w);
+                        y_stop = Math.min(y_stop, source_h);
+
+                        for (y = y_start; y < y_stop; y++) {
+                            dy = Math.abs(center_y - (y + 0.5)) / ratio_h_half;
+                            center_x = (i + 0.5) * ratio_w;
+                            part_w = dy * dy;
+
+                            for (x = x_start; x < x_stop; x++) {
+                                dx = Math.abs(center_x - (x + 0.5)) / ratio_w_half;
+                                w = Math.sqrt(part_w + dx * dx);
+                                if (w >= 1) {
+                                    continue;
+                                }
+                                // Hermite 필터
+                                weight = 2 * w * w * w - 3 * w * w + 1;
+                                pos_x = 4 * (x + y * source_w);
+                                // 알파 채널
+                                gx_a += weight * source_data[pos_x + 3];
+                                weights_alpha += weight;
+
+                                if (source_data[pos_x + 3] < 255) {
+                                    weight = weight * source_data[pos_x + 3] / 250;
+                                }
+
+                                gx_r += weight * source_data[pos_x];
+                                gx_g += weight * source_data[pos_x + 1];
+                                gx_b += weight * source_data[pos_x + 2];
+                                weights += weight;
+                            }
+                        }
+                        resize_data[x2] = gx_r / weights;
+                        resize_data[x2 + 1] = gx_g / weights;
+                        resize_data[x2 + 2] = gx_b / weights;
+                        resize_data[x2 + 3] = gx_a / weights_alpha;
+                    }
+                }
+                canvas.width = resize_w;
+                canvas.height = resize_h;
+                ctx.putImageData(resize_img, 0, 0);
+            }
+            
+        } else {
+            canvas = document.createElement("canvas"),
+            canvas.width = source_w; canvas.height = source_h;
+            ctx = canvas.getContext("2d");
+            ctx.drawImage(image, 0, 0);
+            resize_h = source_h;
+            resize_w = source_w;
         }
 
         if (this.reader.watermark && addWaterMark) {
@@ -1014,14 +1220,15 @@ DoUpload.prototype = {
             ctx.drawImage(this.reader.watermark,
                 canvas.width - this.reader.watermark.width, canvas.height - this.reader.watermark.height);
         }
+        
         return canvas.toDataURL(filetype, oEditor.config.imgJpegQuality);
     },
 
     canvasToBlob : function (bitmapData, mimetype) {
-        var raw = atob(bitmapData.split(',')[1]),
+        var i = 0,
             intArray = [],
             len = bitmapData.length,
-            i = 0;
+            raw = atob(bitmapData.split(',')[1]);
 
         for (; i < len; i++) {
             intArray.push(raw.charCodeAt(i));
@@ -1030,8 +1237,7 @@ DoUpload.prototype = {
     },
 
     makeThumbnail : function (image, type, name, orientation) {
-        var canvas = document.createElement("canvas"),
-            width,
+        var width,
             xhr = new XMLHttpRequest(),
             data = new FormData(),
             bitmapData, file;
@@ -1041,11 +1247,10 @@ DoUpload.prototype = {
 
         bitmapData = this.imageResize(image, type, width, orientation);
         file = this.canvasToBlob(bitmapData, type);
-
         data.append(inputFileName, file, 'thumb_' + name); // RFC Level 2
 
         xhr.addEventListener("loadend", function () {
-
+            // loadend
         }, false);
 
         xhr.addEventListener("error", function () {
@@ -1060,20 +1265,19 @@ DoUpload.prototype = {
             filename = evt.target.file.name,
             filetype = evt.target.file.type,
             file = evt.target.file,
-            blob, image, orientation = 1;
+            blob, image, orientation = 1, slice = 64 * 1024;
+
+        if (slice > file.size - 1) {
+            slice = file.size;
+        }
 
         if (evt.target.readyState === FileReader.DONE) {
             blob = new self.MyBlob(self.NewBlob(evt.target.result, filetype));
-            try {
-                orientation = self.getOrientation(evt.target.result.slice(0, 64 * 1024));
-            } catch(err) {
+            orientation = self.getOrientation(evt.target.result.slice(0, slice));
 
-            }
             image = new Image();
-
             image.onload = function () {
                 var bitmapData = null,
-                    canvas = document.createElement("canvas"),
                     data = new FormData(),
                     fileFormat,
                     imgBox = file.boxElem,
@@ -1083,7 +1287,7 @@ DoUpload.prototype = {
 
                 xhr.open('POST', uploadScript, true);
 
-                if (imageResizeWidth > 0 && this.width > imageResizeWidth) {
+                if (imageResizeWidth > 0) {
                     bitmapData = self.imageResize(this, filetype, imageResizeWidth, orientation, true);
                     file = self.canvasToBlob(bitmapData, filetype);
                 }
@@ -1099,7 +1303,7 @@ DoUpload.prototype = {
                 }
 
                 xhr.addEventListener("error", function (evt) {
-                    alert("파일 전송 중 오류: " + evt.target.error.code);
+                    alert("파일 전송 중 오류: " + evt.toString());
                 }, false);
 
                 xhr.addEventListener("loadend", function onLoadendImageHandler(xhrevt) {
@@ -1132,7 +1336,6 @@ DoUpload.prototype = {
                                 height: img.height,
                                 width: img.width
                             };
-
                             imageCompletedList[imgBox.id] = imgInfo;
                             imgComplete(this, imgInfo, imgBox.id);
                             imgBox.appendChild(img);
@@ -1263,13 +1466,14 @@ function setResizeWidth() {
             imageResizeWidth = value;
         } else {
             imageResizeInput.value = '';
+            imageResizeWidth = oEditor.config.imgMaxWidth;
             imageResizeInput.setAttribute('placeholder', oEditor.config.imgMaxWidth.toString());
         }
     }
 }
 
 function init(dialog) {
-    var dlg, i, elem, input, select, value, name;
+    var dlg, i, elem, input, select, value, name, xhr_f, xhr_v, tmpcanvas, glicon;
 
     oEditor = this;
     oEditor.dialog = dialog;
@@ -1279,14 +1483,12 @@ function init(dialog) {
     uploadImagePath = oEditor.config.iconPath + 'imageUpload';
     uploadMaxNumber = oEditor.config.imgUploadNumber;
     uploadScript = oEditor.config.editorPath + 'imageUpload/upload.php';
-    deleteScript = oEditor.config.editorPath + 'imageUpload/delete.php';
     imageListWrapper = document.getElementById("imageListWrapper");
-
-    imageResizeWidth = oEditor.config.imgMaxWidth;
     imageResizeInput = document.getElementById('idResizeWidth');
     select = document.getElementById('idResizeSelectBox');
 
-    if (imageResizeWidth > 0) {
+    if (oEditor.config.imgMaxWidth > 0) {
+        imageResizeWidth = oEditor.config.imgMaxWidth;
         for (i = 0; i < oEditor.config.imgResizeValue.length; i++) {
             name = value = oEditor.config.imgResizeValue[i];
             if (value > oEditor.config.imgMaxWidth) {
@@ -1300,6 +1502,9 @@ function init(dialog) {
         select.onchange = function () {
             if (this.value < 0) {
                 document.getElementById('idUserInputWrapper').style.display = '';
+                imageResizeInput.value = '';
+                imageResizeWidth = oEditor.config.imgMaxWidth;
+                imageResizeInput.focus();
             } else {
                 document.getElementById('idUserInputWrapper').style.display = 'none';
                 imageResizeWidth = this.value;
@@ -1326,7 +1531,6 @@ function init(dialog) {
     initGallery();
     showUploadWindow();
     createInsertionMaker();
-    selectedFilesNum = 0;
 
     oEditor.addEvent(imageListWrapper, 'dragover', dragOver);
     oEditor.addEvent(imageListWrapper, 'dragleave', dragOut);
@@ -1343,6 +1547,38 @@ function init(dialog) {
 
     if (browser.mobile) {
         input = document.getElementById('inputImageUpload');
-        input.setAttribute('capture', 'gallery');
+        input.setAttribute('capture', 'filesystem');
     }
+
+    tmpcanvas = document.createElement('canvas');
+    if (tmpcanvas.getContext('webgl', {preserveDrawingBuffer: true}) ||
+        tmpcanvas.getContext('experimental-webgl', {preserveDrawingBuffer: true}))
+    {
+        useWebGL = true;
+        GLScale.Hermite = { vertex: '', fragment: '' };
+        xhr_v = new XMLHttpRequest();
+        xhr_f = new XMLHttpRequest();
+        xhr_f.open('POST', 'js/fragment-shader.glsl', true);
+        xhr_f.addEventListener("load", function (evt) {
+            if (evt.target.status === 200) {
+                GLScale.Hermite.fragment = this.responseText;
+            } else {
+                useWebGL = false;
+            }
+        });
+        xhr_v.open('POST', 'js/vertex-shader.glsl', true);
+        xhr_v.addEventListener("load", function (evt) {
+            if (evt.target.status === 200) {
+                GLScale.Hermite.vertex = this.responseText;
+            } else {
+                useWebGL = false;
+            }
+        });
+        xhr_f.send();
+        xhr_v.send();
+    }
+    glicon = new Image();
+    glicon.className = 'webgl_logo';
+    glicon.src = uploadImagePath + (useWebGL ? "/webgl.png" : "/webgl-off.png");
+    document.getElementById('webgl_logo_wrapper').appendChild(glicon);
 }
diff --git a/plugin/editor/cheditor5/popup/js/image.html5.m.js b/plugin/editor/cheditor5/popup/js/image.html5.m.js
new file mode 100644
index 000000000..67cedbf5d
--- /dev/null
+++ b/plugin/editor/cheditor5/popup/js/image.html5.m.js
@@ -0,0 +1,1584 @@
+// ================================================================
+//                           CHEditor 5
+// ================================================================
+
+var activeImage = null,
+    browser = null,
+    button,
+    debug = false,
+    destinationObject = null,
+    divHeight = [],
+    divWidth = [],
+    divXPositions = [],
+    divYPositions = [],
+    dragDropDiv,
+    eventDiff_x = 0,
+    eventDiff_y = 0,
+    fileTypeRe = /^image\/(png|jpeg|gif)$/i,
+    geckoOffsetX_marker = -3,
+    geckoOffsetY_marker = -1,
+    imageCompleted = 0,
+    imageCompletedList = [],
+    imageListWrapper,
+    imageResizeInput,
+    imageResizeWidth = 0,
+    insertionMarker,
+    inputFileName = 'file',
+    modifyImages = [],
+    moveTimer = -1,
+    oEditor = null,
+    offsetX_marker = -3,
+    offsetY_marker = -3,
+    readyToMove = false,
+    showThumbnailSize = { width: 120, height: 90 },
+    tmpLeft = 0,
+    tmpTop = 0,
+    uploadImagePath = '',
+    uploadMaxNumber = 12,
+    uploadScript;
+    useWebGL = false;
+
+if (ArrayBuffer && !ArrayBuffer.prototype.slice) {
+    ArrayBuffer.prototype.slice = function (start, end) {
+        var len = this.byteLength;
+        start || isFinite(start) && 0 < start && start < len || (start = 0);
+        end || (isFinite(end && start < end && end < len) || (end = len - 1));
+        return new DataView(this, start, end).buffer;
+    };
+}
+
+function GLScale(options) {
+    if (!(this instanceof GLScale)) {
+        return new GLScale(options);
+    }
+    this.precompile(options);
+    return this.scale.bind(this);
+}
+
+GLScale.prototype.precompile = function (options) {
+    var ctxOptions, vertex, fragment, resolutionLocation, positionLocation;
+
+    this.canvas = document.createElement('canvas');
+    this.canvas.width = options.width;
+    this.canvas.height = options.height;
+
+    ctxOptions = {preserveDrawingBuffer: true};
+    this.gl = this.canvas.getContext('webgl', ctxOptions) || this.canvas.getContext('experimental-webgl', ctxOptions);
+
+    if (!this.gl) {
+        throw new Error('Could not initialize webgl context');
+    }
+
+    vertex = GLScale.compileShader(this.gl, GLScale.Hermite.vertex, this.gl.VERTEX_SHADER);
+    fragment = GLScale.compileShader(this.gl, GLScale.Hermite.fragment, this.gl.FRAGMENT_SHADER);
+
+    this.program = GLScale.createProgram(this.gl, vertex, fragment);
+    this.gl.useProgram(this.program);
+
+    this.gl.bindTexture(this.gl.TEXTURE_2D, this.gl.createTexture());
+
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.NEAREST);
+    this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.NEAREST);
+
+    resolutionLocation = this.gl.getUniformLocation(this.program, 'u_resolution');
+    this.gl.uniform2f(resolutionLocation, options.width, options.height);
+
+    this.gl.bindBuffer(this.gl.ARRAY_BUFFER, this.gl.createBuffer());
+    positionLocation = this.gl.getAttribLocation(this.program, 'a_position');
+    this.gl.enableVertexAttribArray(positionLocation);
+    this.gl.vertexAttribPointer(positionLocation, 2, this.gl.FLOAT, false, 0, 0);
+};
+
+GLScale.prototype.scale = function (image, cb) {
+    var srcResolutionLocation;
+    if (typeof image === 'string') {
+        return this.loadImage(image, function (err, image) {
+            if (!err) {
+                return this.scale(image, cb);
+            }
+        });
+    }
+
+    this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, this.gl.RGBA, this.gl.UNSIGNED_BYTE, image);
+
+    srcResolutionLocation = this.gl.getUniformLocation(this.program, 'u_srcResolution');
+    this.gl.uniform2f(srcResolutionLocation, image.width, image.height);
+
+    this.setRectangle(0, 0, image.width, image.height);
+    this.gl.drawArrays(this.gl.TRIANGLES, 0, 6);
+    this.gl.finish();
+
+    if (cb) {
+        cb(this.canvas);
+    }
+    return this;
+};
+
+GLScale.prototype.setRectangle = function (x, y, width, height) {
+    var x1 = x,
+        x2 = x + width,
+        y1 = y,
+        y2 = y + height;
+
+    this.gl.bufferData(this.gl.ARRAY_BUFFER, new Float32Array([
+        x1, y1,
+        x2, y1,
+        x1, y2,
+        x1, y2,
+        x2, y1,
+        x2, y2
+    ]), this.gl.STATIC_DRAW);
+};
+
+GLScale.loadImage = function (url, cb) {
+    var image = new Image();
+    image.onload = cb.bind(this, null, image);
+    image.onerror = cb.bind(this);
+    image.src = url;
+    return this;
+};
+GLScale.prototype.loadImage = GLScale.loadImage;
+
+GLScale.toBlob = (function toBlob() {
+    var CanvasPrototype = window.HTMLCanvasElement.prototype;
+
+    if (CanvasPrototype.toBlob) {
+        return CanvasPrototype.toBlob;
+    }
+
+    return function (callback, type, quality) {
+        var binStr = atob(this.toDataURL(type, quality).split(',')[1]),
+            len = binStr.length,
+            arr = new Uint8Array(len), i = 0;
+
+        for (; i < len; i++) {
+            arr[i] = binStr.charCodeAt(i);
+        }
+        callback(new Blob([arr], {type: type || 'image/png'}));
+    };
+})();
+
+GLScale.compileShader = function (gl, shaderSource, shaderType) {
+    var shader = gl.createShader(shaderType);
+    
+    gl.shaderSource(shader, shaderSource);
+    gl.compileShader(shader);
+    
+    if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+        throw new Error('Could not compile shader: ' + gl.getShaderInfoLog(shader));
+    }
+    return shader;
+};
+
+GLScale.createProgram = function (gl, vertexShader, fragmentShader) {
+    var program = gl.createProgram();
+
+    gl.attachShader(program, vertexShader);
+    gl.attachShader(program, fragmentShader);
+    gl.linkProgram(program);
+    
+    if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+        throw new Error('Program failed to link: ' + gl.getProgramInfoLog (program));
+    }
+    return program;
+};
+
+function createInsertionMaker() {
+    var wrapper = document.getElementById('insertionMarker'),
+        topIco = new Image(),
+        middleIco = new Image(),
+        bottomIco = new Image();
+
+    topIco.src = uploadImagePath + '/marker_top.gif';
+    topIco.style.width = '6px';
+    topIco.style.height = '1px';
+    wrapper.appendChild(topIco);
+
+    middleIco.src = uploadImagePath + '/marker_middle.gif';
+    middleIco.style.height = '96px';
+    middleIco.style.width = '6px';
+    wrapper.appendChild(middleIco);
+
+    bottomIco.src = uploadImagePath + '/marker_bottom.gif';
+    bottomIco.style.width = '6px';
+    bottomIco.style.height = '1px';
+    wrapper.appendChild(bottomIco);
+}
+
+function popupClose() {
+    oEditor.popupWinCancel();
+}
+
+function showContents() {
+    var spacer = function (id) {
+        var clear = document.createElement('div');
+        clear.style.height = '0px';
+        clear.style.width = '0px';
+        clear.className = 'clear';
+        clear.id = 'spacer' + id;
+        return clear;
+    },
+    spacerNo = 1, i, imgBox, theImg, lastSpacer;
+
+    for (i = 0; i < uploadMaxNumber; i++) {
+        if (i > 0 && i % 2 === 0) {
+            imageListWrapper.appendChild(spacer(spacerNo++));
+        }
+
+        imgBox = document.createElement('div');
+        imgBox.id = 'imgBox' + i;
+        imgBox.className = 'imageBox';
+        theImg = document.createElement('div');
+        theImg.id = 'img_' + i;
+        theImg.className = 'imageBox_theImage';
+        imgBox.appendChild(theImg);
+
+        imageListWrapper.appendChild(imgBox);
+        if (i === uploadMaxNumber - 1) {
+            lastSpacer = spacer(spacerNo);
+            lastSpacer.style.height = "7px";
+            imageListWrapper.appendChild(lastSpacer);
+        }
+    }
+
+    imageListWrapper.style.padding = '5px 7px 0px 5px';
+    document.getElementById('imageInfoBox').style.height = '298px';
+    document.getElementById('imageInfoBox').style.width = '130px';
+}
+
+function setImageCount() {
+    imageCompleted++;
+    document.getElementById('imageCount').innerHTML = imageCompleted.toString();
+}
+
+function getImageCount() {
+    return imageCompleted;
+}
+
+function allowedMaxImage() {
+    return uploadMaxNumber - getImageCount();
+}
+
+function getUploadedCount() {
+    return imageListWrapper.getElementsByTagName('img').length;
+}
+
+function uploadedImageCount() {
+    imageCompleted = getUploadedCount();
+    document.getElementById('imageCount').innerHTML = imageCompleted.toString();
+}
+
+function getTopPos(inputObj) {
+    // ----------------------------------------------------------------------------------
+    var returnValue = inputObj.offsetTop;
+
+    inputObj = inputObj.offsetParent;
+    while (inputObj) {
+        if (inputObj.tagName.toLowerCase() !== 'html') {
+            returnValue += inputObj.offsetTop - inputObj.scrollTop;
+            if (browser.msie) {
+                returnValue += inputObj.clientTop;
+            }
+        }
+        inputObj = inputObj.offsetParent;
+    }
+    return returnValue;
+}
+
+function getLeftPos(inputObj) {
+    // ----------------------------------------------------------------------------------
+    var returnValue = inputObj.offsetLeft;
+
+    inputObj = inputObj.offsetParent;
+    while (inputObj) {
+        if (inputObj.id !== 'imageListWrapper') {
+            returnValue += inputObj.offsetLeft;
+        }
+        inputObj = inputObj.offsetParent;
+    }
+    return returnValue;
+}
+
+function getDivCoordinates() {
+    // ----------------------------------------------------------------------------------
+    var imgBox = imageListWrapper.getElementsByTagName('DIV'),
+        i = 0;
+
+    for (; i < imgBox.length; i++) {
+        if ((imgBox[i].className === 'imageBox' || imgBox[i].className === 'imageBoxHighlighted') && imgBox[i].id) {
+            divXPositions[imgBox[i].id] = getLeftPos(imgBox[i]);
+            divYPositions[imgBox[i].id] = getTopPos(imgBox[i]);
+            divWidth[imgBox[i].id]  = imgBox[i].offsetWidth;
+            divHeight[imgBox[i].id] = imgBox[i].offsetHeight;
+        }
+    }
+}
+
+function reOrder() {
+    // ----------------------------------------------------------------------------------
+    var imgBox = imageListWrapper.getElementsByTagName('div'),
+        imgNum = 0, i, spacer, breakline = [];
+
+    for (i = 0; i < imgBox.length; i++) {
+        if (imgBox[i].id.indexOf('imgBox') === -1) {
+            continue;
+        }
+
+        imgBox[i].className = 'imageBox';
+        imgBox[i].firstChild.className = 'imageBox_theImage';
+
+        if (imgNum > 0 && imgNum % 4 === 0) {
+            breakline.push(imgBox[i].id);
+        }
+
+        imgNum++;
+    }
+
+    for (i = 0; i < breakline.length; i++) {
+        spacer = document.getElementById('spacer' + (i + 1));
+        if (i + 1 === breakline.length) {
+            imageListWrapper.appendChild(spacer);
+        } else {
+            imageListWrapper.insertBefore(spacer, document.getElementById(breakline[i]));
+        }
+    }
+}
+
+function showDelete() {
+    var self = this, btn;
+
+    if (readyToMove) {
+        return;
+    }
+
+    getDivCoordinates();
+    self.className = 'imageBox_theImage_over';
+    btn = document.getElementById('removeImageButton');
+    btn.style.left = showThumbnailSize.width - parseInt(btn.style.width, 10) - 1 + 'px';
+    btn.style.top = '-1px';
+
+    self.appendChild(btn);
+    btn.style.display = 'block';
+
+    btn.onmouseover = function (ev) {
+        oEditor.stopEvent(ev);
+        this.style.display = 'block';
+        this.className = 'removeButton_over';
+        self.className = 'imageBox_theImage_over';
+    };
+    btn.onmouseout = function () {
+        this.className = 'removeButton';
+    };
+    btn.onmousedown = function (ev) {
+        var images = self.getElementsByTagName('img'), i, moveobj, target;
+
+        for (i = 0; i < images.length; i++) {
+            self.removeChild(images[i]);
+        }
+
+        self.removeChild(self.firstChild);
+        self.className = 'imageBox_theImage';
+
+        if (self.parentNode.nextSibling && self.parentNode.nextSibling.id) {
+            moveobj = self.parentNode.nextSibling;
+            target = self.parentNode;
+
+            while (moveobj !== null) {
+                if (moveobj.firstChild && !moveobj.firstChild.firstChild) {
+                    break;
+                }
+                if (/^spacer/.test(moveobj.id)) {
+                    moveobj = moveobj.nextSibling;
+                    continue;
+                }
+                imageListWrapper.insertBefore(moveobj, target);
+                moveobj = target.nextSibling;
+            }
+        }
+
+        reOrder();
+        uploadedImageCount();
+        this.style.display = 'none';
+        document.body.appendChild(ev.target);
+        oEditor.removeEvent(self, 'mouseover', showDelete);
+        self.removeAttribute('title');
+    };
+}
+
+function hideDelete() {
+    // ----------------------------------------------------------------------------------
+    document.getElementById('removeImageButton').style.display = 'none';
+}
+
+function startUpload(list) {
+    // ----------------------------------------------------------------------------------
+    var el = imageListWrapper.getElementsByTagName('div'), i, imgBox,
+        count = 0, len = list.length;
+
+    for (i = 0; i < el.length; i++) {
+        imgBox = el[i];
+        if (imgBox.className !== 'imageBox_theImage') {
+            continue;
+        }
+        if (count === len) {
+            break;
+        }
+        if (!imgBox.firstChild || imgBox.firstChild.tagName.toLowerCase()  !== 'img') {
+            imgBox.style.backgroundImage = "url('" + uploadImagePath + "/loader.gif')";
+            list[count++].boxElem = imgBox;
+        }
+    }
+}
+
+function fileFilterError(file) {
+    alert("선택하신 '" + file + "' 파일은 전송할 수 없습니다.\n" +
+       "gif, png, jpg 사진 파일만 전송할 수 있습니다.");
+}
+
+function imgComplete(img, imgSize, boxId) {
+    var resizeW, resizeH, M, elem;
+    img.setAttribute("border", '0');
+
+    if (imgSize.width > showThumbnailSize.width || imgSize.height > showThumbnailSize.height) {
+        if (imgSize.width > imgSize.height) {
+            resizeW = imgSize.width > showThumbnailSize.width ? showThumbnailSize.width : imgSize.width;
+            resizeH = Math.round(imgSize.height * resizeW / imgSize.width);
+        } else {
+            resizeH = imgSize.height > showThumbnailSize.height ? showThumbnailSize.height : imgSize.height;
+            resizeW = Math.round(imgSize.width * resizeH / imgSize.height);
+        }
+
+        if (resizeH > showThumbnailSize.height) {
+            resizeH = imgSize.height > showThumbnailSize.height ? showThumbnailSize.height : imgSize.height;
+            resizeW = Math.round(imgSize.width * resizeH / imgSize.height);
+        }
+
+    } else {
+        resizeW = imgSize.width;
+        resizeH = imgSize.height;
+    }
+
+    img.style.width  = resizeW - 2 + 'px';
+    img.style.height = resizeH - 2 + 'px';
+    img.style.margin = "1px";
+
+    if (resizeW < showThumbnailSize.width) {
+        M = showThumbnailSize.width - resizeW;
+        img.style.marginLeft = Math.round(M / 2) + 'px';
+    }
+
+    if (resizeH < showThumbnailSize.height) {
+        M = showThumbnailSize.height - resizeH;
+        img.style.marginTop = Math.round(M / 2) + 'px';
+    }
+
+    elem = document.getElementById(boxId);
+    boxId = boxId.replace(/img_/, '');
+
+    if (boxId % 12 === 0) {
+        imageListWrapper.scrollTop = elem.offsetTop - 6;
+    }
+
+    elem.style.backgroundImage = "url('" + uploadImagePath + "/dot.gif')";
+    setElemTitle(elem, imgSize.width, imgSize.height);
+    oEditor.addEvent(elem, 'mouseover', showDelete);
+    elem.onmouseout = function () {
+        this.className = 'imageBox_theImage';
+        hideDelete();
+    };
+
+    setImageCount();
+}
+
+function setElemTitle(elem, width, height) {
+    elem.setAttribute('title', 'Width: ' + width + 'px, Height: ' + height + 'px');
+}
+
+function showUploadWindow() {
+    // ----------------------------------------------------------------------------------
+    var uploadWindow  = document.getElementById("uploadWindow"),
+        uploadWindowWidth = 700,
+        winWidth, el, i, j, imgBox, img;
+
+    if (!oEditor.undefined(window.innerWidth)) {
+        winWidth  = window.innerWidth;
+    } else if (document.documentElement &&
+        !oEditor.undefined(document.documentElement.clientWidth) &&
+             document.documentElement.clientWidth !== 0) {
+        winWidth = document.documentElement.clientWidth;
+    } else if (document.body && !oEditor.undefined(document.body.clientWidth)) {
+        winWidth = document.body.clientWidth;
+    } else {
+        alert('현재 브라우저를 지원하지 않습니다.');
+        return;
+    }
+
+    uploadWindow.style.left = winWidth / 2 - uploadWindowWidth / 2 + 'px';
+    uploadWindow.style.display = "block";
+    uploadWindow.style.width = uploadWindowWidth + 'px';
+
+    if (modifyImages.length > 0) {
+        el = imageListWrapper.getElementsByTagName('div');
+        for (i = 0; i < modifyImages.length; i++) {
+            if (i > 7) {
+                break;
+            }
+
+            for (j = 0; j < el.length; j++) {
+                imgBox = el[j];
+                if (imgBox.className !== 'imageBox_theImage') {
+                    continue;
+                }
+                if (imgBox.firstChild && imgBox.firstChild.src === modifyImages[i]) {
+                    break;
+                }
+                if (imgBox.firstChild === null) {
+                    img = new Image();
+                    img.src = modifyImages[i];
+                    img.border = 0;
+                    img.alt = '';
+                    img.style.width = '120px';
+                    img.style.height = '90px';
+                    imgBox.appendChild(img);
+                    break;
+                }
+            }
+        }
+    }
+}
+
+function removeImages() {
+    var images = [], i, j, theImage, img, remove;
+    document.body.appendChild(document.getElementById('removeImageButton'));
+
+    for (i = 0; i < uploadMaxNumber; i++) {
+        theImage = document.getElementById('img_' + i);
+        if (theImage.hasChildNodes() && theImage.firstChild.tagName.toLowerCase() === 'img') {
+            images.push(theImage);
+        }
+    }
+
+    for (i = 0; i < images.length; i++) {
+        img = images[i];
+        if (img.firstChild !== null) {
+            oEditor.removeEvent(img, 'mouseover', showDelete);
+            remove = img.getElementsByTagName('img');
+
+            for (j = 0; j < remove.length; j++) {
+                img.removeChild(remove[j]);
+            }
+
+            img.parentNode.className = 'imageBox';
+            img.removeAttribute('title');
+            oEditor.removeEvent(img, 'mouseover', showDelete);
+        }
+    }
+    uploadedImageCount();
+    imageCompletedList = [];
+}
+
+function removeImage() {
+    // ----------------------------------------------------------------------------------
+    var i, theImage, found = false;
+
+    for (i = 0; i < uploadMaxNumber; i++) {
+        theImage = document.getElementById('img_' + i);
+        if (theImage.hasChildNodes() && theImage.firstChild.tagName.toLowerCase() === 'img') {
+            found = true;
+            break;
+        }
+    }
+
+    if (found) {
+        if (!confirm('추가하신 사진이 있습니다. 사진 넣기를 취소하시겠습니까?')) {
+            return false;
+        }
+        removeImages();
+    }
+
+    return true;
+}
+
+function closeWindow() {
+    // ----------------------------------------------------------------------------------
+    if (removeImage()) {
+        popupClose();
+    }
+}
+
+function cancelEvent() {
+    // ----------------------------------------------------------------------------------
+    return false;
+}
+
+function startMoveTimer() {
+    // ----------------------------------------------------------------------------------
+    var subElements, newDiv;
+
+    if (moveTimer >= 0 && moveTimer < 10) {
+        moveTimer++;
+        setTimeout(startMoveTimer(), 8);
+    }
+
+    if (moveTimer === 5) {
+        getDivCoordinates();
+        subElements = dragDropDiv.getElementsByTagName('div');
+        if (subElements.length > 0) {
+            dragDropDiv.removeChild(subElements[0]);
+        }
+
+        dragDropDiv.style.display = 'block';
+        newDiv = activeImage.cloneNode(true);
+        newDiv.className = 'imageBox';
+        newDiv.style.opacity = 0.5;
+
+        newDiv.id = '';
+        newDiv.style.padding = '2px';
+        dragDropDiv.appendChild(newDiv);
+
+        dragDropDiv.style.top = tmpTop + 'px';
+        dragDropDiv.style.left = tmpLeft + 'px';
+    }
+
+    return false;
+}
+
+function getMouseButtn(e) {
+    var code;
+    e = e || window.event;
+    code = e.button;
+
+    if (code) {
+        if (browser.msie && browser.version < 9) {
+            code = code === 1 ? 0 : code === 4 ? 1 : code;
+        }
+    }
+
+    return code;
+}
+
+function selectImage(e) {
+    // ----------------------------------------------------------------------------------
+    var el = this.parentNode.firstChild.firstChild, obj;
+
+    if (!el) {
+        return;
+    }
+
+    e = e || window.event;
+    if (getMouseButtn(e) === 2) {
+        return;
+    }
+
+    obj = this.parentNode;
+    hideDelete();
+
+    obj.className = 'imageBoxHighlighted';
+    activeImage = obj;
+    readyToMove = true;
+    moveTimer = 0;
+
+    tmpLeft = e.clientX + Math.max(document.body.scrollLeft, document.documentElement.scrollLeft);
+    tmpTop = e.clientY + Math.max(document.body.scrollTop, document.documentElement.scrollTop);
+
+    startMoveTimer();
+    return false;
+}
+
+function dragDropEnd() {
+    // ----------------------------------------------------------------------------------
+    var parentObj, chkObj, turn = false;
+
+    readyToMove = false;
+    moveTimer = -1;
+    dragDropDiv.style.display = 'none';
+    insertionMarker.style.display = 'none';
+
+    if (!activeImage) {
+        return;
+    }
+
+    if (destinationObject && destinationObject !== activeImage) {
+        parentObj = destinationObject.parentNode;
+        chkObj = destinationObject.previousSibling;
+        turn = false;
+
+        if (chkObj === null) {
+            chkObj = imageListWrapper.firstChild;
+            turn = true;
+        }
+
+        if (chkObj.id.indexOf('spacer') !== -1) {
+            chkObj = chkObj.previousSibling;
+        }
+
+        if (chkObj.firstChild.firstChild === null) {
+            reOrder();
+            return;
+        }
+
+        if (chkObj && chkObj.id !== null) {
+            while (chkObj) {
+                if (chkObj.firstChild.firstChild !== null) {
+                    break;
+                }
+                chkObj = chkObj.previousSibling;
+            }
+            destinationObject = turn ? chkObj : chkObj.nextSibling;
+        }
+
+        parentObj.insertBefore(activeImage, destinationObject);
+        reOrder();
+
+        activeImage = null;
+        destinationObject = null;
+        getDivCoordinates();
+
+        return false;
+    }
+
+    activeImage.className = "imageBox";
+    return true;
+}
+
+function dragDropMove(e) {
+    // ----------------------------------------------------------------------------------
+    var elementFound = false, prop, offsetX, offsetY, leftPos, topPos;
+
+    if (moveTimer === -1 || !readyToMove) {
+        return;
+    }
+
+    e = e || window.event;
+
+    leftPos = e.clientX + document.documentElement.scrollLeft - eventDiff_x;
+    topPos = e.clientY + document.documentElement.scrollTop - eventDiff_y;
+
+    dragDropDiv.style.top = topPos + 'px';
+    dragDropDiv.style.left = leftPos + 'px';
+
+    leftPos = leftPos + eventDiff_x;
+    topPos = topPos + eventDiff_y;
+
+    if (getMouseButtn(e) !== 0) {
+        dragDropEnd();
+    }
+
+    for (prop in divXPositions) {
+        if (!divXPositions.hasOwnProperty(prop) || divXPositions[prop].className === 'clear') {
+            continue;
+        }
+
+        if (divXPositions[prop] < leftPos &&
+         divXPositions[prop] + divWidth[prop] * 0.7 > leftPos &&
+          divYPositions[prop] < topPos &&
+         divYPositions[prop] + divWidth[prop] > topPos) {
+            if (browser.msie) {
+                offsetX = offsetX_marker;
+                offsetY = offsetY_marker;
+            } else {
+                offsetX = geckoOffsetX_marker;
+                offsetY = geckoOffsetY_marker;
+            }
+
+            insertionMarker.style.top = divYPositions[prop] + offsetY + 'px';
+            insertionMarker.style.left = divXPositions[prop] + offsetX + 'px';
+            insertionMarker.style.display = 'block';
+            destinationObject = document.getElementById(prop);
+            elementFound = true;
+            break;
+        }
+    }
+
+    if (!elementFound) {
+        insertionMarker.style.display = 'none';
+        destinationObject = false;
+    }
+
+    return false;
+}
+
+function initGallery() {
+    // ----------------------------------------------------------------------------------
+    var imgBox = imageListWrapper.getElementsByTagName('div'),
+        i;
+
+    for (i = 0; i < imgBox.length; i++) {
+        if (imgBox[i].className === 'imageBox_theImage') {
+            imgBox[i].onmousedown = selectImage;
+        }
+    }
+
+    document.body.onselectstart = cancelEvent;
+    document.body.ondragstart = cancelEvent;
+    document.body.onmouseup = dragDropEnd;
+    document.body.onmousemove = dragDropMove;
+
+    dragDropDiv = document.getElementById('dragDropContent');
+    insertionMarker = document.getElementById('insertionMarker');
+    getDivCoordinates();
+}
+
+function doSubmit() {
+    // ----------------------------------------------------------------------------------
+    var el = imageListWrapper.getElementsByTagName('div'),
+        imageArray = [],
+        num = 0,
+        elem = document.getElementById('id_alignment').elements,
+        imgParagraph = false,
+        useSpacer = false,
+        imgAlign = 'top', i, imgBox, input;
+
+    for (i = 0; i < elem.length; i++) {
+        input = elem[i];
+        switch (input.name) {
+            case "alignment" :
+                if (input.checked) {
+                    imgAlign = input.value;
+                }
+                break;
+            case "para" :
+                imgParagraph = input.checked;
+                break;
+            case "use_spacer" :
+                useSpacer = input.checked;
+                break;
+        }
+    }
+
+    for (i = 0; i < el.length; i++) {
+        imgBox = el[i];
+        if (imgBox.className !== "imageBox_theImage") {
+            continue;
+        }
+
+        if (imgBox.firstChild !== null) {
+            imageArray[num] = imageCompletedList[imgBox.id];
+
+            if (imgAlign === "break") {
+                imageArray[num].alt = "break";
+            } else {
+                imageArray[num].alt = '';
+                imageArray[num].align = imgAlign;
+            }
+
+            num++;
+        }
+    }
+
+    if (imageArray.length > 0) {
+        oEditor.doInsertImage(imageArray, imgParagraph, useSpacer);
+    }
+    oEditor.popupWinClose();
+}
+
+function selectedFiles(evt) {
+    var upload = new DoUpload(),
+        files = evt.target.files || [];
+
+    oEditor.stopEvent(evt);
+    if (files) {
+        upload.select(files);
+    }
+}
+
+function DoUpload() {
+    this.list = [];
+    this.reader = new FileReader();
+    this.URL = window.URL || window.webkitURL;
+
+    this.reader.onprogress = null;
+    this.reader.onloadstart = null;
+    this.reader.onabort = null;
+    this.reader.onerror = null;
+
+    this.MyBlob = (function () {
+        var key, blob, self = this;
+        function MYBLOB(blob) {
+            var url = null;
+            this.blob = blob;
+            blob = null;
+
+            this.getURL = function () {
+                if (url) {
+                    return url;
+                }
+                url = self.URL.createObjectURL(this.blob);
+                return url;
+            };
+            this.dispose = function () {
+                if (url) {
+                    url = self.URL.revokeObjectURL(url);
+                }
+                if (typeof this.blob.msClose !== 'undefined') {
+                    this.blob.msClose();
+                }
+                this.blob = null;
+                if (debug) {
+                    console.log("Blob Data Clear");
+                }
+            };
+        }
+
+        blob = new Blob();
+        for (key in blob) {
+            if (blob.hasOwnProperty(key)) {
+                (function (key) {
+                    Object.defineProperty(MYBLOB.prototype,
+                        key,
+                        {
+                            enumerable: true,
+                            configurable: true,
+                            get: function () {
+                                return this.blob[key];
+                            }
+                        }
+                    );
+                }(key));
+            }
+        }
+
+        key = undefined;
+        return MYBLOB;
+    }());
+
+    return this;
+}
+
+DoUpload.prototype = {
+    select: function (files) {
+        var self = this,
+            num = files.length,
+            i = 0,
+            file = null;
+
+        if (num > allowedMaxImage()) {
+            num = allowedMaxImage();
+        }
+
+        for (; i < num; i++) {
+            file = files[i];
+
+            if (!file.type.match(fileTypeRe)) {
+                fileFilterError(file.name);
+                continue;
+            }
+            this.list.push(file);
+        }
+
+        if (this.list.length < 1) {
+            return;
+        }
+
+        this.reader.addEventListener("error", function (evt) {
+            self.onReadDataErrorHandler(evt);
+        }, false);
+
+        this.reader.onloadend = function (evt) {
+            self.dataLoadHandler(evt);
+        };
+
+        setResizeWidth();
+        startUpload(this.list);
+
+        this.load();
+    },
+
+    getDateTime : function () {
+        var date = new Date(),
+            year = date.getFullYear(),
+            month = date.getMonth() + 1,
+            day = date.getDate(),
+            hours = date.getHours(),
+            minutes = date.getMinutes(),
+            seconds = date.getSeconds();
+
+        return String(10000 * year + 100 * month + day +
+            ('0' + hours).slice(-2) + ('0' + minutes).slice(-2) + ('0' + seconds).slice(-2));
+    },
+
+    makeFilename : function (type) {
+        var chars = "abcdefghiklmnopqrstuvwxyz",
+            len = 8, clen = chars.length, rData = '', i, rnum;
+
+        for (i = 0; i < len; i++) {
+            rnum = Math.floor(Math.random() * clen);
+            rData += chars.substring(rnum, rnum + 1);
+        }
+
+        if (type !== '') {
+            rData += type.toLowerCase();
+        }
+
+        return this.getDateTime() + '_' + rData;
+    },
+
+    getOrientation : function (data) {
+        var view = new DataView(data),
+            length = view.byteLength,
+            offset = 2,
+            marker, little, tags, i;
+
+        if (view.getUint16(0, false) !== 0xffd8) {
+            return -2;
+        }
+
+        while (offset < length) {
+            marker = view.getUint16(offset, false);
+            offset += 2;
+
+            if (marker === 0xffe1) {
+                if (view.getUint32(offset += 2, false) !== 0x45786966) {
+                    return -1;
+                }
+
+                little = view.getUint16(offset += 6, false) === 0x4949;
+                offset += view.getUint32(offset + 4, little);
+                tags = view.getUint16(offset, little);
+                offset += 2;
+
+                for (i = 0; i < tags; i++) {
+                    if (view.getUint16(offset + i * 12, little) === 0x0112) {
+                        return view.getUint16(offset + i * 12 + 8, little);
+                    }
+                }
+            } else if ((marker & 0xff00) !== 0xff00) {
+                break;
+            } else {
+                offset += view.getUint16(offset, false);
+            }
+        }
+
+        return -1;
+    },
+
+    NewBlob : function (data, datatype) {
+        var blob = null, blobb;
+        try {
+            blob = new Blob([data], {type: datatype});
+        } catch (e) {
+            window.BlobBuilder = window.BlobBuilder
+                || window.WebKitBlobBuilder
+                || window.MozBlobBuilder
+                || window.MSBlobBuilder;
+
+            if (e.name === 'TypeError' && window.BlobBuilder) {
+                blobb = new BlobBuilder();
+                blobb.append(data);
+                blob = blobb.getBlob(datatype);
+                console.log("TypeError");
+            } else if (e.name === "InvalidStateError") {
+                console.log("InvalidStateError");
+            } else {
+                console.log("Error");
+            }
+        }
+        return blob;
+    },
+
+    imageResize : function (image, filetype, resizeWidth, orientation, addWaterMark) {
+        var canvas, source_w = image.width, source_h = image.height,
+            resize_h, resize_w, ratio_w, ratio_h, ratio_w_half, ratio_h_half,
+            source_img, resize_img, source_data, resize_data, j, i,
+            x2, weight, weights, weights_alpha, gx_a, gx_b, gx_g, gx_r, center_x, center_y, x_start, x_stop,
+            y_start, y_stop, y, dy, part_w, x, dx, w, pos_x,
+            ctx, gl, imageData = null;
+
+        // 카메라 로테이션 보정
+        if (orientation > 0) {
+            canvas = document.createElement("canvas");
+            canvas.width = source_w;
+            canvas.height = source_h;
+            ctx = canvas.getContext("2d");
+            ctx.clearRect(0, 0, canvas.width, canvas.height);
+            ctx.save();
+
+            switch (orientation) {
+                case 2 :
+                    ctx.translate(-1, 0, 0, 1, canvas.width, 0); break;
+                case 3 :
+                    ctx.translate(-1, 0, 0, -1, canvas.width, canvas.height); break;
+                case 4 :
+                    ctx.translate(1, 0, 0, -1, 0, canvas.height); break;
+                case 5 :
+                    ctx.translate(0, 1, 1, 0, 0, 0); break;
+                case 6 :
+                    ctx.translate(0, 1, -1, 0, canvas.height, 0); break;
+                case 7 :
+                    ctx.translate(0, -1, -1, 0, canvas.height, canvas.width); break;
+                case 8 :
+                    ctx.translate(0, -1, 1, 0, 0, canvas.width); break;
+                default: break;
+            }
+
+            ctx.drawImage(image, 0, 0);
+            imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+            ctx.restore();
+            source_w = canvas.width;
+            source_h = canvas.height;
+        }
+
+        if (source_w > resizeWidth) {
+            resize_w = resizeWidth;
+            resize_h = Math.ceil(resize_w / source_w * source_h);
+
+            try {
+                gl = GLScale({
+                    width: resize_w, height: resize_h
+                });
+                gl(imageData || image, function (gl_canvas) {
+                    canvas = gl_canvas;
+                });
+            } catch (ignore) {
+                canvas = document.createElement("canvas");
+                ctx = canvas.getContext("2d");
+                canvas.width = source_w;
+                canvas.height = source_h;
+
+                if (imageData) {
+                    ctx.putImageData(imageData, 0, 0);
+                } else {
+                    ctx.drawImage(image, 0, 0);
+                }
+
+                ratio_w = source_w / resize_w;
+                ratio_h = source_h / resize_h;
+                ratio_w_half = Math.ceil(ratio_w / 2);
+                ratio_h_half = Math.ceil(ratio_h / 2);
+                source_img = ctx.getImageData(0, 0, source_w, source_h);
+                resize_img = ctx.createImageData(resize_w, resize_h);
+                source_data = source_img.data;
+                resize_data = resize_img.data;
+
+                for (j = 0; j < resize_h; j++) {
+                    for (i = 0; i < resize_w; i++) {
+                        x2 = (i + j * resize_w) * 4;
+                        weight = weights = weights_alpha = 0;
+                        gx_r = gx_g = gx_b = gx_a = 0;
+                        center_y = (j + 0.5) * ratio_h;
+
+                        x_start = Math.floor(i * ratio_w);
+                        x_stop = Math.ceil((i + 1) * ratio_w);
+                        y_start = Math.floor(j * ratio_h);
+                        y_stop = Math.ceil((j + 1) * ratio_h);
+
+                        x_stop = Math.min(x_stop, source_w);
+                        y_stop = Math.min(y_stop, source_h);
+
+                        for (y = y_start; y < y_stop; y++) {
+                            dy = Math.abs(center_y - (y + 0.5)) / ratio_h_half;
+                            center_x = (i + 0.5) * ratio_w;
+                            part_w = dy * dy;
+
+                            for (x = x_start; x < x_stop; x++) {
+                                dx = Math.abs(center_x - (x + 0.5)) / ratio_w_half;
+                                w = Math.sqrt(part_w + dx * dx);
+                                if (w >= 1) {
+                                    continue;
+                                }
+                                // Hermite 필터
+                                weight = 2 * w * w * w - 3 * w * w + 1;
+                                pos_x = 4 * (x + y * source_w);
+                                // 알파 채널
+                                gx_a += weight * source_data[pos_x + 3];
+                                weights_alpha += weight;
+
+                                if (source_data[pos_x + 3] < 255) {
+                                    weight = weight * source_data[pos_x + 3] / 250;
+                                }
+
+                                gx_r += weight * source_data[pos_x];
+                                gx_g += weight * source_data[pos_x + 1];
+                                gx_b += weight * source_data[pos_x + 2];
+                                weights += weight;
+                            }
+                        }
+                        resize_data[x2] = gx_r / weights;
+                        resize_data[x2 + 1] = gx_g / weights;
+                        resize_data[x2 + 2] = gx_b / weights;
+                        resize_data[x2 + 3] = gx_a / weights_alpha;
+                    }
+                }
+                canvas.width = resize_w;
+                canvas.height = resize_h;
+                ctx.putImageData(resize_img, 0, 0);
+            }
+            
+        } else {
+            canvas = document.createElement("canvas"),
+            canvas.width = source_w; canvas.height = source_h;
+            ctx = canvas.getContext("2d");
+            ctx.drawImage(image, 0, 0);
+            resize_h = source_h;
+            resize_w = source_w;
+        }
+
+        if (this.reader.watermark && addWaterMark) {
+            ctx.globalAlpha = oEditor.config.imgWaterMarkAlpha;
+            ctx.drawImage(this.reader.watermark,
+                canvas.width - this.reader.watermark.width, canvas.height - this.reader.watermark.height);
+        }
+        
+        return canvas.toDataURL(filetype, oEditor.config.imgJpegQuality);
+    },
+
+    canvasToBlob : function (bitmapData, mimetype) {
+        var i = 0,
+            intArray = [],
+            len = bitmapData.length,
+            raw = atob(bitmapData.split(',')[1]);
+
+        for (; i < len; i++) {
+            intArray.push(raw.charCodeAt(i));
+        }
+        return new Blob([new Uint8Array(intArray)], {type: mimetype});
+    },
+
+    makeThumbnail : function (image, type, name, orientation) {
+        var width,
+            xhr = new XMLHttpRequest(),
+            data = new FormData(),
+            bitmapData, file;
+
+        xhr.open('POST', uploadScript, true);
+        width = oEditor.config.thumbnailWidth;
+
+        bitmapData = this.imageResize(image, type, width, orientation);
+        file = this.canvasToBlob(bitmapData, type);
+        data.append(inputFileName, file, 'thumb_' + name); // RFC Level 2
+
+        xhr.addEventListener("loadend", function () {
+            // loadend
+        }, false);
+
+        xhr.addEventListener("error", function () {
+            alert("Thumbnail 파일 전송 중 오류:");
+        }, false);
+
+        xhr.send(data);
+    },
+
+    dataLoadHandler: function (evt) {
+        var self = this,
+            filename = evt.target.file.name,
+            filetype = evt.target.file.type,
+            file = evt.target.file,
+            blob, image, orientation = 1, slice = 64 * 1024;
+
+        if (slice > file.size - 1) {
+            slice = file.size;
+        }
+
+        if (evt.target.readyState === FileReader.DONE) {
+            blob = new self.MyBlob(self.NewBlob(evt.target.result, filetype));
+            orientation = self.getOrientation(evt.target.result.slice(0, slice));
+
+            image = new Image();
+            image.onload = function () {
+                var bitmapData = null,
+                    data = new FormData(),
+                    fileFormat,
+                    imgBox = file.boxElem,
+                    imgInfo = {},
+                    randomName,
+                    xhr = new XMLHttpRequest();
+
+                xhr.open('POST', uploadScript, true);
+
+                if (imageResizeWidth > 0) {
+                    bitmapData = self.imageResize(this, filetype, imageResizeWidth, orientation, true);
+                    file = self.canvasToBlob(bitmapData, filetype);
+                }
+
+                fileFormat = filename.substring(filename.lastIndexOf('.'));
+                randomName = self.makeFilename(fileFormat);
+
+                data.append('origname', filename);
+                data.append(inputFileName, file, randomName); // RFC Level 2
+
+                if (debug) {
+                    console.log('Successed: ' + filename);
+                }
+
+                xhr.addEventListener("error", function (evt) {
+                    alert("파일 전송 중 오류: " + evt.toString());
+                }, false);
+
+                xhr.addEventListener("loadend", function onLoadendImageHandler(xhrevt) {
+                    if (xhrevt.target.readyState === xhrevt.target.DONE) {
+                        if (oEditor.config.makeThumbnail) {
+                            self.makeThumbnail(image, filetype, randomName, orientation, false);
+                        }
+                    }
+                    image.src = '';
+                    image = null;
+                }, false);
+
+                xhr.addEventListener("load", function (xhrevt) {
+                    var jsonText, jsonData, img, onLoadHandler;
+                    data = null;
+
+                    if (xhrevt.target.status === 200) {
+                        jsonText = decodeURI(oEditor.trimSpace(this.responseText));
+                        jsonText = jsonText.replace(/\+/g, ' ').replace(/\\/g, '\\\\');
+                        jsonData = JSON.parse(jsonText);
+
+                        onLoadHandler = function () {
+                            imgInfo = {
+                                fileName: jsonData.fileName,
+                                filePath: jsonData.filePath,
+                                fileSize: jsonData.fileSize,
+                                fileUrl: jsonData.fileUrl,
+                                origName: filename,
+                                origSize: file.size,
+                                height: img.height,
+                                width: img.width
+                            };
+                            imageCompletedList[imgBox.id] = imgInfo;
+                            imgComplete(this, imgInfo, imgBox.id);
+                            imgBox.appendChild(img);
+
+                            if (debug) {
+                                console.log('Image URL: ' + img.src + ', size:' + file.size);
+                            }
+
+                            setTimeout(function () {
+                                self.load();
+                            }, 100);
+
+                            if (debug) {
+                                console.log('Uploaded');
+                            }
+                        };
+                        img = new Image();
+                        img.onload = onLoadHandler;
+                        img.src = decodeURIComponent(jsonData.fileUrl);
+                    } else {
+                        alert("HTTP 오류: " + xhr.status);
+                    }
+                }, false);
+
+                blob.dispose();
+                blob = null;
+                xhr.send(data);
+            };
+
+            image.src = blob.getURL();
+        }
+    },
+
+    onReadDataErrorHandler: function (evt) {
+        var status = '';
+        switch (evt.target.error.code) {
+            case evt.target.error.NOT_FOUND_ERR:
+                status = "파일을 찾을 수 없습니다.";
+                break;
+            case evt.target.error.NOT_READABLE_ERR:
+                status = "파일을 읽을 수 없습니다.";
+                break;
+            case evt.target.error.ABORT_ERR:
+                status = "파일 읽기가 중지되었습니다.";
+                break;
+            case evt.target.error.SECURITY_ERR:
+                status = "파일이 잠겨 있습니다.";
+                break;
+            case evt.target.error.ENCODING_ERR:
+                status = "data:// URL의 파일 인코딩 길이가 너무 깁니다.";
+                break;
+            default:
+                status = "파일 읽기 오류: " + evt.target.error.code;
+        }
+        this.removeEventListener('error', this.onReadDataErrorHandler);
+        alert("'" + evt.target.filename + "' " + status);
+    },
+
+    load: function () {
+        var file = this.list.shift(), self = this, watermark = null;
+
+        if (file) {
+            if (debug) {
+                console.log('File ' + this.index + ', Name: ' + file.name + ', Size: ' + file.size);
+            }
+            this.reader.file = file;
+            this.reader.watermark = null;
+
+            if (oEditor.config.imgWaterMarkUrl !== '' && oEditor.config.imgWaterMarkUrl !== null) {
+                watermark = new Image();
+                watermark.onerror = function () {
+                    alert('워터마크 이미지를 읽을 수 없습니다. (' + oEditor.config.imgWaterMarkUrl + ')');
+                    self.reader.readAsArrayBuffer(file);
+                };
+                watermark.onload = function () {
+                    self.reader.watermark = this;
+                    self.reader.readAsArrayBuffer(file);
+                };
+                watermark.src = oEditor.config.imgWaterMarkUrl;
+            } else {
+                this.reader.readAsArrayBuffer(file);
+            }
+        } else {
+            this.clear();
+        }
+    },
+
+    clear: function () {
+        var inputFile = document.getElementById('inputImageUpload'),
+            theForm = document.createElement('form'),
+            fileSelectButton = document.getElementById('fileSelectButton');
+
+        this.list = [];
+
+        theForm.appendChild(inputFile);
+        theForm.reset();
+        fileSelectButton.parentNode.insertBefore(inputFile, fileSelectButton);
+        fileSelectButton.style.marginLeft = '-1px';
+    }
+};
+
+function fileSelectDrop(evt) {
+    var files,
+        upload = new DoUpload();
+
+    oEditor.stopEvent(evt);
+    this.className = "imageListWrapperHtml5";
+
+    files = evt.dataTransfer.files;
+    upload.select(files);
+}
+
+function dragOver(ev) {
+    oEditor.stopEvent(ev);
+    this.className = "dragOver";
+}
+
+function dragOut(ev) {
+    oEditor.stopEvent(ev);
+    this.className = "imageListWrapperHtml5";
+}
+
+function setResizeWidth() {
+    var value = oEditor.trimSpace(imageResizeInput.value);
+    if (value) {
+        value = Math.ceil(parseInt(value, 10));
+        if (!isNaN(value) && value < oEditor.config.imgMaxWidth) {
+            imageResizeWidth = value;
+        } else {
+            imageResizeInput.value = '';
+            imageResizeWidth = oEditor.config.imgMaxWidth;
+            imageResizeInput.setAttribute('placeholder', oEditor.config.imgMaxWidth.toString());
+        }
+    }
+}
+
+function init(dialog) {
+    var dlg, i, elem, input, select, value, name, xhr_f, xhr_v, tmpcanvas, glicon;
+
+    oEditor = this;
+    oEditor.dialog = dialog;
+    dlg = new Dialog(oEditor);
+    browser = oEditor.getBrowser();
+
+    uploadImagePath = oEditor.config.iconPath + 'imageUpload';
+    uploadMaxNumber = oEditor.config.imgUploadNumber;
+    uploadScript = oEditor.config.editorPath + 'imageUpload/upload.php';
+    imageListWrapper = document.getElementById("imageListWrapper");
+    imageResizeInput = document.getElementById('idResizeWidth');
+    select = document.getElementById('idResizeSelectBox');
+
+    if (oEditor.config.imgMaxWidth > 0) {
+        imageResizeWidth = oEditor.config.imgMaxWidth;
+        for (i = 0; i < oEditor.config.imgResizeValue.length; i++) {
+            name = value = oEditor.config.imgResizeValue[i];
+            if (value > oEditor.config.imgMaxWidth) {
+                continue;
+            }
+            if (value === -1) {
+                name = '<입력>';
+            }
+            select.options[select.options.length] = new Option(name, value, false, value === oEditor.config.imgResizeSelected);
+        }
+        select.onchange = function () {
+            if (this.value < 0) {
+                document.getElementById('idUserInputWrapper').style.display = '';
+                imageResizeInput.value = '';
+                imageResizeWidth = oEditor.config.imgMaxWidth;
+                imageResizeInput.focus();
+            } else {
+                document.getElementById('idUserInputWrapper').style.display = 'none';
+                imageResizeWidth = this.value;
+            }
+        };
+        imageResizeInput.setAttribute('placeholder', imageResizeWidth.toString());
+        imageResizeWidth = select.value;
+    } else {
+        select.options[0] = new Option('원본', 0);
+        select.setAttribute('disabled', 'disabled');
+        imageResizeWidth = 0;
+    }
+
+    document.getElementById("maxImageNum").appendChild(document.createTextNode(uploadMaxNumber.toString()));
+
+    button = [
+        { alt: "", img: 'submit.gif', cmd: doSubmit, hspace: 2 },
+        { alt: "", img: 'cancel.gif', cmd: closeWindow, hspace: 2 }
+    ];
+
+    dlg.setDialogHeight(340);
+    dlg.showButton(button);
+    showContents();
+    initGallery();
+    showUploadWindow();
+    createInsertionMaker();
+
+    oEditor.addEvent(imageListWrapper, 'dragover', dragOver);
+    oEditor.addEvent(imageListWrapper, 'dragleave', dragOut);
+    oEditor.addEvent(imageListWrapper, 'drop', fileSelectDrop);
+
+    elem = document.getElementById('id_alignment').elements;
+
+    for (i = 0; i < elem.length; i++) {
+        if (elem[i].name === "alignment" && elem[i].value === oEditor.config.imgDefaultAlign) {
+            elem[i].checked = "checked";
+            break;
+        }
+    }
+
+    if (browser.mobile) {
+        input = document.getElementById('inputImageUpload');
+        input.setAttribute('capture', 'filesystem');
+    }
+
+    tmpcanvas = document.createElement('canvas');
+    if (tmpcanvas.getContext('webgl', {preserveDrawingBuffer: true}) ||
+        tmpcanvas.getContext('experimental-webgl', {preserveDrawingBuffer: true}))
+    {
+        useWebGL = true;
+        GLScale.Hermite = { vertex: '', fragment: '' };
+        xhr_v = new XMLHttpRequest();
+        xhr_f = new XMLHttpRequest();
+        xhr_f.open('POST', 'js/fragment-shader.glsl', true);
+        xhr_f.addEventListener("load", function (evt) {
+            if (evt.target.status === 200) {
+                GLScale.Hermite.fragment = this.responseText;
+            } else {
+                useWebGL = false;
+            }
+        });
+        xhr_v.open('POST', 'js/vertex-shader.glsl', true);
+        xhr_v.addEventListener("load", function (evt) {
+            if (evt.target.status === 200) {
+                GLScale.Hermite.vertex = this.responseText;
+            } else {
+                useWebGL = false;
+            }
+        });
+        xhr_f.send();
+        xhr_v.send();
+    }
+    glicon = new Image();
+    glicon.className = 'webgl_logo';
+    glicon.src = uploadImagePath + (useWebGL ? "/webgl.png" : "/webgl-off.png");
+    document.getElementById('webgl_logo_wrapper').appendChild(glicon);
+}
diff --git a/plugin/editor/cheditor5/popup/js/vertex-shader.glsl b/plugin/editor/cheditor5/popup/js/vertex-shader.glsl
new file mode 100644
index 000000000..56de4be9a
--- /dev/null
+++ b/plugin/editor/cheditor5/popup/js/vertex-shader.glsl
@@ -0,0 +1,10 @@
+// -------------------------------------------------------
+// CHEditor WebGL Vertex Shader
+// -------------------------------------------------------
+attribute vec2 a_position;
+uniform vec2 u_resolution;
+
+void main() {
+    vec2 clipSpace = (a_position / u_resolution * 2.0) - 1.0;
+    gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1);
+}
diff --git a/plugin/editor/cheditor5/template-mobile.xml b/plugin/editor/cheditor5/template-mobile.xml
new file mode 100644
index 000000000..f0d8a87e2
--- /dev/null
+++ b/plugin/editor/cheditor5/template-mobile.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+// ================================================================
+//                       CHEditor Template
+// ================================================================
+-->
+<Template>
+    <Container>
+        <Html>
+            <![CDATA[
+                <div class="cheditor-container">
+                    <div id="toolbar" style="padding:4px;height:47px"></div>
+                    <div id="editWrapper" class="cheditor-editarea-wrapper" style="clear:left">
+                        <iframe frameborder="0" class="cheditor-editarea"></iframe>
+                        <textarea class="cheditor-editarea-text-content" spellcheck="false"></textarea>
+                    </div>
+                    <div id="modifyBlock" class="cheditor-modify-block"></div>
+                    <div id="tagPath" class="cheditor-tag-path">
+                        <span class="cheditor-status-bar">&lt;html&gt; </span>
+                    </div>
+                    <div id="resizeBar" class="cheditor-resizebar"></div>
+                    <div id="viewMode" class="cheditor-viewmode">
+                        <div id="rich" class="cheditor-tab-rich" title="입력 모드" alt="">&#160;</div>
+                        <div id="code" class="cheditor-tab-code-off" title="HTML 편집" alt="">&#160;</div>
+                        <div id="preview" class="cheditor-tab-preview-off" title="미리 보기" alt="">&#160;</div>
+                    </div>
+                </div>
+            ]]>
+        </Html>
+    </Container>
+    <PopupWindow>
+        <Html>
+            <![CDATA[
+                <div class="cheditor-popup-window" onselectstart="return false">
+                    <div class="cheditor-popup-drag-handle">
+                        <div class="cheditor-popup-titlebar">
+                            <span><label class="cheditor-popup-title"></label></span>
+                        </div>
+                    </div>
+                    <div class="cheditor-popup-cframe" id="cheditor-popup-cframe"></div>
+                </div>
+            ]]>
+        </Html>
+    </PopupWindow>
+    <Toolbar>
+        <Image file="toolbar.png" />
+        <Group name="Format">
+            <Button name="Bold" tooltip="진하게">
+                <Attribute class="cheditor-tb-bg" width="24" height="23" check="1">
+                    <Icon position="144" width="16" class="cheditor-tb-icon" margin="4px" />
+                    <Execution method="doCmd" value="Bold" />
+                </Attribute>
+            </Button>
+            <Button name="Italic" tooltip="기울임">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="160" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="Italic" />
+                </Attribute>
+            </Button>
+            <Button name="Underline" tooltip="밑줄">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="176" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="Underline" />
+                </Attribute>
+            </Button>
+        </Group>
+        <Group name="Alignment">
+            <Button name="JustifyLeft" tooltip="왼쪽 정렬">
+                <Attribute class="cheditor-tb-bg" width="24" height="23" check="1">
+                    <Icon position="286" width="16" class="cheditor-tb-icon" margin="4px" />
+                    <Execution method="doCmd" value="JustifyLeft" />
+                </Attribute>
+            </Button>
+            <Button name="JustifyCenter" tooltip="가운데 정렬">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="302" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="JustifyCenter" />
+                </Attribute>
+            </Button>
+            <Button name="JustifyRight" tooltip="오른쪽 정렬">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="318" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="JustifyRight" />
+                </Attribute>
+            </Button>
+            <Button name="JustifyFull" tooltip="양쪽 정렬">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="334" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="JustifyFull" />
+                </Attribute>
+            </Button>
+        </Group>
+        <Group name="List">
+            <Button name="OrderedList" tooltip="문단 번호">
+                <Attribute class="cheditor-tb-bg" width="24" height="23" check="1" type="combo">
+                    <Icon position="350" width="16" class="cheditor-tb-icon" margin="4px" />
+                    <Execution method="doCmd" value="InsertOrderedList" />
+                </Attribute>
+            </Button>
+            <Button name="OrderedListCombo" tooltip="문단 번호 확장">
+                <Attribute class="cheditor-tb-bgcombo" width="10" height="23" type="combobox" node="OrderedList">
+                    <Icon width="10" class="cheditor-tb-combo" margin="0px" />
+                    <Execution method="showPulldown" value="OrderedList" />
+                </Attribute>
+            </Button>
+            <Button name="UnOrderedList" tooltip="글 머리표">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1" type="combo">
+                    <Icon position="366" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="InsertUnOrderedList" />
+                </Attribute>
+            </Button>
+            <Button name="UnOrderedListCombo" tooltip="글 머리표 확장">
+                <Attribute class="cheditor-tb-bgcombo" width="10" height="23" type="combobox" node="UnOrderedList">
+                    <Icon width="10" class="cheditor-tb-combo" margin="0px" />
+                    <Execution method="showPulldown" value="UnOrderedList" />
+                </Attribute>
+            </Button>
+        </Group>
+        <Group name="Split">
+        </Group>
+        <Group name="FontName">
+            <Button name="FontName" tooltip="글꼴">
+                <Attribute class="cheditor-tb-bg55" width="55" height="23" check="1">
+                    <Icon class="cheditor-tb-text" alt="굴림" />
+                    <Execution method="showPulldown" value="FontName" />
+                </Attribute>
+            </Button>
+        </Group>
+        <Group name="FontSize">
+            <Button name="FontSize" tooltip="글꼴 크기">
+                <Attribute class="cheditor-tb-bg40" width="41" height="23" check="1">
+                    <Icon class="cheditor-tb-text" alt="9pt" />
+                    <Execution method="showPulldown" value="FontSize" />
+                </Attribute>
+            </Button>
+        </Group>
+        <Group name="Link">
+            <Button name="Link" tooltip="하이퍼링크">
+                <Attribute class="cheditor-tb-bg" width="24" height="23">
+                    <Icon position="558" width="16" class="cheditor-tb-icon" margin="4px" />
+                    <Execution method="windowOpen" value="Link" />
+                </Attribute>
+            </Button>
+            <Button name="UnLink" tooltip="하이퍼링크 없애기">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="574" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="UnLink" />
+                </Attribute>
+            </Button>
+        </Group>
+        <Group name="ImageUpload">
+            <Button name="Image" tooltip="내 PC 사진 넣기">
+                <Attribute class="cheditor-tb-bg44" width="50" height="23">
+                    <Icon position="590" width="36" class="cheditor-tb-icon36" margin="6px" />
+                    <Execution method="windowOpen" value="ImageUpload" />
+                </Attribute>
+            </Button>
+
+        </Group>
+        <Group name="Media">
+            <Button name="Flash" tooltip="플래쉬 동영상">
+                <Attribute class="cheditor-tb-bg" width="24" height="23">
+                    <Icon position="662" width="16" class="cheditor-tb-icon" margin="4px" />
+                    <Execution method="windowOpen" value="FlashMovie" />
+                </Attribute>
+            </Button>
+            <Button name="SmileyIcon" tooltip="표정 아이콘">
+                <Attribute class="cheditor-tb-bg" width="23" height="23">
+                    <Icon position="494" width="16" class="cheditor-tb-icon" />
+                    <Execution method="windowOpen" value="EmotionIcon" />
+                </Attribute>
+            </Button>
+        </Group>
+    </Toolbar>
+</Template>
\ No newline at end of file
diff --git a/plugin/editor/cheditor5/template.xml b/plugin/editor/cheditor5/template.xml
index 8aef7b6f0..dd8ba52a0 100644
--- a/plugin/editor/cheditor5/template.xml
+++ b/plugin/editor/cheditor5/template.xml
@@ -10,7 +10,7 @@
             <![CDATA[
                 <div class="cheditor-container">
                     <div id="toolbar" style="padding:4px;height:47px"></div>
-                    <div id="editWrapper" class="cheditor-editarea-wrapper">
+                    <div id="editWrapper" class="cheditor-editarea-wrapper" style="clear:left">
                         <iframe frameborder="0" class="cheditor-editarea"></iframe>
                         <textarea class="cheditor-editarea-text-content" spellcheck="false"></textarea>
                     </div>
@@ -73,6 +73,18 @@
             </Button>
         </Group>
         <Group name="Edit">
+            <Button name="Copy" tooltip="복사하기">
+                <Attribute class="cheditor-tb-bg" width="24" height="23" check="1">
+                    <Icon position="64" width="16" class="cheditor-tb-icon" margin="4px" />
+                    <Execution method="doCmd" value="Copy" />
+                </Attribute>
+            </Button>
+            <Button name="Cut" tooltip="오려두기">
+                <Attribute class="cheditor-tb-bg" width="23" height="23" check="1">
+                    <Icon position="80" width="16" class="cheditor-tb-icon" />
+                    <Execution method="doCmd" value="Cut" />
+                </Attribute>
+            </Button>
             <Button name="Paste" tooltip="텍스트로 붙이기">
                 <Attribute class="cheditor-tb-bg" width="23" height="23">
                     <Icon position="96" width="16" class="cheditor-tb-icon" />
diff --git a/plugin/editor/smarteditor2/editor.lib.php b/plugin/editor/smarteditor2/editor.lib.php
index ef11fd9e1..63071be84 100644
--- a/plugin/editor/smarteditor2/editor.lib.php
+++ b/plugin/editor/smarteditor2/editor.lib.php
@@ -168,5 +168,4 @@ if(!function_exists('ft_nonce_generate_hash')){
 		}
 		return $o;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/_common.php b/plugin/editor/smarteditor2/photo_uploader/popup/_common.php
index b13ca6312..3c73f53fe 100644
--- a/plugin/editor/smarteditor2/photo_uploader/popup/_common.php
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once("../../../../../common.php");
-?>
\ No newline at end of file
+include_once("../../../../../common.php");
\ No newline at end of file
diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/php/JSON.php b/plugin/editor/smarteditor2/photo_uploader/popup/php/JSON.php
index 8dc8a6f01..31a3fb2c8 100644
--- a/plugin/editor/smarteditor2/photo_uploader/popup/php/JSON.php
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/php/JSON.php
@@ -169,7 +169,7 @@ class Services_JSON
             return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
         }
 
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch(true) {
             case ((0x7F & $bytes) == $bytes):
@@ -222,17 +222,17 @@ class Services_JSON
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
+                return chr(0x07 & (ord($utf8[0]) >> 2))
+                     . chr((0xC0 & (ord($utf8[0]) << 6))
+                         | (0x3F & ord($utf8[1])));
 
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
+                return chr((0xF0 & (ord($utf8[0]) << 4))
+                         | (0x0F & (ord($utf8[1]) >> 2)))
+                     . chr((0xC0 & (ord($utf8[1]) << 6))
+                         | (0x7F & ord($utf8[2])));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -454,7 +454,7 @@ class Services_JSON
                 */
 
                 // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
                     $properties = array_map(array($this, 'name_value'),
                                             array_keys($var),
                                             array_values($var));
diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php b/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php
index 7e72ebafd..d426df327 100644
--- a/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php
@@ -185,7 +185,7 @@ class UploadHandler
                 $this->head();
                 break;
             case 'GET':
-                if( $_GET['del'] ){
+                if( isset($_GET['del']) && $_GET['del'] ){
                     $this->delete();
                 } else { 
                     $this->get();
@@ -215,14 +215,20 @@ class UploadHandler
             substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
     }
 
-    protected function get_user_id() {
-        @session_start();
-        return session_id();
+    protected function get_user_id($is_add=true) {
+        global $member;
+
+        if(session_id() == '') {
+            @session_start();
+        }
+        
+        $add_str = ($is_add && isset($member['mb_id']) && $member['mb_id']) ? $member['mb_id'] : '';
+        return session_id().$add_str;
     }
 
     protected function get_user_path() {
         if ($this->options['user_dirs']) {
-            return $this->get_user_id().'/';
+            return $this->get_user_id(false).'/';
         }
         return '';
     }
@@ -361,16 +367,19 @@ class UploadHandler
 
     function get_config_bytes($val) {
         $val = trim($val);
-        $last = strtolower($val[strlen($val)-1]);
+        $val_strlen = strlen($val)-1;
+        $last = isset($val[$val_strlen]) ? strtolower($val[$val_strlen]) : '';
+
+        $bytes = (int) preg_replace('/[^0-9]/', '', $val);
         switch($last) {
             case 'g':
-                $val *= 1024;
+                $bytes *= 1024;
             case 'm':
-                $val *= 1024;
+                $bytes *= 1024;
             case 'k':
-                $val *= 1024;
+                $bytes *= 1024;
         }
-        return $this->fix_integer_overflow($val);
+        return $this->fix_integer_overflow($bytes);
     }
 
     protected function validate($uploaded_file, $file, $error, $index) {
@@ -460,13 +469,14 @@ class UploadHandler
         );
     }
 
-    protected function get_unique_filename($file_path, $name, $size, $type, $error,
-            $index, $content_range) {
+    protected function get_unique_filename($file_path, $name, $size, $type, $error, $index, $content_range) {
         while(is_dir($this->get_upload_path($name))) {
             $name = $this->upcount_name($name);
         }
+
+        $content_range_byte = isset($content_range[1]) ? (int) $content_range[1] : 0;
         // Keep an existing filename if this is part of a chunked upload:
-        $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1]));
+        $uploaded_bytes = $this->fix_integer_overflow($content_range_byte);
         while(is_file($this->get_upload_path($name))) {
             if ($uploaded_bytes === $this->get_file_size(
                     $this->get_upload_path($name))) {
@@ -477,8 +487,7 @@ class UploadHandler
         return $name;
     }
 
-    protected function trim_file_name($file_path, $name, $size, $type, $error,
-            $index, $content_range) {
+    protected function trim_file_name($file_path, $name, $size, $type, $error, $index, $content_range) {
         // Remove path information and dots around the filename, to prevent uploading
         // into different directories or replacing hidden system files.
         // Also remove control characters and spaces (\x00..\x20) around the filename:
@@ -492,7 +501,7 @@ class UploadHandler
                 preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
             $name .= '.'.$matches[1];
         }
-        if (function_exists('exif_imagetype')) {
+        if (function_exists('exif_imagetype') && $file_path) {
             switch(@exif_imagetype($file_path)){
                 case IMAGETYPE_JPEG:
                     $extensions = array('jpg', 'jpeg');
@@ -518,12 +527,10 @@ class UploadHandler
         return $name;
     }
 
-    protected function get_file_name($file_path, $name, $size, $type, $error,
-            $index, $content_range) {
+    protected function get_file_name($file_path, $name, $size, $type, $error, $index, $content_range) {
         return $this->get_unique_filename(
             $file_path,
-            $this->trim_file_name($file_path, $name, $size, $type, $error,
-                $index, $content_range),
+            $this->trim_file_name($file_path, $name, $size, $type, $error, $index, $content_range),
             $size,
             $type,
             $error,
@@ -1060,6 +1067,8 @@ class UploadHandler
 
     protected function reprocessImage($file_path, $callback)
     {
+        if( ! $file_path ) return;
+
         // Extracting mime type using getimagesize
         try {
             $image_info = getimagesize($file_path);
@@ -1100,11 +1109,9 @@ class UploadHandler
         return true;
     }
 
-    protected function handle_file_upload($uploaded_file, $name, $size, $type, $error,
-            $index = null, $content_range = null) {
+    protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null, $content_range = null) {
         $file = new \stdClass();
-        $file->oriname = $this->get_file_name($uploaded_file, $name, $size, $type, $error,
-            $index, $content_range);
+        $file->oriname = $this->get_file_name($uploaded_file, $name, $size, $type, $error, $index, $content_range);
         
         $filename_ext = pathinfo($name, PATHINFO_EXTENSION);
         $file->name = $this->get_file_passname().'_'.str_replace(".", "_", $this->get_microtime()).".".$filename_ext;
diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/php/_common.php b/plugin/editor/smarteditor2/photo_uploader/popup/php/_common.php
index 03a15a0b2..855b122e7 100644
--- a/plugin/editor/smarteditor2/photo_uploader/popup/php/_common.php
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/php/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once("../../../../../../common.php");
-?>
\ No newline at end of file
+include_once("../../../../../../common.php");
\ No newline at end of file
diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php b/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php
index ddd639808..510ac0f24 100644
--- a/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php
@@ -10,9 +10,9 @@
  * http://www.opensource.org/licenses/MIT
  */
 include_once("./_common.php");
-@include_once("./JSON.php");
 
 if( !function_exists('json_encode') ) {
+    @include_once("./JSON.php");
     function json_encode($data) {
         $json = new Services_JSON();
         return( $json->encode($data) );
diff --git a/plugin/htmlpurifier/HTMLPurifier.standalone.php b/plugin/htmlpurifier/HTMLPurifier.standalone.php
index 754d69381..6e9db001f 100644
--- a/plugin/htmlpurifier/HTMLPurifier.standalone.php
+++ b/plugin/htmlpurifier/HTMLPurifier.standalone.php
@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  *
- * @version 4.9.3
+ * @version 4.13.0
  *
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
@@ -39,7 +39,7 @@
  */
 
 /*
-    HTML Purifier 4.9.3 - Standards Compliant HTML Filtering
+    HTML Purifier 4.13.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -78,12 +78,12 @@ class HTMLPurifier
      * Version of HTML Purifier.
      * @type string
      */
-    public $version = '4.9.3';
+    public $version = '4.13.0';
 
     /**
      * Constant with version of HTML Purifier.
      */
-    const VERSION = '4.9.3';
+    const VERSION = '4.13.0';
 
     /**
      * Global configuration object.
@@ -260,12 +260,17 @@ class HTMLPurifier
     public function purifyArray($array_of_html, $config = null)
     {
         $context_array = array();
-        foreach ($array_of_html as $key => $html) {
-            $array_of_html[$key] = $this->purify($html, $config);
+        $array = array();
+        foreach($array_of_html as $key=>$value){
+            if (is_array($value)) {
+                $array[$key] = $this->purifyArray($value, $config);
+            } else {
+                $array[$key] = $this->purify($value, $config);
+            }
             $context_array[$key] = $this->context;
         }
         $this->context = $context_array;
-        return $array_of_html;
+        return $array;
     }
 
     /**
@@ -1418,15 +1423,25 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
             array(
                 new HTMLPurifier_AttrDef_CSS_Length('0'),
                 new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('auto'))
+                new HTMLPurifier_AttrDef_Enum(array('auto', 'initial', 'inherit'))
+            )
+        );
+        $trusted_min_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
+            )
+        );
+        $trusted_max_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
             )
         );
         $max = $config->get('CSS.MaxImgLength');
 
-        $this->info['min-width'] =
-        $this->info['max-width'] =
-        $this->info['min-height'] =
-        $this->info['max-height'] =
         $this->info['width'] =
         $this->info['height'] =
             $max === null ?
@@ -1443,6 +1458,38 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
                     // For everyone else:
                     $trusted_wh
                 );
+        $this->info['min-width'] =
+        $this->info['min-height'] =
+            $max === null ?
+                $trusted_min_wh :
+                new HTMLPurifier_AttrDef_Switch(
+                    'img',
+                    // For img tags:
+                    new HTMLPurifier_AttrDef_CSS_Composite(
+                        array(
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
+                        )
+                    ),
+                    // For everyone else:
+                    $trusted_min_wh
+                );
+        $this->info['max-width'] =
+        $this->info['max-height'] =
+            $max === null ?
+                $trusted_max_wh :
+                new HTMLPurifier_AttrDef_Switch(
+                    'img',
+                    // For img tags:
+                    new HTMLPurifier_AttrDef_CSS_Composite(
+                        array(
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
+                        )
+                    ),
+                    // For everyone else:
+                    $trusted_max_wh
+                );
 
         $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
 
@@ -1764,7 +1811,7 @@ class HTMLPurifier_Config
      * HTML Purifier's version
      * @type string
      */
-    public $version = '4.9.3';
+    public $version = '4.13.0';
 
     /**
      * Whether or not to automatically finalize
@@ -2151,7 +2198,7 @@ class HTMLPurifier_Config
      *             maybeGetRawHTMLDefinition, which is more explicitly
      *             named, instead.
      *
-     * @return HTMLPurifier_HTMLDefinition
+     * @return HTMLPurifier_HTMLDefinition|null
      */
     public function getHTMLDefinition($raw = false, $optimized = false)
     {
@@ -2170,7 +2217,7 @@ class HTMLPurifier_Config
      *             maybeGetRawCSSDefinition, which is more explicitly
      *             named, instead.
      *
-     * @return HTMLPurifier_CSSDefinition
+     * @return HTMLPurifier_CSSDefinition|null
      */
     public function getCSSDefinition($raw = false, $optimized = false)
     {
@@ -2189,7 +2236,7 @@ class HTMLPurifier_Config
      *             maybeGetRawURIDefinition, which is more explicitly
      *             named, instead.
      *
-     * @return HTMLPurifier_URIDefinition
+     * @return HTMLPurifier_URIDefinition|null
      */
     public function getURIDefinition($raw = false, $optimized = false)
     {
@@ -2211,7 +2258,7 @@ class HTMLPurifier_Config
      *        maybe semantics is the "right thing to do."
      *
      * @throws HTMLPurifier_Exception
-     * @return HTMLPurifier_Definition
+     * @return HTMLPurifier_Definition|null
      */
     public function getDefinition($type, $raw = false, $optimized = false)
     {
@@ -2390,7 +2437,7 @@ class HTMLPurifier_Config
     }
 
     /**
-     * @return HTMLPurifier_HTMLDefinition
+     * @return HTMLPurifier_HTMLDefinition|null
      */
     public function maybeGetRawHTMLDefinition()
     {
@@ -2398,7 +2445,7 @@ class HTMLPurifier_Config
     }
     
     /**
-     * @return HTMLPurifier_CSSDefinition
+     * @return HTMLPurifier_CSSDefinition|null
      */
     public function maybeGetRawCSSDefinition()
     {
@@ -2406,7 +2453,7 @@ class HTMLPurifier_Config
     }
     
     /**
-     * @return HTMLPurifier_URIDefinition
+     * @return HTMLPurifier_URIDefinition|null
      */
     public function maybeGetRawURIDefinition()
     {
@@ -2633,7 +2680,7 @@ class HTMLPurifier_Config
             // zip(tail(trace), trace) -- but PHP is not Haskell har har
             for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
                 // XXX this is not correct on some versions of HTML Purifier
-                if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+                if (isset($trace[$i + 1]['class']) && $trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
                     continue;
                 }
                 $frame = $trace[$i];
@@ -2764,7 +2811,7 @@ class HTMLPurifier_ConfigSchema
      * @param string $key Name of directive
      * @param mixed $default Default value of directive
      * @param string $type Allowed type of the directive. See
-     *      HTMLPurifier_DirectiveDef::$type for allowed values
+     *      HTMLPurifier_VarParser::$types for allowed values
      * @param bool $allow_null Whether or not to allow null values
      */
     public function add($key, $default, $type, $allow_null)
@@ -3938,7 +3985,7 @@ class HTMLPurifier_Encoder
 
         $len = strlen($str);
         for ($i = 0; $i < $len; $i++) {
-            $in = ord($str{$i});
+            $in = ord($str[$i]);
             $char .= $str[$i]; // append byte to char
             if (0 == $mState) {
                 // When mState is zero we expect either a US-ASCII character
@@ -4564,7 +4611,7 @@ class HTMLPurifier_EntityParser
         $entity = $matches[0];
         $hex_part = @$matches[1];
         $dec_part = @$matches[2];
-        $named_part = empty($matches[3]) ? @$matches[4] : $matches[3];
+        $named_part = empty($matches[3]) ? (empty($matches[4]) ? "" : $matches[4]) : $matches[3];
         if ($hex_part !== NULL && $hex_part !== "") {
             return HTMLPurifier_Encoder::unichr(hexdec($hex_part));
         } elseif ($dec_part !== NULL && $dec_part !== "") {
@@ -6035,9 +6082,9 @@ class HTMLPurifier_HTMLModule
      * @param string $element Name of element to add
      * @param string|bool $type What content set should element be registered to?
      *              Set as false to skip this step.
-     * @param string $contents Allowed children in form of:
+     * @param string|HTMLPurifier_ChildDef $contents Allowed children in form of:
      *              "$content_model_type: $content_model"
-     * @param array $attr_includes What attribute collections to register to
+     * @param array|string $attr_includes What attribute collections to register to
      *              element?
      * @param array $attr What unique attributes does the element define?
      * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters.
@@ -6871,11 +6918,13 @@ abstract class HTMLPurifier_Injector
             return false;
         }
         // check for exclusion
-        for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
-            $node = $this->currentNesting[$i];
-            $def  = $this->htmlDefinition->info[$node->name];
-            if (isset($def->excludes[$name])) {
-                return false;
+        if (!empty($this->currentNesting)) {
+            for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
+                $node = $this->currentNesting[$i];
+                $def  = $this->htmlDefinition->info[$node->name];
+                if (isset($def->excludes[$name])) {
+                    return false;
+                }
             }
         }
         return true;
@@ -7437,12 +7486,14 @@ class HTMLPurifier_Length
     protected $isValid;
 
     /**
-     * Array Lookup array of units recognized by CSS 2.1
+     * Array Lookup array of units recognized by CSS 3
      * @type array
      */
     protected static $allowedUnits = array(
         'em' => true, 'ex' => true, 'px' => true, 'in' => true,
-        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
+        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true,
+        'ch' => true, 'rem' => true, 'vw' => true, 'vh' => true,
+        'vmin' => true, 'vmax' => true
     );
 
     /**
@@ -9887,34 +9938,34 @@ class HTMLPurifier_UnitConverter
 class HTMLPurifier_VarParser
 {
 
-    const STRING = 1;
+    const C_STRING = 1;
     const ISTRING = 2;
     const TEXT = 3;
     const ITEXT = 4;
-    const INT = 5;
-    const FLOAT = 6;
-    const BOOL = 7;
+    const C_INT = 5;
+    const C_FLOAT = 6;
+    const C_BOOL = 7;
     const LOOKUP = 8;
     const ALIST = 9;
     const HASH = 10;
-    const MIXED = 11;
+    const C_MIXED = 11;
 
     /**
      * Lookup table of allowed types. Mainly for backwards compatibility, but
      * also convenient for transforming string type names to the integer constants.
      */
     public static $types = array(
-        'string' => self::STRING,
+        'string' => self::C_STRING,
         'istring' => self::ISTRING,
         'text' => self::TEXT,
         'itext' => self::ITEXT,
-        'int' => self::INT,
-        'float' => self::FLOAT,
-        'bool' => self::BOOL,
+        'int' => self::C_INT,
+        'float' => self::C_FLOAT,
+        'bool' => self::C_BOOL,
         'lookup' => self::LOOKUP,
         'list' => self::ALIST,
         'hash' => self::HASH,
-        'mixed' => self::MIXED
+        'mixed' => self::C_MIXED
     );
 
     /**
@@ -9922,7 +9973,7 @@ class HTMLPurifier_VarParser
      * allowed value lists.
      */
     public static $stringTypes = array(
-        self::STRING => true,
+        self::C_STRING => true,
         self::ISTRING => true,
         self::TEXT => true,
         self::ITEXT => true,
@@ -9954,7 +10005,7 @@ class HTMLPurifier_VarParser
         // These are basic checks, to make sure nothing horribly wrong
         // happened in our implementations.
         switch ($type) {
-            case (self::STRING):
+            case (self::C_STRING):
             case (self::ISTRING):
             case (self::TEXT):
             case (self::ITEXT):
@@ -9965,17 +10016,17 @@ class HTMLPurifier_VarParser
                     $var = strtolower($var);
                 }
                 return $var;
-            case (self::INT):
+            case (self::C_INT):
                 if (!is_int($var)) {
                     break;
                 }
                 return $var;
-            case (self::FLOAT):
+            case (self::C_FLOAT):
                 if (!is_float($var)) {
                     break;
                 }
                 return $var;
-            case (self::BOOL):
+            case (self::C_BOOL):
                 if (!is_bool($var)) {
                     break;
                 }
@@ -9999,7 +10050,7 @@ class HTMLPurifier_VarParser
                     }
                 }
                 return $var;
-            case (self::MIXED):
+            case (self::C_MIXED):
                 return $var;
             default:
                 $this->errorInconsistent(get_class($this), $type);
@@ -10941,7 +10992,13 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
             return false;
         }
 
-        $left = ltrim($left, '0');
+        // Remove leading zeros until positive number or a zero stays left
+        if (ltrim($left, '0') != '') {
+            $left = ltrim($left, '0');
+        } else {
+            $left = '0';
+        }
+
         $right = rtrim($right, '0');
 
         if ($right === '') {
@@ -12590,7 +12647,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
 {
 
     /**
-     * @type bool
+     * @type string
      */
     protected $name;
 
@@ -12600,7 +12657,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
     public $minimized = true;
 
     /**
-     * @param bool $name
+     * @param bool|string $name
      */
     public function __construct($name = false)
     {
@@ -13343,7 +13400,11 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
 
         // PHP 5.3 and later support this functionality natively
         if (function_exists('idn_to_ascii')) {
-            $string = idn_to_ascii($string);
+            if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46')) {
+                $string = idn_to_ascii($string, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+            } else {
+                $string = idn_to_ascii($string);
+            }
 
         // If we have Net_IDNA2 support, we can support IRIs by
         // punycoding them. (This is the most portable thing to do,
@@ -14577,7 +14638,7 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
     protected function _compileRegex()
     {
         $raw = str_replace(' ', '', $this->dtd_regex);
-        if ($raw{0} != '(') {
+        if ($raw[0] != '(') {
             $raw = "($raw)";
         }
         $el = '[#a-zA-Z0-9_.-]+';
@@ -15675,9 +15736,14 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
         $directory = $this->generateDirectoryPath($config);
         $chmod = $config->get('Cache.SerializerPermissions');
         if ($chmod === null) {
-            // TODO: This races
-            if (is_dir($directory)) return true;
-            return mkdir($directory);
+            if (!@mkdir($directory) && !is_dir($directory)) {
+                trigger_error(
+                    'Could not create directory ' . $directory . '',
+                    E_USER_WARNING
+                );
+                return false;
+            }
+            return true;
         }
         if (!is_dir($directory)) {
             $base = $this->generateBaseDirectoryPath($config);
@@ -15691,7 +15757,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
             } elseif (!$this->_testPermissions($base, $chmod)) {
                 return false;
             }
-            if (!mkdir($directory, $chmod)) {
+            if (!@mkdir($directory, $chmod) && !is_dir($directory)) {
                 trigger_error(
                     'Could not create directory ' . $directory . '',
                     E_USER_WARNING
@@ -16091,6 +16157,10 @@ class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
      */
     public function setup($config)
     {
+        if ($config->get('HTML.Forms')) {
+            $this->safe = true;
+        }
+
         $form = $this->addElement(
             'form',
             'Form',
@@ -17021,13 +17091,13 @@ class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
         $script = $this->addElement(
             'script',
             'Inline',
-            'Empty',
+            'Optional:', // Not `Empty` to not allow to autoclose the <script /> tag @see https://www.w3.org/TR/html4/interact/scripts.html
             null,
             array(
                 // While technically not required by the spec, we're forcing
                 // it to this value.
                 'type' => 'Enum#text/javascript',
-                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed))
+                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed), /*case sensitive*/ true)
             )
         );
         $script->attr_transform_pre[] =
@@ -17826,6 +17896,7 @@ class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule
 
         // @bgcolor for table, tr, td, th ---------------------------------
         $r['table@bgcolor'] =
+        $r['tr@bgcolor'] =
         $r['td@bgcolor'] =
         $r['th@bgcolor'] =
             new HTMLPurifier_AttrTransform_BgColor();
@@ -18924,8 +18995,18 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         $doc = new DOMDocument();
         $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
 
+        $options = 0;
+        if ($config->get('Core.AllowParseManyTags') && defined('LIBXML_PARSEHUGE')) {
+            $options |= LIBXML_PARSEHUGE;
+        }
+
         set_error_handler(array($this, 'muteErrorHandler'));
-        $doc->loadHTML($html);
+        // loadHTML() fails on PHP 5.3 when second parameter is given
+        if ($options) {
+            $doc->loadHTML($html, $options);
+        } else {
+            $doc->loadHTML($html);
+        }
         restore_error_handler();
 
         $body = $doc->getElementsByTagName('html')->item(0)-> // <html>
@@ -18982,6 +19063,41 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         } while ($level > 0);
     }
 
+    /**
+     * Portably retrieve the tag name of a node; deals with older versions
+     * of libxml like 2.7.6
+     * @param DOMNode $node
+     */
+    protected function getTagName($node)
+    {
+        if (isset($node->tagName)) {
+            return $node->tagName;
+        } else if (isset($node->nodeName)) {
+            return $node->nodeName;
+        } else if (isset($node->localName)) {
+            return $node->localName;
+        }
+        return null;
+    }
+
+    /**
+     * Portably retrieve the data of a node; deals with older versions
+     * of libxml like 2.7.6
+     * @param DOMNode $node
+     */
+    protected function getData($node)
+    {
+        if (isset($node->data)) {
+            return $node->data;
+        } else if (isset($node->nodeValue)) {
+            return $node->nodeValue;
+        } else if (isset($node->textContent)) {
+            return $node->textContent;
+        }
+        return null;
+    }
+
+
     /**
      * @param DOMNode $node DOMNode to be tokenized.
      * @param HTMLPurifier_Token[] $tokens   Array-list of already tokenized tokens.
@@ -18997,7 +19113,10 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         // but we're not getting the character reference nodes because
         // those should have been preprocessed
         if ($node->nodeType === XML_TEXT_NODE) {
-            $tokens[] = $this->factory->createText($node->data);
+            $data = $this->getData($node); // Handle variable data property
+            if ($data !== null) {
+              $tokens[] = $this->factory->createText($data);
+            }
             return false;
         } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
             // undo libxml's special treatment of <script> and <style> tags
@@ -19027,21 +19146,20 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
             // not-well tested: there may be other nodes we have to grab
             return false;
         }
-
         $attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
-
+        $tag_name = $this->getTagName($node); // Handle variable tagName property
+        if (empty($tag_name)) {
+            return (bool) $node->childNodes->length;
+        }
         // We still have to make sure that the element actually IS empty
         if (!$node->childNodes->length) {
             if ($collect) {
-                $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
+                $tokens[] = $this->factory->createEmpty($tag_name, $attr);
             }
             return false;
         } else {
             if ($collect) {
-                $tokens[] = $this->factory->createStart(
-                    $tag_name = $node->tagName, // somehow, it get's dropped
-                    $attr
-                );
+                $tokens[] = $this->factory->createStart($tag_name, $attr);
             }
             return true;
         }
@@ -19053,10 +19171,10 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
      */
     protected function createEndNode($node, &$tokens)
     {
-        $tokens[] = $this->factory->createEnd($node->tagName);
+        $tag_name = $this->getTagName($node); // Handle variable tagName property
+        $tokens[] = $this->factory->createEnd($tag_name);
     }
 
-
     /**
      * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
      *
@@ -21060,7 +21178,7 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
         if (isset($attr['size'])) {
             // normalize large numbers
             if ($attr['size'] !== '') {
-                if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
+                if ($attr['size'][0] == '+' || $attr['size'][0] == '-') {
                     $size = (int)$attr['size'];
                     if ($size < -2) {
                         $attr['size'] = '-2';
@@ -22331,23 +22449,23 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
             // Note: if code "breaks" from the switch, it triggers a generic
             // exception to be thrown. Specific errors can be specifically
             // done here.
-            case self::MIXED:
+            case self::C_MIXED:
             case self::ISTRING:
-            case self::STRING:
+            case self::C_STRING:
             case self::TEXT:
             case self::ITEXT:
                 return $var;
-            case self::INT:
+            case self::C_INT:
                 if (is_string($var) && ctype_digit($var)) {
                     $var = (int)$var;
                 }
                 return $var;
-            case self::FLOAT:
+            case self::C_FLOAT:
                 if ((is_string($var) && is_numeric($var)) || is_int($var)) {
                     $var = (float)$var;
                 }
                 return $var;
-            case self::BOOL:
+            case self::C_BOOL:
                 if (is_int($var) && ($var === 0 || $var === 1)) {
                     $var = (bool)$var;
                 } elseif (is_string($var)) {
diff --git a/plugin/htmlpurifier/extend.video.php b/plugin/htmlpurifier/extend.video.php
index 24ef7c8de..a18cc7d45 100644
--- a/plugin/htmlpurifier/extend.video.php
+++ b/plugin/htmlpurifier/extend.video.php
@@ -77,5 +77,4 @@ if( !class_exists('HTMLPurifier_Filter_Iframevideo') ){
 			}
 		}
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
index d5906cd46..1174575ea 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
@@ -1,48 +1,48 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
- * representation used to perform checks on user configuration.
- */
-class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
-{
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @return HTMLPurifier_ConfigSchema
-     */
-    public function build($interchange)
-    {
-        $schema = new HTMLPurifier_ConfigSchema();
-        foreach ($interchange->directives as $d) {
-            $schema->add(
-                $d->id->key,
-                $d->default,
-                $d->type,
-                $d->typeAllowsNull
-            );
-            if ($d->allowed !== null) {
-                $schema->addAllowedValues(
-                    $d->id->key,
-                    $d->allowed
-                );
-            }
-            foreach ($d->aliases as $alias) {
-                $schema->addAlias(
-                    $alias->key,
-                    $d->id->key
-                );
-            }
-            if ($d->valueAliases !== null) {
-                $schema->addValueAliases(
-                    $d->id->key,
-                    $d->valueAliases
-                );
-            }
-        }
-        $schema->postProcess();
-        return $schema;
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
+ * representation used to perform checks on user configuration.
+ */
+class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
+{
+
+    /**
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+     * @return HTMLPurifier_ConfigSchema
+     */
+    public function build($interchange)
+    {
+        $schema = new HTMLPurifier_ConfigSchema();
+        foreach ($interchange->directives as $d) {
+            $schema->add(
+                $d->id->key,
+                $d->default,
+                $d->type,
+                $d->typeAllowsNull
+            );
+            if ($d->allowed !== null) {
+                $schema->addAllowedValues(
+                    $d->id->key,
+                    $d->allowed
+                );
+            }
+            foreach ($d->aliases as $alias) {
+                $schema->addAlias(
+                    $alias->key,
+                    $d->id->key
+                );
+            }
+            if ($d->valueAliases !== null) {
+                $schema->addValueAliases(
+                    $d->id->key,
+                    $d->valueAliases
+                );
+            }
+        }
+        $schema->postProcess();
+        return $schema;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/Xml.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/Xml.php
index 5fa56f7dd..0d00bf1d1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder/Xml.php
@@ -1,144 +1,144 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
- * which can be further processed to generate documentation.
- */
-class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
-{
-
-    /**
-     * @type HTMLPurifier_ConfigSchema_Interchange
-     */
-    protected $interchange;
-
-    /**
-     * @type string
-     */
-    private $namespace;
-
-    /**
-     * @param string $html
-     */
-    protected function writeHTMLDiv($html)
-    {
-        $this->startElement('div');
-
-        $purifier = HTMLPurifier::getInstance();
-        $html = $purifier->purify($html);
-        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-        $this->writeRaw($html);
-
-        $this->endElement(); // div
-    }
-
-    /**
-     * @param mixed $var
-     * @return string
-     */
-    protected function export($var)
-    {
-        if ($var === array()) {
-            return 'array()';
-        }
-        return var_export($var, true);
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     */
-    public function build($interchange)
-    {
-        // global access, only use as last resort
-        $this->interchange = $interchange;
-
-        $this->setIndent(true);
-        $this->startDocument('1.0', 'UTF-8');
-        $this->startElement('configdoc');
-        $this->writeElement('title', $interchange->name);
-
-        foreach ($interchange->directives as $directive) {
-            $this->buildDirective($directive);
-        }
-
-        if ($this->namespace) {
-            $this->endElement();
-        } // namespace
-
-        $this->endElement(); // configdoc
-        $this->flush();
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
-     */
-    public function buildDirective($directive)
-    {
-        // Kludge, although I suppose having a notion of a "root namespace"
-        // certainly makes things look nicer when documentation is built.
-        // Depends on things being sorted.
-        if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) {
-                $this->endElement();
-            } // namespace
-            $this->namespace = $directive->id->getRootNamespace();
-            $this->startElement('namespace');
-            $this->writeAttribute('id', $this->namespace);
-            $this->writeElement('name', $this->namespace);
-        }
-
-        $this->startElement('directive');
-        $this->writeAttribute('id', $directive->id->toString());
-
-        $this->writeElement('name', $directive->id->getDirective());
-
-        $this->startElement('aliases');
-        foreach ($directive->aliases as $alias) {
-            $this->writeElement('alias', $alias->toString());
-        }
-        $this->endElement(); // aliases
-
-        $this->startElement('constraints');
-        if ($directive->version) {
-            $this->writeElement('version', $directive->version);
-        }
-        $this->startElement('type');
-        if ($directive->typeAllowsNull) {
-            $this->writeAttribute('allow-null', 'yes');
-        }
-        $this->text($directive->type);
-        $this->endElement(); // type
-        if ($directive->allowed) {
-            $this->startElement('allowed');
-            foreach ($directive->allowed as $value => $x) {
-                $this->writeElement('value', $value);
-            }
-            $this->endElement(); // allowed
-        }
-        $this->writeElement('default', $this->export($directive->default));
-        $this->writeAttribute('xml:space', 'preserve');
-        if ($directive->external) {
-            $this->startElement('external');
-            foreach ($directive->external as $project) {
-                $this->writeElement('project', $project);
-            }
-            $this->endElement();
-        }
-        $this->endElement(); // constraints
-
-        if ($directive->deprecatedVersion) {
-            $this->startElement('deprecated');
-            $this->writeElement('version', $directive->deprecatedVersion);
-            $this->writeElement('use', $directive->deprecatedUse->toString());
-            $this->endElement(); // deprecated
-        }
-
-        $this->startElement('description');
-        $this->writeHTMLDiv($directive->description);
-        $this->endElement(); // description
-
-        $this->endElement(); // directive
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
+ * which can be further processed to generate documentation.
+ */
+class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
+{
+
+    /**
+     * @type HTMLPurifier_ConfigSchema_Interchange
+     */
+    protected $interchange;
+
+    /**
+     * @type string
+     */
+    private $namespace;
+
+    /**
+     * @param string $html
+     */
+    protected function writeHTMLDiv($html)
+    {
+        $this->startElement('div');
+
+        $purifier = HTMLPurifier::getInstance();
+        $html = $purifier->purify($html);
+        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+        $this->writeRaw($html);
+
+        $this->endElement(); // div
+    }
+
+    /**
+     * @param mixed $var
+     * @return string
+     */
+    protected function export($var)
+    {
+        if ($var === array()) {
+            return 'array()';
+        }
+        return var_export($var, true);
+    }
+
+    /**
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+     */
+    public function build($interchange)
+    {
+        // global access, only use as last resort
+        $this->interchange = $interchange;
+
+        $this->setIndent(true);
+        $this->startDocument('1.0', 'UTF-8');
+        $this->startElement('configdoc');
+        $this->writeElement('title', $interchange->name);
+
+        foreach ($interchange->directives as $directive) {
+            $this->buildDirective($directive);
+        }
+
+        if ($this->namespace) {
+            $this->endElement();
+        } // namespace
+
+        $this->endElement(); // configdoc
+        $this->flush();
+    }
+
+    /**
+     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
+     */
+    public function buildDirective($directive)
+    {
+        // Kludge, although I suppose having a notion of a "root namespace"
+        // certainly makes things look nicer when documentation is built.
+        // Depends on things being sorted.
+        if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
+            if ($this->namespace) {
+                $this->endElement();
+            } // namespace
+            $this->namespace = $directive->id->getRootNamespace();
+            $this->startElement('namespace');
+            $this->writeAttribute('id', $this->namespace);
+            $this->writeElement('name', $this->namespace);
+        }
+
+        $this->startElement('directive');
+        $this->writeAttribute('id', $directive->id->toString());
+
+        $this->writeElement('name', $directive->id->getDirective());
+
+        $this->startElement('aliases');
+        foreach ($directive->aliases as $alias) {
+            $this->writeElement('alias', $alias->toString());
+        }
+        $this->endElement(); // aliases
+
+        $this->startElement('constraints');
+        if ($directive->version) {
+            $this->writeElement('version', $directive->version);
+        }
+        $this->startElement('type');
+        if ($directive->typeAllowsNull) {
+            $this->writeAttribute('allow-null', 'yes');
+        }
+        $this->text($directive->type);
+        $this->endElement(); // type
+        if ($directive->allowed) {
+            $this->startElement('allowed');
+            foreach ($directive->allowed as $value => $x) {
+                $this->writeElement('value', $value);
+            }
+            $this->endElement(); // allowed
+        }
+        $this->writeElement('default', $this->export($directive->default));
+        $this->writeAttribute('xml:space', 'preserve');
+        if ($directive->external) {
+            $this->startElement('external');
+            foreach ($directive->external as $project) {
+                $this->writeElement('project', $project);
+            }
+            $this->endElement();
+        }
+        $this->endElement(); // constraints
+
+        if ($directive->deprecatedVersion) {
+            $this->startElement('deprecated');
+            $this->writeElement('version', $directive->deprecatedVersion);
+            $this->writeElement('use', $directive->deprecatedUse->toString());
+            $this->endElement(); // deprecated
+        }
+
+        $this->startElement('description');
+        $this->writeHTMLDiv($directive->description);
+        $this->endElement(); // description
+
+        $this->endElement(); // directive
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Exception.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Exception.php
index 2671516c5..1abdcfc06 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Exception.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Exception.php
@@ -1,11 +1,11 @@
-<?php
-
-/**
- * Exceptions related to configuration schema
- */
-class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Exceptions related to configuration schema
+ */
+class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange.php
index 0e08ae8fe..c094fa0b8 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange.php
@@ -1,47 +1,47 @@
-<?php
-
-/**
- * Generic schema interchange format that can be converted to a runtime
- * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
- * are completely validated.
- */
-class HTMLPurifier_ConfigSchema_Interchange
-{
-
-    /**
-     * Name of the application this schema is describing.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * Array of Directive ID => array(directive info)
-     * @type HTMLPurifier_ConfigSchema_Interchange_Directive[]
-     */
-    public $directives = array();
-
-    /**
-     * Adds a directive array to $directives
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    public function addDirective($directive)
-    {
-        if (isset($this->directives[$i = $directive->id->toString()])) {
-            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
-        }
-        $this->directives[$i] = $directive;
-    }
-
-    /**
-     * Convenience function to perform standard validation. Throws exception
-     * on failed validation.
-     */
-    public function validate()
-    {
-        $validator = new HTMLPurifier_ConfigSchema_Validator();
-        return $validator->validate($this);
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Generic schema interchange format that can be converted to a runtime
+ * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
+ * are completely validated.
+ */
+class HTMLPurifier_ConfigSchema_Interchange
+{
+
+    /**
+     * Name of the application this schema is describing.
+     * @type string
+     */
+    public $name;
+
+    /**
+     * Array of Directive ID => array(directive info)
+     * @type HTMLPurifier_ConfigSchema_Interchange_Directive[]
+     */
+    public $directives = array();
+
+    /**
+     * Adds a directive array to $directives
+     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
+     * @throws HTMLPurifier_ConfigSchema_Exception
+     */
+    public function addDirective($directive)
+    {
+        if (isset($this->directives[$i = $directive->id->toString()])) {
+            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
+        }
+        $this->directives[$i] = $directive;
+    }
+
+    /**
+     * Convenience function to perform standard validation. Throws exception
+     * on failed validation.
+     */
+    public function validate()
+    {
+        $validator = new HTMLPurifier_ConfigSchema_Validator();
+        return $validator->validate($this);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Directive.php
index 127a39a67..4c39c5c68 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Directive.php
@@ -1,89 +1,89 @@
-<?php
-
-/**
- * Interchange component class describing configuration directives.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Directive
-{
-
-    /**
-     * ID of directive.
-     * @type HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    public $id;
-
-    /**
-     * Type, e.g. 'integer' or 'istring'.
-     * @type string
-     */
-    public $type;
-
-    /**
-     * Default value, e.g. 3 or 'DefaultVal'.
-     * @type mixed
-     */
-    public $default;
-
-    /**
-     * HTML description.
-     * @type string
-     */
-    public $description;
-
-    /**
-     * Whether or not null is allowed as a value.
-     * @type bool
-     */
-    public $typeAllowsNull = false;
-
-    /**
-     * Lookup table of allowed scalar values.
-     * e.g. array('allowed' => true).
-     * Null if all values are allowed.
-     * @type array
-     */
-    public $allowed;
-
-    /**
-     * List of aliases for the directive.
-     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
-     * @type HTMLPurifier_ConfigSchema_Interchange_Id[]
-     */
-    public $aliases = array();
-
-    /**
-     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
-     * aliasing is disabled (necessary for non-scalar types).
-     * @type array
-     */
-    public $valueAliases;
-
-    /**
-     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
-     * Null if the directive has always existed.
-     * @type string
-     */
-    public $version;
-
-    /**
-     * ID of directive that supercedes this old directive.
-     * Null if not deprecated.
-     * @type HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    public $deprecatedUse;
-
-    /**
-     * Version of HTML Purifier this directive was deprecated. Null if not
-     * deprecated.
-     * @type string
-     */
-    public $deprecatedVersion;
-
-    /**
-     * List of external projects this directive depends on, e.g. array('CSSTidy').
-     * @type array
-     */
-    public $external = array();
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Interchange component class describing configuration directives.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Directive
+{
+
+    /**
+     * ID of directive.
+     * @type HTMLPurifier_ConfigSchema_Interchange_Id
+     */
+    public $id;
+
+    /**
+     * Type, e.g. 'integer' or 'istring'.
+     * @type string
+     */
+    public $type;
+
+    /**
+     * Default value, e.g. 3 or 'DefaultVal'.
+     * @type mixed
+     */
+    public $default;
+
+    /**
+     * HTML description.
+     * @type string
+     */
+    public $description;
+
+    /**
+     * Whether or not null is allowed as a value.
+     * @type bool
+     */
+    public $typeAllowsNull = false;
+
+    /**
+     * Lookup table of allowed scalar values.
+     * e.g. array('allowed' => true).
+     * Null if all values are allowed.
+     * @type array
+     */
+    public $allowed;
+
+    /**
+     * List of aliases for the directive.
+     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
+     * @type HTMLPurifier_ConfigSchema_Interchange_Id[]
+     */
+    public $aliases = array();
+
+    /**
+     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
+     * aliasing is disabled (necessary for non-scalar types).
+     * @type array
+     */
+    public $valueAliases;
+
+    /**
+     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
+     * Null if the directive has always existed.
+     * @type string
+     */
+    public $version;
+
+    /**
+     * ID of directive that supercedes this old directive.
+     * Null if not deprecated.
+     * @type HTMLPurifier_ConfigSchema_Interchange_Id
+     */
+    public $deprecatedUse;
+
+    /**
+     * Version of HTML Purifier this directive was deprecated. Null if not
+     * deprecated.
+     * @type string
+     */
+    public $deprecatedVersion;
+
+    /**
+     * List of external projects this directive depends on, e.g. array('CSSTidy').
+     * @type array
+     */
+    public $external = array();
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Id.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Id.php
index 126f09d95..3ee817114 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange/Id.php
@@ -1,58 +1,58 @@
-<?php
-
-/**
- * Represents a directive ID in the interchange format.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Id
-{
-
-    /**
-     * @type string
-     */
-    public $key;
-
-    /**
-     * @param string $key
-     */
-    public function __construct($key)
-    {
-        $this->key = $key;
-    }
-
-    /**
-     * @return string
-     * @warning This is NOT magic, to ensure that people don't abuse SPL and
-     *          cause problems for PHP 5.0 support.
-     */
-    public function toString()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRootNamespace()
-    {
-        return substr($this->key, 0, strpos($this->key, "."));
-    }
-
-    /**
-     * @return string
-     */
-    public function getDirective()
-    {
-        return substr($this->key, strpos($this->key, ".") + 1);
-    }
-
-    /**
-     * @param string $id
-     * @return HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    public static function make($id)
-    {
-        return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a directive ID in the interchange format.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Id
+{
+
+    /**
+     * @type string
+     */
+    public $key;
+
+    /**
+     * @param string $key
+     */
+    public function __construct($key)
+    {
+        $this->key = $key;
+    }
+
+    /**
+     * @return string
+     * @warning This is NOT magic, to ensure that people don't abuse SPL and
+     *          cause problems for PHP 5.0 support.
+     */
+    public function toString()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRootNamespace()
+    {
+        return substr($this->key, 0, strpos($this->key, "."));
+    }
+
+    /**
+     * @return string
+     */
+    public function getDirective()
+    {
+        return substr($this->key, strpos($this->key, ".") + 1);
+    }
+
+    /**
+     * @param string $id
+     * @return HTMLPurifier_ConfigSchema_Interchange_Id
+     */
+    public static function make($id)
+    {
+        return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
index 655e6dd1b..fe9b3268f 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
@@ -1,226 +1,226 @@
-<?php
-
-class HTMLPurifier_ConfigSchema_InterchangeBuilder
-{
-
-    /**
-     * Used for processing DEFAULT, nothing else.
-     * @type HTMLPurifier_VarParser
-     */
-    protected $varParser;
-
-    /**
-     * @param HTMLPurifier_VarParser $varParser
-     */
-    public function __construct($varParser = null)
-    {
-        $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
-    }
-
-    /**
-     * @param string $dir
-     * @return HTMLPurifier_ConfigSchema_Interchange
-     */
-    public static function buildFromDirectory($dir = null)
-    {
-        $builder = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
-        $interchange = new HTMLPurifier_ConfigSchema_Interchange();
-        return $builder->buildDir($interchange, $dir);
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @param string $dir
-     * @return HTMLPurifier_ConfigSchema_Interchange
-     */
-    public function buildDir($interchange, $dir = null)
-    {
-        if (!$dir) {
-            $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
-        }
-        if (file_exists($dir . '/info.ini')) {
-            $info = parse_ini_file($dir . '/info.ini');
-            $interchange->name = $info['name'];
-        }
-
-        $files = array();
-        $dh = opendir($dir);
-        while (false !== ($file = readdir($dh))) {
-            if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
-                continue;
-            }
-            $files[] = $file;
-        }
-        closedir($dh);
-
-        sort($files);
-        foreach ($files as $file) {
-            $this->buildFile($interchange, $dir . '/' . $file);
-        }
-        return $interchange;
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @param string $file
-     */
-    public function buildFile($interchange, $file)
-    {
-        $parser = new HTMLPurifier_StringHashParser();
-        $this->build(
-            $interchange,
-            new HTMLPurifier_StringHash($parser->parseFile($file))
-        );
-    }
-
-    /**
-     * Builds an interchange object based on a hash.
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange HTMLPurifier_ConfigSchema_Interchange object to build
-     * @param HTMLPurifier_StringHash $hash source data
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    public function build($interchange, $hash)
-    {
-        if (!$hash instanceof HTMLPurifier_StringHash) {
-            $hash = new HTMLPurifier_StringHash($hash);
-        }
-        if (!isset($hash['ID'])) {
-            throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
-        }
-        if (strpos($hash['ID'], '.') === false) {
-            if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
-                $hash->offsetGet('DESCRIPTION'); // prevent complaining
-            } else {
-                throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
-            }
-        } else {
-            $this->buildDirective($interchange, $hash);
-        }
-        $this->_findUnused($hash);
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @param HTMLPurifier_StringHash $hash
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    public function buildDirective($interchange, $hash)
-    {
-        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
-
-        // These are required elements:
-        $directive->id = $this->id($hash->offsetGet('ID'));
-        $id = $directive->id->toString(); // convenience
-
-        if (isset($hash['TYPE'])) {
-            $type = explode('/', $hash->offsetGet('TYPE'));
-            if (isset($type[1])) {
-                $directive->typeAllowsNull = true;
-            }
-            $directive->type = $type[0];
-        } else {
-            throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
-        }
-
-        if (isset($hash['DEFAULT'])) {
-            try {
-                $directive->default = $this->varParser->parse(
-                    $hash->offsetGet('DEFAULT'),
-                    $directive->type,
-                    $directive->typeAllowsNull
-                );
-            } catch (HTMLPurifier_VarParserException $e) {
-                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
-            }
-        }
-
-        if (isset($hash['DESCRIPTION'])) {
-            $directive->description = $hash->offsetGet('DESCRIPTION');
-        }
-
-        if (isset($hash['ALLOWED'])) {
-            $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
-        }
-
-        if (isset($hash['VALUE-ALIASES'])) {
-            $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
-        }
-
-        if (isset($hash['ALIASES'])) {
-            $raw_aliases = trim($hash->offsetGet('ALIASES'));
-            $aliases = preg_split('/\s*,\s*/', $raw_aliases);
-            foreach ($aliases as $alias) {
-                $directive->aliases[] = $this->id($alias);
-            }
-        }
-
-        if (isset($hash['VERSION'])) {
-            $directive->version = $hash->offsetGet('VERSION');
-        }
-
-        if (isset($hash['DEPRECATED-USE'])) {
-            $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
-        }
-
-        if (isset($hash['DEPRECATED-VERSION'])) {
-            $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
-        }
-
-        if (isset($hash['EXTERNAL'])) {
-            $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
-        }
-
-        $interchange->addDirective($directive);
-    }
-
-    /**
-     * Evaluates an array PHP code string without array() wrapper
-     * @param string $contents
-     */
-    protected function evalArray($contents)
-    {
-        return eval('return array(' . $contents . ');');
-    }
-
-    /**
-     * Converts an array list into a lookup array.
-     * @param array $array
-     * @return array
-     */
-    protected function lookup($array)
-    {
-        $ret = array();
-        foreach ($array as $val) {
-            $ret[$val] = true;
-        }
-        return $ret;
-    }
-
-    /**
-     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
-     * object based on a string Id.
-     * @param string $id
-     * @return HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    protected function id($id)
-    {
-        return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
-    }
-
-    /**
-     * Triggers errors for any unused keys passed in the hash; such keys
-     * may indicate typos, missing values, etc.
-     * @param HTMLPurifier_StringHash $hash Hash to check.
-     */
-    protected function _findUnused($hash)
-    {
-        $accessed = $hash->getAccessed();
-        foreach ($hash as $k => $v) {
-            if (!isset($accessed[$k])) {
-                trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_ConfigSchema_InterchangeBuilder
+{
+
+    /**
+     * Used for processing DEFAULT, nothing else.
+     * @type HTMLPurifier_VarParser
+     */
+    protected $varParser;
+
+    /**
+     * @param HTMLPurifier_VarParser $varParser
+     */
+    public function __construct($varParser = null)
+    {
+        $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
+    }
+
+    /**
+     * @param string $dir
+     * @return HTMLPurifier_ConfigSchema_Interchange
+     */
+    public static function buildFromDirectory($dir = null)
+    {
+        $builder = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
+        $interchange = new HTMLPurifier_ConfigSchema_Interchange();
+        return $builder->buildDir($interchange, $dir);
+    }
+
+    /**
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+     * @param string $dir
+     * @return HTMLPurifier_ConfigSchema_Interchange
+     */
+    public function buildDir($interchange, $dir = null)
+    {
+        if (!$dir) {
+            $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
+        }
+        if (file_exists($dir . '/info.ini')) {
+            $info = parse_ini_file($dir . '/info.ini');
+            $interchange->name = $info['name'];
+        }
+
+        $files = array();
+        $dh = opendir($dir);
+        while (false !== ($file = readdir($dh))) {
+            if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
+                continue;
+            }
+            $files[] = $file;
+        }
+        closedir($dh);
+
+        sort($files);
+        foreach ($files as $file) {
+            $this->buildFile($interchange, $dir . '/' . $file);
+        }
+        return $interchange;
+    }
+
+    /**
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+     * @param string $file
+     */
+    public function buildFile($interchange, $file)
+    {
+        $parser = new HTMLPurifier_StringHashParser();
+        $this->build(
+            $interchange,
+            new HTMLPurifier_StringHash($parser->parseFile($file))
+        );
+    }
+
+    /**
+     * Builds an interchange object based on a hash.
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange HTMLPurifier_ConfigSchema_Interchange object to build
+     * @param HTMLPurifier_StringHash $hash source data
+     * @throws HTMLPurifier_ConfigSchema_Exception
+     */
+    public function build($interchange, $hash)
+    {
+        if (!$hash instanceof HTMLPurifier_StringHash) {
+            $hash = new HTMLPurifier_StringHash($hash);
+        }
+        if (!isset($hash['ID'])) {
+            throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
+        }
+        if (strpos($hash['ID'], '.') === false) {
+            if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
+                $hash->offsetGet('DESCRIPTION'); // prevent complaining
+            } else {
+                throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
+            }
+        } else {
+            $this->buildDirective($interchange, $hash);
+        }
+        $this->_findUnused($hash);
+    }
+
+    /**
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+     * @param HTMLPurifier_StringHash $hash
+     * @throws HTMLPurifier_ConfigSchema_Exception
+     */
+    public function buildDirective($interchange, $hash)
+    {
+        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
+
+        // These are required elements:
+        $directive->id = $this->id($hash->offsetGet('ID'));
+        $id = $directive->id->toString(); // convenience
+
+        if (isset($hash['TYPE'])) {
+            $type = explode('/', $hash->offsetGet('TYPE'));
+            if (isset($type[1])) {
+                $directive->typeAllowsNull = true;
+            }
+            $directive->type = $type[0];
+        } else {
+            throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
+        }
+
+        if (isset($hash['DEFAULT'])) {
+            try {
+                $directive->default = $this->varParser->parse(
+                    $hash->offsetGet('DEFAULT'),
+                    $directive->type,
+                    $directive->typeAllowsNull
+                );
+            } catch (HTMLPurifier_VarParserException $e) {
+                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
+            }
+        }
+
+        if (isset($hash['DESCRIPTION'])) {
+            $directive->description = $hash->offsetGet('DESCRIPTION');
+        }
+
+        if (isset($hash['ALLOWED'])) {
+            $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
+        }
+
+        if (isset($hash['VALUE-ALIASES'])) {
+            $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
+        }
+
+        if (isset($hash['ALIASES'])) {
+            $raw_aliases = trim($hash->offsetGet('ALIASES'));
+            $aliases = preg_split('/\s*,\s*/', $raw_aliases);
+            foreach ($aliases as $alias) {
+                $directive->aliases[] = $this->id($alias);
+            }
+        }
+
+        if (isset($hash['VERSION'])) {
+            $directive->version = $hash->offsetGet('VERSION');
+        }
+
+        if (isset($hash['DEPRECATED-USE'])) {
+            $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
+        }
+
+        if (isset($hash['DEPRECATED-VERSION'])) {
+            $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
+        }
+
+        if (isset($hash['EXTERNAL'])) {
+            $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
+        }
+
+        $interchange->addDirective($directive);
+    }
+
+    /**
+     * Evaluates an array PHP code string without array() wrapper
+     * @param string $contents
+     */
+    protected function evalArray($contents)
+    {
+        return eval('return array(' . $contents . ');');
+    }
+
+    /**
+     * Converts an array list into a lookup array.
+     * @param array $array
+     * @return array
+     */
+    protected function lookup($array)
+    {
+        $ret = array();
+        foreach ($array as $val) {
+            $ret[$val] = true;
+        }
+        return $ret;
+    }
+
+    /**
+     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
+     * object based on a string Id.
+     * @param string $id
+     * @return HTMLPurifier_ConfigSchema_Interchange_Id
+     */
+    protected function id($id)
+    {
+        return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
+    }
+
+    /**
+     * Triggers errors for any unused keys passed in the hash; such keys
+     * may indicate typos, missing values, etc.
+     * @param HTMLPurifier_StringHash $hash Hash to check.
+     */
+    protected function _findUnused($hash)
+    {
+        $accessed = $hash->getAccessed();
+        foreach ($hash as $k => $v) {
+            if (!isset($accessed[$k])) {
+                trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
+            }
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Validator.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Validator.php
index fb3127788..9f14444f3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Validator.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Validator.php
@@ -1,248 +1,248 @@
-<?php
-
-/**
- * Performs validations on HTMLPurifier_ConfigSchema_Interchange
- *
- * @note If you see '// handled by InterchangeBuilder', that means a
- *       design decision in that class would prevent this validation from
- *       ever being necessary. We have them anyway, however, for
- *       redundancy.
- */
-class HTMLPurifier_ConfigSchema_Validator
-{
-
-    /**
-     * @type HTMLPurifier_ConfigSchema_Interchange
-     */
-    protected $interchange;
-
-    /**
-     * @type array
-     */
-    protected $aliases;
-
-    /**
-     * Context-stack to provide easy to read error messages.
-     * @type array
-     */
-    protected $context = array();
-
-    /**
-     * to test default's type.
-     * @type HTMLPurifier_VarParser
-     */
-    protected $parser;
-
-    public function __construct()
-    {
-        $this->parser = new HTMLPurifier_VarParser();
-    }
-
-    /**
-     * Validates a fully-formed interchange object.
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @return bool
-     */
-    public function validate($interchange)
-    {
-        $this->interchange = $interchange;
-        $this->aliases = array();
-        // PHP is a bit lax with integer <=> string conversions in
-        // arrays, so we don't use the identical !== comparison
-        foreach ($interchange->directives as $i => $directive) {
-            $id = $directive->id->toString();
-            if ($i != $id) {
-                $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
-            }
-            $this->validateDirective($directive);
-        }
-        return true;
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Id $id
-     */
-    public function validateId($id)
-    {
-        $id_string = $id->toString();
-        $this->context[] = "id '$id_string'";
-        if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
-            // handled by InterchangeBuilder
-            $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
-        }
-        // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
-        // we probably should check that it has at least one namespace
-        $this->with($id, 'key')
-            ->assertNotEmpty()
-            ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
-        array_pop($this->context);
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirective($d)
-    {
-        $id = $d->id->toString();
-        $this->context[] = "directive '$id'";
-        $this->validateId($d->id);
-
-        $this->with($d, 'description')
-            ->assertNotEmpty();
-
-        // BEGIN - handled by InterchangeBuilder
-        $this->with($d, 'type')
-            ->assertNotEmpty();
-        $this->with($d, 'typeAllowsNull')
-            ->assertIsBool();
-        try {
-            // This also tests validity of $d->type
-            $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->error('default', 'had error: ' . $e->getMessage());
-        }
-        // END - handled by InterchangeBuilder
-
-        if (!is_null($d->allowed) || !empty($d->valueAliases)) {
-            // allowed and valueAliases require that we be dealing with
-            // strings, so check for that early.
-            $d_int = HTMLPurifier_VarParser::$types[$d->type];
-            if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
-                $this->error('type', 'must be a string type when used with allowed or value aliases');
-            }
-        }
-
-        $this->validateDirectiveAllowed($d);
-        $this->validateDirectiveValueAliases($d);
-        $this->validateDirectiveAliases($d);
-
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $allowed member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirectiveAllowed($d)
-    {
-        if (is_null($d->allowed)) {
-            return;
-        }
-        $this->with($d, 'allowed')
-            ->assertNotEmpty()
-            ->assertIsLookup(); // handled by InterchangeBuilder
-        if (is_string($d->default) && !isset($d->allowed[$d->default])) {
-            $this->error('default', 'must be an allowed value');
-        }
-        $this->context[] = 'allowed';
-        foreach ($d->allowed as $val => $x) {
-            if (!is_string($val)) {
-                $this->error("value $val", 'must be a string');
-            }
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $valueAliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirectiveValueAliases($d)
-    {
-        if (is_null($d->valueAliases)) {
-            return;
-        }
-        $this->with($d, 'valueAliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'valueAliases';
-        foreach ($d->valueAliases as $alias => $real) {
-            if (!is_string($alias)) {
-                $this->error("alias $alias", 'must be a string');
-            }
-            if (!is_string($real)) {
-                $this->error("alias target $real from alias '$alias'", 'must be a string');
-            }
-            if ($alias === $real) {
-                $this->error("alias '$alias'", "must not be an alias to itself");
-            }
-        }
-        if (!is_null($d->allowed)) {
-            foreach ($d->valueAliases as $alias => $real) {
-                if (isset($d->allowed[$alias])) {
-                    $this->error("alias '$alias'", 'must not be an allowed value');
-                } elseif (!isset($d->allowed[$real])) {
-                    $this->error("alias '$alias'", 'must be an alias to an allowed value');
-                }
-            }
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $aliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirectiveAliases($d)
-    {
-        $this->with($d, 'aliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'aliases';
-        foreach ($d->aliases as $alias) {
-            $this->validateId($alias);
-            $s = $alias->toString();
-            if (isset($this->interchange->directives[$s])) {
-                $this->error("alias '$s'", 'collides with another directive');
-            }
-            if (isset($this->aliases[$s])) {
-                $other_directive = $this->aliases[$s];
-                $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
-            }
-            $this->aliases[$s] = $d->id->toString();
-        }
-        array_pop($this->context);
-    }
-
-    // protected helper functions
-
-    /**
-     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
-     * for validating simple member variables of objects.
-     * @param $obj
-     * @param $member
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    protected function with($obj, $member)
-    {
-        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
-    }
-
-    /**
-     * Emits an error, providing helpful context.
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    protected function error($target, $msg)
-    {
-        if ($target !== false) {
-            $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext();
-        } else {
-            $prefix = ucfirst($this->getFormattedContext());
-        }
-        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
-    }
-
-    /**
-     * Returns a formatted context string.
-     * @return string
-     */
-    protected function getFormattedContext()
-    {
-        return implode(' in ', array_reverse($this->context));
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Performs validations on HTMLPurifier_ConfigSchema_Interchange
+ *
+ * @note If you see '// handled by InterchangeBuilder', that means a
+ *       design decision in that class would prevent this validation from
+ *       ever being necessary. We have them anyway, however, for
+ *       redundancy.
+ */
+class HTMLPurifier_ConfigSchema_Validator
+{
+
+    /**
+     * @type HTMLPurifier_ConfigSchema_Interchange
+     */
+    protected $interchange;
+
+    /**
+     * @type array
+     */
+    protected $aliases;
+
+    /**
+     * Context-stack to provide easy to read error messages.
+     * @type array
+     */
+    protected $context = array();
+
+    /**
+     * to test default's type.
+     * @type HTMLPurifier_VarParser
+     */
+    protected $parser;
+
+    public function __construct()
+    {
+        $this->parser = new HTMLPurifier_VarParser();
+    }
+
+    /**
+     * Validates a fully-formed interchange object.
+     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+     * @return bool
+     */
+    public function validate($interchange)
+    {
+        $this->interchange = $interchange;
+        $this->aliases = array();
+        // PHP is a bit lax with integer <=> string conversions in
+        // arrays, so we don't use the identical !== comparison
+        foreach ($interchange->directives as $i => $directive) {
+            $id = $directive->id->toString();
+            if ($i != $id) {
+                $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
+            }
+            $this->validateDirective($directive);
+        }
+        return true;
+    }
+
+    /**
+     * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
+     * @param HTMLPurifier_ConfigSchema_Interchange_Id $id
+     */
+    public function validateId($id)
+    {
+        $id_string = $id->toString();
+        $this->context[] = "id '$id_string'";
+        if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
+            // handled by InterchangeBuilder
+            $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
+        }
+        // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
+        // we probably should check that it has at least one namespace
+        $this->with($id, 'key')
+            ->assertNotEmpty()
+            ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
+        array_pop($this->context);
+    }
+
+    /**
+     * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
+     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+     */
+    public function validateDirective($d)
+    {
+        $id = $d->id->toString();
+        $this->context[] = "directive '$id'";
+        $this->validateId($d->id);
+
+        $this->with($d, 'description')
+            ->assertNotEmpty();
+
+        // BEGIN - handled by InterchangeBuilder
+        $this->with($d, 'type')
+            ->assertNotEmpty();
+        $this->with($d, 'typeAllowsNull')
+            ->assertIsBool();
+        try {
+            // This also tests validity of $d->type
+            $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
+        } catch (HTMLPurifier_VarParserException $e) {
+            $this->error('default', 'had error: ' . $e->getMessage());
+        }
+        // END - handled by InterchangeBuilder
+
+        if (!is_null($d->allowed) || !empty($d->valueAliases)) {
+            // allowed and valueAliases require that we be dealing with
+            // strings, so check for that early.
+            $d_int = HTMLPurifier_VarParser::$types[$d->type];
+            if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
+                $this->error('type', 'must be a string type when used with allowed or value aliases');
+            }
+        }
+
+        $this->validateDirectiveAllowed($d);
+        $this->validateDirectiveValueAliases($d);
+        $this->validateDirectiveAliases($d);
+
+        array_pop($this->context);
+    }
+
+    /**
+     * Extra validation if $allowed member variable of
+     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+     */
+    public function validateDirectiveAllowed($d)
+    {
+        if (is_null($d->allowed)) {
+            return;
+        }
+        $this->with($d, 'allowed')
+            ->assertNotEmpty()
+            ->assertIsLookup(); // handled by InterchangeBuilder
+        if (is_string($d->default) && !isset($d->allowed[$d->default])) {
+            $this->error('default', 'must be an allowed value');
+        }
+        $this->context[] = 'allowed';
+        foreach ($d->allowed as $val => $x) {
+            if (!is_string($val)) {
+                $this->error("value $val", 'must be a string');
+            }
+        }
+        array_pop($this->context);
+    }
+
+    /**
+     * Extra validation if $valueAliases member variable of
+     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+     */
+    public function validateDirectiveValueAliases($d)
+    {
+        if (is_null($d->valueAliases)) {
+            return;
+        }
+        $this->with($d, 'valueAliases')
+            ->assertIsArray(); // handled by InterchangeBuilder
+        $this->context[] = 'valueAliases';
+        foreach ($d->valueAliases as $alias => $real) {
+            if (!is_string($alias)) {
+                $this->error("alias $alias", 'must be a string');
+            }
+            if (!is_string($real)) {
+                $this->error("alias target $real from alias '$alias'", 'must be a string');
+            }
+            if ($alias === $real) {
+                $this->error("alias '$alias'", "must not be an alias to itself");
+            }
+        }
+        if (!is_null($d->allowed)) {
+            foreach ($d->valueAliases as $alias => $real) {
+                if (isset($d->allowed[$alias])) {
+                    $this->error("alias '$alias'", 'must not be an allowed value');
+                } elseif (!isset($d->allowed[$real])) {
+                    $this->error("alias '$alias'", 'must be an alias to an allowed value');
+                }
+            }
+        }
+        array_pop($this->context);
+    }
+
+    /**
+     * Extra validation if $aliases member variable of
+     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+     */
+    public function validateDirectiveAliases($d)
+    {
+        $this->with($d, 'aliases')
+            ->assertIsArray(); // handled by InterchangeBuilder
+        $this->context[] = 'aliases';
+        foreach ($d->aliases as $alias) {
+            $this->validateId($alias);
+            $s = $alias->toString();
+            if (isset($this->interchange->directives[$s])) {
+                $this->error("alias '$s'", 'collides with another directive');
+            }
+            if (isset($this->aliases[$s])) {
+                $other_directive = $this->aliases[$s];
+                $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
+            }
+            $this->aliases[$s] = $d->id->toString();
+        }
+        array_pop($this->context);
+    }
+
+    // protected helper functions
+
+    /**
+     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
+     * for validating simple member variables of objects.
+     * @param $obj
+     * @param $member
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    protected function with($obj, $member)
+    {
+        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
+    }
+
+    /**
+     * Emits an error, providing helpful context.
+     * @throws HTMLPurifier_ConfigSchema_Exception
+     */
+    protected function error($target, $msg)
+    {
+        if ($target !== false) {
+            $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext();
+        } else {
+            $prefix = ucfirst($this->getFormattedContext());
+        }
+        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
+    }
+
+    /**
+     * Returns a formatted context string.
+     * @return string
+     */
+    protected function getFormattedContext()
+    {
+        return implode(' in ', array_reverse($this->context));
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/ValidatorAtom.php
index c9aa3644a..a2e0b4a1b 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/ValidatorAtom.php
@@ -1,130 +1,130 @@
-<?php
-
-/**
- * Fluent interface for validating the contents of member variables.
- * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
- * use-cases. We name this an 'atom' because it's ONLY for validations that
- * are independent and usually scalar.
- */
-class HTMLPurifier_ConfigSchema_ValidatorAtom
-{
-    /**
-     * @type string
-     */
-    protected $context;
-
-    /**
-     * @type object
-     */
-    protected $obj;
-
-    /**
-     * @type string
-     */
-    protected $member;
-
-    /**
-     * @type mixed
-     */
-    protected $contents;
-
-    public function __construct($context, $obj, $member)
-    {
-        $this->context = $context;
-        $this->obj = $obj;
-        $this->member = $member;
-        $this->contents =& $obj->$member;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsString()
-    {
-        if (!is_string($this->contents)) {
-            $this->error('must be a string');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsBool()
-    {
-        if (!is_bool($this->contents)) {
-            $this->error('must be a boolean');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsArray()
-    {
-        if (!is_array($this->contents)) {
-            $this->error('must be an array');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertNotNull()
-    {
-        if ($this->contents === null) {
-            $this->error('must not be null');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertAlnum()
-    {
-        $this->assertIsString();
-        if (!ctype_alnum($this->contents)) {
-            $this->error('must be alphanumeric');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertNotEmpty()
-    {
-        if (empty($this->contents)) {
-            $this->error('must not be empty');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsLookup()
-    {
-        $this->assertIsArray();
-        foreach ($this->contents as $v) {
-            if ($v !== true) {
-                $this->error('must be a lookup array');
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $msg
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    protected function error($msg)
-    {
-        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Fluent interface for validating the contents of member variables.
+ * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
+ * use-cases. We name this an 'atom' because it's ONLY for validations that
+ * are independent and usually scalar.
+ */
+class HTMLPurifier_ConfigSchema_ValidatorAtom
+{
+    /**
+     * @type string
+     */
+    protected $context;
+
+    /**
+     * @type object
+     */
+    protected $obj;
+
+    /**
+     * @type string
+     */
+    protected $member;
+
+    /**
+     * @type mixed
+     */
+    protected $contents;
+
+    public function __construct($context, $obj, $member)
+    {
+        $this->context = $context;
+        $this->obj = $obj;
+        $this->member = $member;
+        $this->contents =& $obj->$member;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertIsString()
+    {
+        if (!is_string($this->contents)) {
+            $this->error('must be a string');
+        }
+        return $this;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertIsBool()
+    {
+        if (!is_bool($this->contents)) {
+            $this->error('must be a boolean');
+        }
+        return $this;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertIsArray()
+    {
+        if (!is_array($this->contents)) {
+            $this->error('must be an array');
+        }
+        return $this;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertNotNull()
+    {
+        if ($this->contents === null) {
+            $this->error('must not be null');
+        }
+        return $this;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertAlnum()
+    {
+        $this->assertIsString();
+        if (!ctype_alnum($this->contents)) {
+            $this->error('must be alphanumeric');
+        }
+        return $this;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertNotEmpty()
+    {
+        if (empty($this->contents)) {
+            $this->error('must not be empty');
+        }
+        return $this;
+    }
+
+    /**
+     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+     */
+    public function assertIsLookup()
+    {
+        $this->assertIsArray();
+        foreach ($this->contents as $v) {
+            if ($v !== true) {
+                $this->error('must be a lookup array');
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * @param string $msg
+     * @throws HTMLPurifier_ConfigSchema_Exception
+     */
+    protected function error($msg)
+    {
+        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema.ser b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema.ser
index 371e948f1..a5426c736 100644
Binary files a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema.ser and b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema.ser differ
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
index 0517fed0a..4a42382ec 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
@@ -1,8 +1,8 @@
-Attr.AllowedClasses
-TYPE: lookup/null
-VERSION: 4.0.0
-DEFAULT: null
---DESCRIPTION--
-List of allowed class values in the class attribute. By default, this is null,
-which means all classes are allowed.
---# vim: et sw=4 sts=4
+Attr.AllowedClasses
+TYPE: lookup/null
+VERSION: 4.0.0
+DEFAULT: null
+--DESCRIPTION--
+List of allowed class values in the class attribute. By default, this is null,
+which means all classes are allowed.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
index 249edd647..b033eb516 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
@@ -1,12 +1,12 @@
-Attr.AllowedFrameTargets
-TYPE: lookup
-DEFAULT: array()
---DESCRIPTION--
-Lookup table of all allowed link frame targets.  Some commonly used link
-targets include _blank, _self, _parent and _top. Values should be
-lowercase, as validation will be done in a case-sensitive manner despite
-W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
-so this directive will have no effect in that doctype. XHTML 1.1 does not
-enable the Target module by default, you will have to manually enable it
-(see the module documentation for more details.)
---# vim: et sw=4 sts=4
+Attr.AllowedFrameTargets
+TYPE: lookup
+DEFAULT: array()
+--DESCRIPTION--
+Lookup table of all allowed link frame targets.  Some commonly used link
+targets include _blank, _self, _parent and _top. Values should be
+lowercase, as validation will be done in a case-sensitive manner despite
+W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
+so this directive will have no effect in that doctype. XHTML 1.1 does not
+enable the Target module by default, you will have to manually enable it
+(see the module documentation for more details.)
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
index 9a8fa6a2e..ed72a9d56 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
@@ -1,9 +1,9 @@
-Attr.AllowedRel
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed forward document relationships in the rel attribute. Common
-values may be nofollow or print. By default, this is empty, meaning that no
-document relationships are allowed.
---# vim: et sw=4 sts=4
+Attr.AllowedRel
+TYPE: lookup
+VERSION: 1.6.0
+DEFAULT: array()
+--DESCRIPTION--
+List of allowed forward document relationships in the rel attribute. Common
+values may be nofollow or print. By default, this is empty, meaning that no
+document relationships are allowed.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
index b01788348..1ae672d01 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
@@ -1,9 +1,9 @@
-Attr.AllowedRev
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed reverse document relationships in the rev attribute. This
-attribute is a bit of an edge-case; if you don't know what it is for, stay
-away.
---# vim: et sw=4 sts=4
+Attr.AllowedRev
+TYPE: lookup
+VERSION: 1.6.0
+DEFAULT: array()
+--DESCRIPTION--
+List of allowed reverse document relationships in the rev attribute. This
+attribute is a bit of an edge-case; if you don't know what it is for, stay
+away.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
index e774b823b..119a9d2c6 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
@@ -1,19 +1,19 @@
-Attr.ClassUseCDATA
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.0.0
---DESCRIPTION--
-If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
-XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
-it will use a relaxed CDATA definition.  If true, the relaxed CDATA definition
-is forced; if false, the NMTOKENS definition is forced.  To get behavior
-of HTML Purifier prior to 4.0.0, set this directive to false.
-
-Some rational behind the auto-detection:
-in previous versions of HTML Purifier, it was assumed that the form of
-class was NMTOKENS, as specified by the XHTML Modularization (representing
-XHTML 1.1 and XHTML 2.0).  The DTDs for HTML 4.01 and XHTML 1.0, however
-specify class as CDATA.  HTML 5 effectively defines it as CDATA, but
-with the additional constraint that each name should be unique (this is not
-explicitly outlined in previous specifications).
---# vim: et sw=4 sts=4
+Attr.ClassUseCDATA
+TYPE: bool/null
+DEFAULT: null
+VERSION: 4.0.0
+--DESCRIPTION--
+If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
+XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
+it will use a relaxed CDATA definition.  If true, the relaxed CDATA definition
+is forced; if false, the NMTOKENS definition is forced.  To get behavior
+of HTML Purifier prior to 4.0.0, set this directive to false.
+
+Some rational behind the auto-detection:
+in previous versions of HTML Purifier, it was assumed that the form of
+class was NMTOKENS, as specified by the XHTML Modularization (representing
+XHTML 1.1 and XHTML 2.0).  The DTDs for HTML 4.01 and XHTML 1.0, however
+specify class as CDATA.  HTML 5 effectively defines it as CDATA, but
+with the additional constraint that each name should be unique (this is not
+explicitly outlined in previous specifications).
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
index 533165e17..80b1431c3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
@@ -1,11 +1,11 @@
-Attr.DefaultImageAlt
-TYPE: string/null
-DEFAULT: null
-VERSION: 3.2.0
---DESCRIPTION--
-This is the content of the alt tag of an image if the user had not
-previously specified an alt attribute.  This applies to all images without
-a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
-only applies to invalid images, and overrides in the case of an invalid image.
-Default behavior with null is to use the basename of the src tag for the alt.
---# vim: et sw=4 sts=4
+Attr.DefaultImageAlt
+TYPE: string/null
+DEFAULT: null
+VERSION: 3.2.0
+--DESCRIPTION--
+This is the content of the alt tag of an image if the user had not
+previously specified an alt attribute.  This applies to all images without
+a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
+only applies to invalid images, and overrides in the case of an invalid image.
+Default behavior with null is to use the basename of the src tag for the alt.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
index 9eb7e3846..c51000d1d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
@@ -1,9 +1,9 @@
-Attr.DefaultInvalidImage
-TYPE: string
-DEFAULT: ''
---DESCRIPTION--
-This is the default image an img tag will be pointed to if it does not have
-a valid src attribute.  In future versions, we may allow the image tag to
-be removed completely, but due to design issues, this is not possible right
-now.
---# vim: et sw=4 sts=4
+Attr.DefaultInvalidImage
+TYPE: string
+DEFAULT: ''
+--DESCRIPTION--
+This is the default image an img tag will be pointed to if it does not have
+a valid src attribute.  In future versions, we may allow the image tag to
+be removed completely, but due to design issues, this is not possible right
+now.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
index 2f17bf477..c1ec4b038 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
@@ -1,8 +1,8 @@
-Attr.DefaultInvalidImageAlt
-TYPE: string
-DEFAULT: 'Invalid image'
---DESCRIPTION--
-This is the content of the alt tag of an invalid image if the user had not
-previously specified an alt attribute.  It has no effect when the image is
-valid but there was no alt attribute present.
---# vim: et sw=4 sts=4
+Attr.DefaultInvalidImageAlt
+TYPE: string
+DEFAULT: 'Invalid image'
+--DESCRIPTION--
+This is the content of the alt tag of an invalid image if the user had not
+previously specified an alt attribute.  It has no effect when the image is
+valid but there was no alt attribute present.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
index 52654b53a..f57dcc40f 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
@@ -1,10 +1,10 @@
-Attr.DefaultTextDir
-TYPE: string
-DEFAULT: 'ltr'
---DESCRIPTION--
-Defines the default text direction (ltr or rtl) of the document being
-parsed.  This generally is the same as the value of the dir attribute in
-HTML, or ltr if that is not specified.
---ALLOWED--
-'ltr', 'rtl'
---# vim: et sw=4 sts=4
+Attr.DefaultTextDir
+TYPE: string
+DEFAULT: 'ltr'
+--DESCRIPTION--
+Defines the default text direction (ltr or rtl) of the document being
+parsed.  This generally is the same as the value of the dir attribute in
+HTML, or ltr if that is not specified.
+--ALLOWED--
+'ltr', 'rtl'
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
index 6440d2103..9b93a5575 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
@@ -1,16 +1,16 @@
-Attr.EnableID
-TYPE: bool
-DEFAULT: false
-VERSION: 1.2.0
---DESCRIPTION--
-Allows the ID attribute in HTML.  This is disabled by default due to the
-fact that without proper configuration user input can easily break the
-validation of a webpage by specifying an ID that is already on the
-surrounding HTML.  If you don't mind throwing caution to the wind, enable
-this directive, but I strongly recommend you also consider blacklisting IDs
-you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
-(%Attr.IDPrefix).  When set to true HTML Purifier reverts to the behavior of
-pre-1.2.0 versions.
---ALIASES--
-HTML.EnableAttrID
---# vim: et sw=4 sts=4
+Attr.EnableID
+TYPE: bool
+DEFAULT: false
+VERSION: 1.2.0
+--DESCRIPTION--
+Allows the ID attribute in HTML.  This is disabled by default due to the
+fact that without proper configuration user input can easily break the
+validation of a webpage by specifying an ID that is already on the
+surrounding HTML.  If you don't mind throwing caution to the wind, enable
+this directive, but I strongly recommend you also consider blacklisting IDs
+you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
+(%Attr.IDPrefix).  When set to true HTML Purifier reverts to the behavior of
+pre-1.2.0 versions.
+--ALIASES--
+HTML.EnableAttrID
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
index f31d226f5..fed8954cf 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
@@ -1,8 +1,8 @@
-Attr.ForbiddenClasses
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array()
---DESCRIPTION--
-List of forbidden class values in the class attribute. By default, this is
-empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
---# vim: et sw=4 sts=4
+Attr.ForbiddenClasses
+TYPE: lookup
+VERSION: 4.0.0
+DEFAULT: array()
+--DESCRIPTION--
+List of forbidden class values in the class attribute. By default, this is
+empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
index 735d4b7a1..c48e62fbe 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
@@ -1,10 +1,10 @@
-Attr.ID.HTML5
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.8.0
---DESCRIPTION--
-In HTML5, restrictions on the format of the id attribute have been significantly
-relaxed, such that any string is valid so long as it contains no spaces and
-is at least one character.  In lieu of a general HTML5 compatibility flag,
-set this configuration directive to true to use the relaxed rules.
---# vim: et sw=4 sts=4
+Attr.ID.HTML5
+TYPE: bool/null
+DEFAULT: null
+VERSION: 4.8.0
+--DESCRIPTION--
+In HTML5, restrictions on the format of the id attribute have been significantly
+relaxed, such that any string is valid so long as it contains no spaces and
+is at least one character.  In lieu of a general HTML5 compatibility flag,
+set this configuration directive to true to use the relaxed rules.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
index 5f2b5e3d2..52168bb5e 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
@@ -1,5 +1,5 @@
-Attr.IDBlacklist
-TYPE: list
-DEFAULT: array()
-DESCRIPTION: Array of IDs not allowed in the document.
---# vim: et sw=4 sts=4
+Attr.IDBlacklist
+TYPE: list
+DEFAULT: array()
+DESCRIPTION: Array of IDs not allowed in the document.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
index 6f5824586..7b8504307 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
@@ -1,9 +1,9 @@
-Attr.IDBlacklistRegexp
-TYPE: string/null
-VERSION: 1.6.0
-DEFAULT: NULL
---DESCRIPTION--
-PCRE regular expression to be matched against all IDs. If the expression is
-matches, the ID is rejected. Use this with care: may cause significant
-degradation. ID matching is done after all other validation.
---# vim: et sw=4 sts=4
+Attr.IDBlacklistRegexp
+TYPE: string/null
+VERSION: 1.6.0
+DEFAULT: NULL
+--DESCRIPTION--
+PCRE regular expression to be matched against all IDs. If the expression is
+matches, the ID is rejected. Use this with care: may cause significant
+degradation. ID matching is done after all other validation.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
index cc49d43fd..578138277 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
@@ -1,12 +1,12 @@
-Attr.IDPrefix
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-String to prefix to IDs.  If you have no idea what IDs your pages may use,
-you may opt to simply add a prefix to all user-submitted ID attributes so
-that they are still usable, but will not conflict with core page IDs.
-Example: setting the directive to 'user_' will result in a user submitted
-'foo' to become 'user_foo'  Be sure to set %HTML.EnableAttrID to true
-before using this.
---# vim: et sw=4 sts=4
+Attr.IDPrefix
+TYPE: string
+VERSION: 1.2.0
+DEFAULT: ''
+--DESCRIPTION--
+String to prefix to IDs.  If you have no idea what IDs your pages may use,
+you may opt to simply add a prefix to all user-submitted ID attributes so
+that they are still usable, but will not conflict with core page IDs.
+Example: setting the directive to 'user_' will result in a user submitted
+'foo' to become 'user_foo'  Be sure to set %HTML.EnableAttrID to true
+before using this.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
index 2c5924a7a..f91fcd602 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
@@ -1,14 +1,14 @@
-Attr.IDPrefixLocal
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-Temporary prefix for IDs used in conjunction with %Attr.IDPrefix.  If you
-need to allow multiple sets of user content on web page, you may need to
-have a seperate prefix that changes with each iteration.  This way,
-seperately submitted user content displayed on the same page doesn't
-clobber each other. Ideal values are unique identifiers for the content it
-represents (i.e. the id of the row in the database). Be sure to add a
-seperator (like an underscore) at the end.  Warning: this directive will
-not work unless %Attr.IDPrefix is set to a non-empty value!
---# vim: et sw=4 sts=4
+Attr.IDPrefixLocal
+TYPE: string
+VERSION: 1.2.0
+DEFAULT: ''
+--DESCRIPTION--
+Temporary prefix for IDs used in conjunction with %Attr.IDPrefix.  If you
+need to allow multiple sets of user content on web page, you may need to
+have a seperate prefix that changes with each iteration.  This way,
+seperately submitted user content displayed on the same page doesn't
+clobber each other. Ideal values are unique identifiers for the content it
+represents (i.e. the id of the row in the database). Be sure to add a
+seperator (like an underscore) at the end.  Warning: this directive will
+not work unless %Attr.IDPrefix is set to a non-empty value!
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
index d5caa1bb9..2d7f94e02 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
@@ -1,31 +1,31 @@
-AutoFormat.AutoParagraph
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  This directive turns on auto-paragraphing, where double newlines are
-  converted in to paragraphs whenever possible. Auto-paragraphing:
-</p>
-<ul>
-  <li>Always applies to inline elements or text in the root node,</li>
-  <li>Applies to inline elements or text with double newlines in nodes
-      that allow paragraph tags,</li>
-  <li>Applies to double newlines in paragraph tags</li>
-</ul>
-<p>
-  <code>p</code> tags must be allowed for this directive to take effect.
-  We do not use <code>br</code> tags for paragraphing, as that is
-  semantically incorrect.
-</p>
-<p>
-  To prevent auto-paragraphing as a content-producer, refrain from using
-  double-newlines except to specify a new paragraph or in contexts where
-  it has special meaning (whitespace usually has no meaning except in
-  tags like <code>pre</code>, so this should not be difficult.) To prevent
-  the paragraphing of inline text adjacent to block elements, wrap them
-  in <code>div</code> tags (the behavior is slightly different outside of
-  the root node.)
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.AutoParagraph
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+  This directive turns on auto-paragraphing, where double newlines are
+  converted in to paragraphs whenever possible. Auto-paragraphing:
+</p>
+<ul>
+  <li>Always applies to inline elements or text in the root node,</li>
+  <li>Applies to inline elements or text with double newlines in nodes
+      that allow paragraph tags,</li>
+  <li>Applies to double newlines in paragraph tags</li>
+</ul>
+<p>
+  <code>p</code> tags must be allowed for this directive to take effect.
+  We do not use <code>br</code> tags for paragraphing, as that is
+  semantically incorrect.
+</p>
+<p>
+  To prevent auto-paragraphing as a content-producer, refrain from using
+  double-newlines except to specify a new paragraph or in contexts where
+  it has special meaning (whitespace usually has no meaning except in
+  tags like <code>pre</code>, so this should not be difficult.) To prevent
+  the paragraphing of inline text adjacent to block elements, wrap them
+  in <code>div</code> tags (the behavior is slightly different outside of
+  the root node.)
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
index 2a476481a..2eb1974fd 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
@@ -1,12 +1,12 @@
-AutoFormat.Custom
-TYPE: list
-VERSION: 2.0.1
-DEFAULT: array()
---DESCRIPTION--
-
-<p>
-  This directive can be used to add custom auto-format injectors.
-  Specify an array of injector names (class name minus the prefix)
-  or concrete implementations. Injector class must exist.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.Custom
+TYPE: list
+VERSION: 2.0.1
+DEFAULT: array()
+--DESCRIPTION--
+
+<p>
+  This directive can be used to add custom auto-format injectors.
+  Specify an array of injector names (class name minus the prefix)
+  or concrete implementations. Injector class must exist.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
index 663064a34..c955de7f6 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
@@ -1,11 +1,11 @@
-AutoFormat.DisplayLinkURI
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  This directive turns on the in-text display of URIs in &lt;a&gt; tags, and disables
-  those links. For example, <a href="http://example.com">example</a> becomes
-  example (<a>http://example.com</a>).
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.DisplayLinkURI
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  This directive turns on the in-text display of URIs in &lt;a&gt; tags, and disables
+  those links. For example, <a href="http://example.com">example</a> becomes
+  example (<a>http://example.com</a>).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
index 3a48ba960..328b2b2bf 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
@@ -1,12 +1,12 @@
-AutoFormat.Linkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  This directive turns on linkification, auto-linking http, ftp and
-  https URLs. <code>a</code> tags with the <code>href</code> attribute
-  must be allowed.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.Linkify
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+  This directive turns on linkification, auto-linking http, ftp and
+  https URLs. <code>a</code> tags with the <code>href</code> attribute
+  must be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
index db58b1346..d0532b6ba 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
@@ -1,12 +1,12 @@
-AutoFormat.PurifierLinkify.DocURL
-TYPE: string
-VERSION: 2.0.1
-DEFAULT: '#%s'
-ALIASES: AutoFormatParam.PurifierLinkifyDocURL
---DESCRIPTION--
-<p>
-  Location of configuration documentation to link to, let %s substitute
-  into the configuration's namespace and directive names sans the percent
-  sign.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.PurifierLinkify.DocURL
+TYPE: string
+VERSION: 2.0.1
+DEFAULT: '#%s'
+ALIASES: AutoFormatParam.PurifierLinkifyDocURL
+--DESCRIPTION--
+<p>
+  Location of configuration documentation to link to, let %s substitute
+  into the configuration's namespace and directive names sans the percent
+  sign.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
index 7996488be..f3ab259a1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
@@ -1,12 +1,12 @@
-AutoFormat.PurifierLinkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  Internal auto-formatter that converts configuration directives in
-  syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
-  with the <code>href</code> attribute must be allowed.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.PurifierLinkify
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+  Internal auto-formatter that converts configuration directives in
+  syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
+  with the <code>href</code> attribute must be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
index 6367fe23c..376f771ea 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
@@ -1,14 +1,14 @@
-AutoFormat.RemoveEmpty.Predicate
-TYPE: hash
-VERSION: 4.7.0
-DEFAULT: array('colgroup' => array(), 'th' => array(), 'td' => array(), 'iframe' => array('src'))
---DESCRIPTION--
-<p>
-  Given that an element has no contents, it will be removed by default, unless
-  this predicate dictates otherwise.  The predicate can either be an associative
-  map from tag name to list of attributes that must be present for the element
-  to be considered preserved: thus, the default always preserves <code>colgroup</code>,
-  <code>th</code> and <code>td</code>, and also <code>iframe</code> if it
-  has a <code>src</code>.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveEmpty.Predicate
+TYPE: hash
+VERSION: 4.7.0
+DEFAULT: array('colgroup' => array(), 'th' => array(), 'td' => array(), 'iframe' => array('src'))
+--DESCRIPTION--
+<p>
+  Given that an element has no contents, it will be removed by default, unless
+  this predicate dictates otherwise.  The predicate can either be an associative
+  map from tag name to list of attributes that must be present for the element
+  to be considered preserved: thus, the default always preserves <code>colgroup</code>,
+  <code>th</code> and <code>td</code>, and also <code>iframe</code> if it
+  has a <code>src</code>.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
index 35c393b4e..219d04ac4 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
@@ -1,11 +1,11 @@
-AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array('td' => true, 'th' => true)
---DESCRIPTION--
-<p>
-  When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
-  are enabled, this directive defines what HTML elements should not be
-  removede if they have only a non-breaking space in them.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
+TYPE: lookup
+VERSION: 4.0.0
+DEFAULT: array('td' => true, 'th' => true)
+--DESCRIPTION--
+<p>
+  When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
+  are enabled, this directive defines what HTML elements should not be
+  removede if they have only a non-breaking space in them.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
index ca17eb1dc..9228dee22 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
@@ -6,7 +6,7 @@ DEFAULT: false
 <p>
   When enabled, HTML Purifier will treat any elements that contain only
   non-breaking spaces as well as regular whitespace as empty, and remove
-  them when %AutoForamt.RemoveEmpty is enabled.
+  them when %AutoFormat.RemoveEmpty is enabled.
 </p>
 <p>
   See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
index 34657ba47..6b5a7a5c9 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
@@ -1,46 +1,46 @@
-AutoFormat.RemoveEmpty
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  When enabled, HTML Purifier will attempt to remove empty elements that
-  contribute no semantic information to the document. The following types
-  of nodes will be removed:
-</p>
-<ul><li>
-    Tags with no attributes and no content, and that are not empty
-    elements (remove <code>&lt;a&gt;&lt;/a&gt;</code> but not
-    <code>&lt;br /&gt;</code>), and
-  </li>
-  <li>
-    Tags with no content, except for:<ul>
-      <li>The <code>colgroup</code> element, or</li>
-      <li>
-        Elements with the <code>id</code> or <code>name</code> attribute,
-        when those attributes are permitted on those elements.
-      </li>
-    </ul></li>
-</ul>
-<p>
-  Please be very careful when using this functionality; while it may not
-  seem that empty elements contain useful information, they can alter the
-  layout of a document given appropriate styling. This directive is most
-  useful when you are processing machine-generated HTML, please avoid using
-  it on regular user HTML.
-</p>
-<p>
-  Elements that contain only whitespace will be treated as empty. Non-breaking
-  spaces, however, do not count as whitespace. See
-  %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
-</p>
-<p>
-  This algorithm is not perfect; you may still notice some empty tags,
-  particularly if a node had elements, but those elements were later removed
-  because they were not permitted in that context, or tags that, after
-  being auto-closed by another tag, where empty. This is for safety reasons
-  to prevent clever code from breaking validation. The general rule of thumb:
-  if a tag looked empty on the way in, it will get removed; if HTML Purifier
-  made it empty, it will stay.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveEmpty
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  When enabled, HTML Purifier will attempt to remove empty elements that
+  contribute no semantic information to the document. The following types
+  of nodes will be removed:
+</p>
+<ul><li>
+    Tags with no attributes and no content, and that are not empty
+    elements (remove <code>&lt;a&gt;&lt;/a&gt;</code> but not
+    <code>&lt;br /&gt;</code>), and
+  </li>
+  <li>
+    Tags with no content, except for:<ul>
+      <li>The <code>colgroup</code> element, or</li>
+      <li>
+        Elements with the <code>id</code> or <code>name</code> attribute,
+        when those attributes are permitted on those elements.
+      </li>
+    </ul></li>
+</ul>
+<p>
+  Please be very careful when using this functionality; while it may not
+  seem that empty elements contain useful information, they can alter the
+  layout of a document given appropriate styling. This directive is most
+  useful when you are processing machine-generated HTML, please avoid using
+  it on regular user HTML.
+</p>
+<p>
+  Elements that contain only whitespace will be treated as empty. Non-breaking
+  spaces, however, do not count as whitespace. See
+  %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
+</p>
+<p>
+  This algorithm is not perfect; you may still notice some empty tags,
+  particularly if a node had elements, but those elements were later removed
+  because they were not permitted in that context, or tags that, after
+  being auto-closed by another tag, where empty. This is for safety reasons
+  to prevent clever code from breaking validation. The general rule of thumb:
+  if a tag looked empty on the way in, it will get removed; if HTML Purifier
+  made it empty, it will stay.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
index dde990ab2..a448770e5 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
@@ -1,11 +1,11 @@
-AutoFormat.RemoveSpansWithoutAttributes
-TYPE: bool
-VERSION: 4.0.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-  This directive causes <code>span</code> tags without any attributes
-  to be removed. It will also remove spans that had all attributes
-  removed during processing.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveSpansWithoutAttributes
+TYPE: bool
+VERSION: 4.0.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  This directive causes <code>span</code> tags without any attributes
+  to be removed. It will also remove spans that had all attributes
+  removed during processing.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
index 4d054b1f0..acfeab3c8 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
@@ -1,11 +1,11 @@
-CSS.AllowDuplicates
-TYPE: bool
-DEFAULT: false
-VERSION: 4.8.0
---DESCRIPTION--
-<p>
-  By default, HTML Purifier removes duplicate CSS properties,
-  like <code>color:red; color:blue</code>.  If this is set to
-  true, duplicate properties are allowed.
-</p>
---# vim: et sw=4 sts=4
+CSS.AllowDuplicates
+TYPE: bool
+DEFAULT: false
+VERSION: 4.8.0
+--DESCRIPTION--
+<p>
+  By default, HTML Purifier removes duplicate CSS properties,
+  like <code>color:red; color:blue</code>.  If this is set to
+  true, duplicate properties are allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
index b324608f7..8096eb01a 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
@@ -1,8 +1,8 @@
-CSS.AllowImportant
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not !important cascade modifiers should
-be allowed in user CSS. If false, !important will stripped.
---# vim: et sw=4 sts=4
+CSS.AllowImportant
+TYPE: bool
+DEFAULT: false
+VERSION: 3.1.0
+--DESCRIPTION--
+This parameter determines whether or not !important cascade modifiers should
+be allowed in user CSS. If false, !important will stripped.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
index 748be0eec..9d34debc4 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
@@ -1,11 +1,11 @@
-CSS.AllowTricky
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not to allow "tricky" CSS properties and
-values. Tricky CSS properties/values can drastically modify page layout or
-be used for deceptive practices but do not directly constitute a security risk.
-For example, <code>display:none;</code> is considered a tricky property that
-will only be allowed if this directive is set to true.
---# vim: et sw=4 sts=4
+CSS.AllowTricky
+TYPE: bool
+DEFAULT: false
+VERSION: 3.1.0
+--DESCRIPTION--
+This parameter determines whether or not to allow "tricky" CSS properties and
+values. Tricky CSS properties/values can drastically modify page layout or
+be used for deceptive practices but do not directly constitute a security risk.
+For example, <code>display:none;</code> is considered a tricky property that
+will only be allowed if this directive is set to true.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
index 3fd465406..7c2b54763 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
@@ -1,12 +1,12 @@
-CSS.AllowedFonts
-TYPE: lookup/null
-VERSION: 4.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    Allows you to manually specify a set of allowed fonts.  If
-    <code>NULL</code>, all fonts are allowed.  This directive
-    affects generic names (serif, sans-serif, monospace, cursive,
-    fantasy) as well as specific font families.
-</p>
---# vim: et sw=4 sts=4
+CSS.AllowedFonts
+TYPE: lookup/null
+VERSION: 4.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    Allows you to manually specify a set of allowed fonts.  If
+    <code>NULL</code>, all fonts are allowed.  This directive
+    affects generic names (serif, sans-serif, monospace, cursive,
+    fantasy) as well as specific font families.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
index 460112ebe..f1ba513c3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
@@ -1,18 +1,18 @@
-CSS.AllowedProperties
-TYPE: lookup/null
-VERSION: 3.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    If HTML Purifier's style attributes set is unsatisfactory for your needs,
-    you can overload it with your own list of tags to allow.  Note that this
-    method is subtractive: it does its job by taking away from HTML Purifier
-    usual feature set, so you cannot add an attribute that HTML Purifier never
-    supported in the first place.
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
+CSS.AllowedProperties
+TYPE: lookup/null
+VERSION: 3.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    If HTML Purifier's style attributes set is unsatisfactory for your needs,
+    you can overload it with your own list of tags to allow.  Note that this
+    method is subtractive: it does its job by taking away from HTML Purifier
+    usual feature set, so you cannot add an attribute that HTML Purifier never
+    supported in the first place.
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
index 5cb7dda3b..96b410829 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
@@ -1,11 +1,11 @@
-CSS.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition. See
-    %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
+CSS.DefinitionRev
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+    Revision identifier for your custom definition. See
+    %HTML.DefinitionRev for details.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
index f1f5c5f12..923e8e995 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
@@ -1,13 +1,13 @@
-CSS.ForbiddenProperties
-TYPE: lookup
-VERSION: 4.2.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    This is the logical inverse of %CSS.AllowedProperties, and it will
-    override that directive or any other directive.  If possible,
-    %CSS.AllowedProperties is recommended over this directive,
-    because it can sometimes be difficult to tell whether or not you've
-    forbidden all of the CSS properties you truly would like to disallow.
-</p>
---# vim: et sw=4 sts=4
+CSS.ForbiddenProperties
+TYPE: lookup
+VERSION: 4.2.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    This is the logical inverse of %CSS.AllowedProperties, and it will
+    override that directive or any other directive.  If possible,
+    %CSS.AllowedProperties is recommended over this directive,
+    because it can sometimes be difficult to tell whether or not you've
+    forbidden all of the CSS properties you truly would like to disallow.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
index 7a3291470..3808581e2 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
@@ -1,16 +1,16 @@
-CSS.MaxImgLength
-TYPE: string/null
-DEFAULT: '1200px'
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This parameter sets the maximum allowed length on <code>img</code> tags,
- effectively the <code>width</code> and <code>height</code> properties.
- Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %HTML.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the CSS max is a number with
- a unit).
-</p>
---# vim: et sw=4 sts=4
+CSS.MaxImgLength
+TYPE: string/null
+DEFAULT: '1200px'
+VERSION: 3.1.1
+--DESCRIPTION--
+<p>
+ This parameter sets the maximum allowed length on <code>img</code> tags,
+ effectively the <code>width</code> and <code>height</code> properties.
+ Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
+ in place to prevent imagecrash attacks, disable with null at your own risk.
+ This directive is similar to %HTML.MaxImgLength, and both should be
+ concurrently edited, although there are
+ subtle differences in the input format (the CSS max is a number with
+ a unit).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
index 148eedb8b..8a26f228d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
@@ -1,10 +1,10 @@
-CSS.Proprietary
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Whether or not to allow safe, proprietary CSS values.
-</p>
---# vim: et sw=4 sts=4
+CSS.Proprietary
+TYPE: bool
+VERSION: 3.0.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Whether or not to allow safe, proprietary CSS values.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
index e733a61e8..917ec42ba 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
@@ -1,9 +1,9 @@
-CSS.Trusted
-TYPE: bool
-VERSION: 4.2.1
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user's CSS input is trusted or not. If the
-input is trusted, a more expansive set of allowed properties.  See
-also %HTML.Trusted.
---# vim: et sw=4 sts=4
+CSS.Trusted
+TYPE: bool
+VERSION: 4.2.1
+DEFAULT: false
+--DESCRIPTION--
+Indicates whether or not the user's CSS input is trusted or not. If the
+input is trusted, a more expansive set of allowed properties.  See
+also %HTML.Trusted.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
index c486724c8..afc6a87a6 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
@@ -1,14 +1,14 @@
-Cache.DefinitionImpl
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: 'Serializer'
---DESCRIPTION--
-
-This directive defines which method to use when caching definitions,
-the complex data-type that makes HTML Purifier tick. Set to null
-to disable caching (not recommended, as you will see a definite
-performance degradation).
-
---ALIASES--
-Core.DefinitionCache
---# vim: et sw=4 sts=4
+Cache.DefinitionImpl
+TYPE: string/null
+VERSION: 2.0.0
+DEFAULT: 'Serializer'
+--DESCRIPTION--
+
+This directive defines which method to use when caching definitions,
+the complex data-type that makes HTML Purifier tick. Set to null
+to disable caching (not recommended, as you will see a definite
+performance degradation).
+
+--ALIASES--
+Core.DefinitionCache
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
index 54036507d..668f248af 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
@@ -1,13 +1,13 @@
-Cache.SerializerPath
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Absolute path with no trailing slash to store serialized definitions in.
-    Default is within the
-    HTML Purifier library inside DefinitionCache/Serializer. This
-    path must be writable by the webserver.
-</p>
---# vim: et sw=4 sts=4
+Cache.SerializerPath
+TYPE: string/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Absolute path with no trailing slash to store serialized definitions in.
+    Default is within the
+    HTML Purifier library inside DefinitionCache/Serializer. This
+    path must be writable by the webserver.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
index 2e0cc8104..f6059e672 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
@@ -1,16 +1,16 @@
-Cache.SerializerPermissions
-TYPE: int/null
-VERSION: 4.3.0
-DEFAULT: 0755
---DESCRIPTION--
-
-<p>
-    Directory permissions of the files and directories created inside
-    the DefinitionCache/Serializer or other custom serializer path.
-</p>
-<p>
-    In HTML Purifier 4.8.0, this also supports <code>NULL</code>,
-    which means that no chmod'ing or directory creation shall
-    occur.
-</p>
---# vim: et sw=4 sts=4
+Cache.SerializerPermissions
+TYPE: int/null
+VERSION: 4.3.0
+DEFAULT: 0755
+--DESCRIPTION--
+
+<p>
+    Directory permissions of the files and directories created inside
+    the DefinitionCache/Serializer or other custom serializer path.
+</p>
+<p>
+    In HTML Purifier 4.8.0, this also supports <code>NULL</code>,
+    which means that no chmod'ing or directory creation shall
+    occur.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
index 568cbf3b3..e0fa378ea 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
@@ -1,18 +1,18 @@
-Core.AggressivelyFixLt
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    This directive enables aggressive pre-filter fixes HTML Purifier can
-    perform in order to ensure that open angled-brackets do not get killed
-    during parsing stage. Enabling this will result in two preg_replace_callback
-    calls and at least two preg_replace calls for every HTML document parsed;
-    if your users make very well-formed HTML, you can set this directive false.
-    This has no effect when DirectLex is used.
-</p>
-<p>
-    <strong>Notice:</strong> This directive's default turned from false to true
-    in HTML Purifier 3.2.0.
-</p>
---# vim: et sw=4 sts=4
+Core.AggressivelyFixLt
+TYPE: bool
+VERSION: 2.1.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+    This directive enables aggressive pre-filter fixes HTML Purifier can
+    perform in order to ensure that open angled-brackets do not get killed
+    during parsing stage. Enabling this will result in two preg_replace_callback
+    calls and at least two preg_replace calls for every HTML document parsed;
+    if your users make very well-formed HTML, you can set this directive false.
+    This has no effect when DirectLex is used.
+</p>
+<p>
+    <strong>Notice:</strong> This directive's default turned from false to true
+    in HTML Purifier 3.2.0.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
index b2b6ab149..fb140b69d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
@@ -1,16 +1,16 @@
-Core.AggressivelyRemoveScript
-TYPE: bool
-VERSION: 4.9.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    This directive enables aggressive pre-filter removal of
-    script tags.  This is not necessary for security,
-    but it can help work around a bug in libxml where embedded
-    HTML elements inside script sections cause the parser to
-    choke.  To revert to pre-4.9.0 behavior, set this to false.
-    This directive has no effect if %Core.Trusted is true,
-    %Core.RemoveScriptContents is false, or %Core.HiddenElements
-    does not contain script.
-</p>
---# vim: et sw=4 sts=4
+Core.AggressivelyRemoveScript
+TYPE: bool
+VERSION: 4.9.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+    This directive enables aggressive pre-filter removal of
+    script tags.  This is not necessary for security,
+    but it can help work around a bug in libxml where embedded
+    HTML elements inside script sections cause the parser to
+    choke.  To revert to pre-4.9.0 behavior, set this to false.
+    This directive has no effect if %Core.Trusted is true,
+    %Core.RemoveScriptContents is false, or %Core.HiddenElements
+    does not contain script.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
index 2c910cc7d..405d36f17 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
@@ -1,16 +1,16 @@
-Core.AllowHostnameUnderscore
-TYPE: bool
-VERSION: 4.6.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    By RFC 1123, underscores are not permitted in host names.
-    (This is in contrast to the specification for DNS, RFC
-    2181, which allows underscores.)
-    However, most browsers do the right thing when faced with
-    an underscore in the host name, and so some poorly written
-    websites are written with the expectation this should work.
-    Setting this parameter to true relaxes our allowed character
-    check so that underscores are permitted.
-</p>
---# vim: et sw=4 sts=4
+Core.AllowHostnameUnderscore
+TYPE: bool
+VERSION: 4.6.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    By RFC 1123, underscores are not permitted in host names.
+    (This is in contrast to the specification for DNS, RFC
+    2181, which allows underscores.)
+    However, most browsers do the right thing when faced with
+    an underscore in the host name, and so some poorly written
+    websites are written with the expectation this should work.
+    Setting this parameter to true relaxes our allowed character
+    check so that underscores are permitted.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
new file mode 100644
index 000000000..06278f82a
--- /dev/null
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
@@ -0,0 +1,12 @@
+Core.AllowParseManyTags
+TYPE: bool
+DEFAULT: false
+VERSION: 4.10.1
+--DESCRIPTION--
+<p>
+    This directive allows parsing of many nested tags.
+    If you set true, relaxes any hardcoded limit from the parser.
+    However, in that case it may cause a Dos attack.
+    Be careful when enabling it.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
index d7317911f..c6ea06990 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
@@ -1,12 +1,12 @@
-Core.CollectErrors
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-
-Whether or not to collect errors found while filtering the document. This
-is a useful way to give feedback to your users. <strong>Warning:</strong>
-Currently this feature is very patchy and experimental, with lots of
-possible error messages not yet implemented. It will not cause any
-problems, but it may not help your users either.
---# vim: et sw=4 sts=4
+Core.CollectErrors
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: false
+--DESCRIPTION--
+
+Whether or not to collect errors found while filtering the document. This
+is a useful way to give feedback to your users. <strong>Warning:</strong>
+Currently this feature is very patchy and experimental, with lots of
+possible error messages not yet implemented. It will not cause any
+problems, but it may not help your users either.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
index c572c14ec..a75844cd5 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
@@ -3,23 +3,154 @@ TYPE: hash
 VERSION: 2.0.0
 --DEFAULT--
 array (
-  'maroon' => '#800000',
-  'red' => '#FF0000',
-  'orange' => '#FFA500',
-  'yellow' => '#FFFF00',
-  'olive' => '#808000',
-  'purple' => '#800080',
-  'fuchsia' => '#FF00FF',
-  'white' => '#FFFFFF',
-  'lime' => '#00FF00',
-  'green' => '#008000',
-  'navy' => '#000080',
-  'blue' => '#0000FF',
+  'aliceblue' => '#F0F8FF',
+  'antiquewhite' => '#FAEBD7',
   'aqua' => '#00FFFF',
-  'teal' => '#008080',
+  'aquamarine' => '#7FFFD4',
+  'azure' => '#F0FFFF',
+  'beige' => '#F5F5DC',
+  'bisque' => '#FFE4C4',
   'black' => '#000000',
-  'silver' => '#C0C0C0',
+  'blanchedalmond' => '#FFEBCD',
+  'blue' => '#0000FF',
+  'blueviolet' => '#8A2BE2',
+  'brown' => '#A52A2A',
+  'burlywood' => '#DEB887',
+  'cadetblue' => '#5F9EA0',
+  'chartreuse' => '#7FFF00',
+  'chocolate' => '#D2691E',
+  'coral' => '#FF7F50',
+  'cornflowerblue' => '#6495ED',
+  'cornsilk' => '#FFF8DC',
+  'crimson' => '#DC143C',
+  'cyan' => '#00FFFF',
+  'darkblue' => '#00008B',
+  'darkcyan' => '#008B8B',
+  'darkgoldenrod' => '#B8860B',
+  'darkgray' => '#A9A9A9',
+  'darkgrey' => '#A9A9A9',
+  'darkgreen' => '#006400',
+  'darkkhaki' => '#BDB76B',
+  'darkmagenta' => '#8B008B',
+  'darkolivegreen' => '#556B2F',
+  'darkorange' => '#FF8C00',
+  'darkorchid' => '#9932CC',
+  'darkred' => '#8B0000',
+  'darksalmon' => '#E9967A',
+  'darkseagreen' => '#8FBC8F',
+  'darkslateblue' => '#483D8B',
+  'darkslategray' => '#2F4F4F',
+  'darkslategrey' => '#2F4F4F',
+  'darkturquoise' => '#00CED1',
+  'darkviolet' => '#9400D3',
+  'deeppink' => '#FF1493',
+  'deepskyblue' => '#00BFFF',
+  'dimgray' => '#696969',
+  'dimgrey' => '#696969',
+  'dodgerblue' => '#1E90FF',
+  'firebrick' => '#B22222',
+  'floralwhite' => '#FFFAF0',
+  'forestgreen' => '#228B22',
+  'fuchsia' => '#FF00FF',
+  'gainsboro' => '#DCDCDC',
+  'ghostwhite' => '#F8F8FF',
+  'gold' => '#FFD700',
+  'goldenrod' => '#DAA520',
   'gray' => '#808080',
+  'grey' => '#808080',
+  'green' => '#008000',
+  'greenyellow' => '#ADFF2F',
+  'honeydew' => '#F0FFF0',
+  'hotpink' => '#FF69B4',
+  'indianred' => '#CD5C5C',
+  'indigo' => '#4B0082',
+  'ivory' => '#FFFFF0',
+  'khaki' => '#F0E68C',
+  'lavender' => '#E6E6FA',
+  'lavenderblush' => '#FFF0F5',
+  'lawngreen' => '#7CFC00',
+  'lemonchiffon' => '#FFFACD',
+  'lightblue' => '#ADD8E6',
+  'lightcoral' => '#F08080',
+  'lightcyan' => '#E0FFFF',
+  'lightgoldenrodyellow' => '#FAFAD2',
+  'lightgray' => '#D3D3D3',
+  'lightgrey' => '#D3D3D3',
+  'lightgreen' => '#90EE90',
+  'lightpink' => '#FFB6C1',
+  'lightsalmon' => '#FFA07A',
+  'lightseagreen' => '#20B2AA',
+  'lightskyblue' => '#87CEFA',
+  'lightslategray' => '#778899',
+  'lightslategrey' => '#778899',
+  'lightsteelblue' => '#B0C4DE',
+  'lightyellow' => '#FFFFE0',
+  'lime' => '#00FF00',
+  'limegreen' => '#32CD32',
+  'linen' => '#FAF0E6',
+  'magenta' => '#FF00FF',
+  'maroon' => '#800000',
+  'mediumaquamarine' => '#66CDAA',
+  'mediumblue' => '#0000CD',
+  'mediumorchid' => '#BA55D3',
+  'mediumpurple' => '#9370DB',
+  'mediumseagreen' => '#3CB371',
+  'mediumslateblue' => '#7B68EE',
+  'mediumspringgreen' => '#00FA9A',
+  'mediumturquoise' => '#48D1CC',
+  'mediumvioletred' => '#C71585',
+  'midnightblue' => '#191970',
+  'mintcream' => '#F5FFFA',
+  'mistyrose' => '#FFE4E1',
+  'moccasin' => '#FFE4B5',
+  'navajowhite' => '#FFDEAD',
+  'navy' => '#000080',
+  'oldlace' => '#FDF5E6',
+  'olive' => '#808000',
+  'olivedrab' => '#6B8E23',
+  'orange' => '#FFA500',
+  'orangered' => '#FF4500',
+  'orchid' => '#DA70D6',
+  'palegoldenrod' => '#EEE8AA',
+  'palegreen' => '#98FB98',
+  'paleturquoise' => '#AFEEEE',
+  'palevioletred' => '#DB7093',
+  'papayawhip' => '#FFEFD5',
+  'peachpuff' => '#FFDAB9',
+  'peru' => '#CD853F',
+  'pink' => '#FFC0CB',
+  'plum' => '#DDA0DD',
+  'powderblue' => '#B0E0E6',
+  'purple' => '#800080',
+  'rebeccapurple' => '#663399',
+  'red' => '#FF0000',
+  'rosybrown' => '#BC8F8F',
+  'royalblue' => '#4169E1',
+  'saddlebrown' => '#8B4513',
+  'salmon' => '#FA8072',
+  'sandybrown' => '#F4A460',
+  'seagreen' => '#2E8B57',
+  'seashell' => '#FFF5EE',
+  'sienna' => '#A0522D',
+  'silver' => '#C0C0C0',
+  'skyblue' => '#87CEEB',
+  'slateblue' => '#6A5ACD',
+  'slategray' => '#708090',
+  'slategrey' => '#708090',
+  'snow' => '#FFFAFA',
+  'springgreen' => '#00FF7F',
+  'steelblue' => '#4682B4',
+  'tan' => '#D2B48C',
+  'teal' => '#008080',
+  'thistle' => '#D8BFD8',
+  'tomato' => '#FF6347',
+  'turquoise' => '#40E0D0',
+  'violet' => '#EE82EE',
+  'wheat' => '#F5DEB3',
+  'white' => '#FFFFFF',
+  'whitesmoke' => '#F5F5F5',
+  'yellow' => '#FFFF00',
+  'yellowgreen' => '#9ACD32'
 )
 --DESCRIPTION--
 
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
index 64b114fce..656d3783a 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
@@ -1,14 +1,14 @@
-Core.ConvertDocumentToFragment
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-
-This parameter determines whether or not the filter should convert
-input that is a full document with html and body tags to a fragment
-of just the contents of a body tag. This parameter is simply something
-HTML Purifier can do during an edge-case: for most inputs, this
-processing is not necessary.
-
---ALIASES--
-Core.AcceptFullDocuments
---# vim: et sw=4 sts=4
+Core.ConvertDocumentToFragment
+TYPE: bool
+DEFAULT: true
+--DESCRIPTION--
+
+This parameter determines whether or not the filter should convert
+input that is a full document with html and body tags to a fragment
+of just the contents of a body tag. This parameter is simply something
+HTML Purifier can do during an edge-case: for most inputs, this
+processing is not necessary.
+
+--ALIASES--
+Core.AcceptFullDocuments
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
index 36f16e07e..2f54e462a 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
@@ -1,17 +1,17 @@
-Core.DirectLexLineNumberSyncInterval
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 0
---DESCRIPTION--
-
-<p>
-  Specifies the number of tokens the DirectLex line number tracking
-  implementations should process before attempting to resyncronize the
-  current line count by manually counting all previous new-lines. When
-  at 0, this functionality is disabled. Lower values will decrease
-  performance, and this is only strictly necessary if the counting
-  algorithm is buggy (in which case you should report it as a bug).
-  This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
-  not being used.
-</p>
---# vim: et sw=4 sts=4
+Core.DirectLexLineNumberSyncInterval
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 0
+--DESCRIPTION--
+
+<p>
+  Specifies the number of tokens the DirectLex line number tracking
+  implementations should process before attempting to resyncronize the
+  current line count by manually counting all previous new-lines. When
+  at 0, this functionality is disabled. Lower values will decrease
+  performance, and this is only strictly necessary if the counting
+  algorithm is buggy (in which case you should report it as a bug).
+  This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
+  not being used.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
index 1cd4c2c96..3c63c923c 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
@@ -1,14 +1,14 @@
-Core.DisableExcludes
-TYPE: bool
-DEFAULT: false
-VERSION: 4.5.0
---DESCRIPTION--
-<p>
-  This directive disables SGML-style exclusions, e.g. the exclusion of
-  <code>&lt;object&gt;</code> in any descendant of a
-  <code>&lt;pre&gt;</code> tag.  Disabling excludes will allow some
-  invalid documents to pass through HTML Purifier, but HTML Purifier
-  will also be less likely to accidentally remove large documents during
-  processing.
-</p>
---# vim: et sw=4 sts=4
+Core.DisableExcludes
+TYPE: bool
+DEFAULT: false
+VERSION: 4.5.0
+--DESCRIPTION--
+<p>
+  This directive disables SGML-style exclusions, e.g. the exclusion of
+  <code>&lt;object&gt;</code> in any descendant of a
+  <code>&lt;pre&gt;</code> tag.  Disabling excludes will allow some
+  invalid documents to pass through HTML Purifier, but HTML Purifier
+  will also be less likely to accidentally remove large documents during
+  processing.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
index ce243c35d..7f498e7e7 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
@@ -1,9 +1,9 @@
-Core.EnableIDNA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.4.0
---DESCRIPTION--
-Allows international domain names in URLs.  This configuration option
-requires the PEAR Net_IDNA2 module to be installed.  It operates by
-punycoding any internationalized host names for maximum portability.
---# vim: et sw=4 sts=4
+Core.EnableIDNA
+TYPE: bool
+DEFAULT: false
+VERSION: 4.4.0
+--DESCRIPTION--
+Allows international domain names in URLs.  This configuration option
+requires the PEAR Net_IDNA2 module to be installed.  It operates by
+punycoding any internationalized host names for maximum portability.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
index 8bfb47c3a..89e2ae34b 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
@@ -1,15 +1,15 @@
-Core.Encoding
-TYPE: istring
-DEFAULT: 'utf-8'
---DESCRIPTION--
-If for some reason you are unable to convert all webpages to UTF-8, you can
-use this directive as a stop-gap compatibility change to let HTML Purifier
-deal with non UTF-8 input.  This technique has notable deficiencies:
-absolutely no characters outside of the selected character encoding will be
-preserved, not even the ones that have been ampersand escaped (this is due
-to a UTF-8 specific <em>feature</em> that automatically resolves all
-entities), making it pretty useless for anything except the most I18N-blind
-applications, although %Core.EscapeNonASCIICharacters offers fixes this
-trouble with another tradeoff. This directive only accepts ISO-8859-1 if
-iconv is not enabled.
---# vim: et sw=4 sts=4
+Core.Encoding
+TYPE: istring
+DEFAULT: 'utf-8'
+--DESCRIPTION--
+If for some reason you are unable to convert all webpages to UTF-8, you can
+use this directive as a stop-gap compatibility change to let HTML Purifier
+deal with non UTF-8 input.  This technique has notable deficiencies:
+absolutely no characters outside of the selected character encoding will be
+preserved, not even the ones that have been ampersand escaped (this is due
+to a UTF-8 specific <em>feature</em> that automatically resolves all
+entities), making it pretty useless for anything except the most I18N-blind
+applications, although %Core.EscapeNonASCIICharacters offers fixes this
+trouble with another tradeoff. This directive only accepts ISO-8859-1 if
+iconv is not enabled.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
index a3881be75..1cc3fcda2 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
@@ -1,12 +1,12 @@
-Core.EscapeInvalidChildren
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-<p><strong>Warning:</strong> this configuration option is no longer does anything as of 4.6.0.</p>
-
-<p>When true, a child is found that is not allowed in the context of the
-parent element will be transformed into text as if it were ASCII. When
-false, that element and all internal tags will be dropped, though text will
-be preserved.  There is no option for dropping the element but preserving
-child nodes.</p>
---# vim: et sw=4 sts=4
+Core.EscapeInvalidChildren
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+<p><strong>Warning:</strong> this configuration option is no longer does anything as of 4.6.0.</p>
+
+<p>When true, a child is found that is not allowed in the context of the
+parent element will be transformed into text as if it were ASCII. When
+false, that element and all internal tags will be dropped, though text will
+be preserved.  There is no option for dropping the element but preserving
+child nodes.</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
index a7a5b249b..299775fab 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
@@ -1,7 +1,7 @@
-Core.EscapeInvalidTags
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, invalid tags will be written back to the document as plain text.
-Otherwise, they are silently dropped.
---# vim: et sw=4 sts=4
+Core.EscapeInvalidTags
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When true, invalid tags will be written back to the document as plain text.
+Otherwise, they are silently dropped.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
index abb499948..f50db2f92 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
@@ -1,13 +1,13 @@
-Core.EscapeNonASCIICharacters
-TYPE: bool
-VERSION: 1.4.0
-DEFAULT: false
---DESCRIPTION--
-This directive overcomes a deficiency in %Core.Encoding by blindly
-converting all non-ASCII characters into decimal numeric entities before
-converting it to its native encoding. This means that even characters that
-can be expressed in the non-UTF-8 encoding will be entity-ized, which can
-be a real downer for encodings like Big5. It also assumes that the ASCII
-repetoire is available, although this is the case for almost all encodings.
-Anyway, use UTF-8!
---# vim: et sw=4 sts=4
+Core.EscapeNonASCIICharacters
+TYPE: bool
+VERSION: 1.4.0
+DEFAULT: false
+--DESCRIPTION--
+This directive overcomes a deficiency in %Core.Encoding by blindly
+converting all non-ASCII characters into decimal numeric entities before
+converting it to its native encoding. This means that even characters that
+can be expressed in the non-UTF-8 encoding will be entity-ized, which can
+be a real downer for encodings like Big5. It also assumes that the ASCII
+repetoire is available, although this is the case for almost all encodings.
+Anyway, use UTF-8!
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
index 915391edb..c337e47fc 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
@@ -1,19 +1,19 @@
-Core.HiddenElements
-TYPE: lookup
---DEFAULT--
-array (
-  'script' => true,
-  'style' => true,
-)
---DESCRIPTION--
-
-<p>
-  This directive is a lookup array of elements which should have their
-  contents removed when they are not allowed by the HTML definition.
-  For example, the contents of a <code>script</code> tag are not
-  normally shown in a document, so if script tags are to be removed,
-  their contents should be removed to. This is opposed to a <code>b</code>
-  tag, which defines some presentational changes but does not hide its
-  contents.
-</p>
---# vim: et sw=4 sts=4
+Core.HiddenElements
+TYPE: lookup
+--DEFAULT--
+array (
+  'script' => true,
+  'style' => true,
+)
+--DESCRIPTION--
+
+<p>
+  This directive is a lookup array of elements which should have their
+  contents removed when they are not allowed by the HTML definition.
+  For example, the contents of a <code>script</code> tag are not
+  normally shown in a document, so if script tags are to be removed,
+  their contents should be removed to. This is opposed to a <code>b</code>
+  tag, which defines some presentational changes but does not hide its
+  contents.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
index 233fca14f..ed1f39b5f 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
@@ -1,10 +1,10 @@
-Core.Language
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'en'
---DESCRIPTION--
-
-ISO 639 language code for localizable things in HTML Purifier to use,
-which is mainly error reporting. There is currently only an English (en)
-translation, so this directive is currently useless.
---# vim: et sw=4 sts=4
+Core.Language
+TYPE: string
+VERSION: 2.0.0
+DEFAULT: 'en'
+--DESCRIPTION--
+
+ISO 639 language code for localizable things in HTML Purifier to use,
+which is mainly error reporting. There is currently only an English (en)
+translation, so this directive is currently useless.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
index 392b43649..81d9ae4dc 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
@@ -1,36 +1,36 @@
-Core.LegacyEntityDecoder
-TYPE: bool
-VERSION: 4.9.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Prior to HTML Purifier 4.9.0, entities were decoded by performing
-    a global search replace for all entities whose decoded versions
-    did not have special meanings under HTML, and replaced them with
-    their decoded versions.  We would match all entities, even if they did
-    not have a trailing semicolon, but only if there weren't any trailing
-    alphanumeric characters.
-</p>
-<table>
-<tr><th>Original</th><th>Text</th><th>Attribute</th></tr>
-<tr><td>&amp;yen;</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yen</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yena</td><td>&amp;yena</td><td>&amp;yena</td></tr>
-<tr><td>&amp;yen=</td><td>&yen;=</td><td>&yen;=</td></tr>
-</table>
-<p>
-    In HTML Purifier 4.9.0, we changed the behavior of entity parsing
-    to match entities that had missing trailing semicolons in less
-    cases, to more closely match HTML5 parsing behavior:
-</p>
-<table>
-<tr><th>Original</th><th>Text</th><th>Attribute</th></tr>
-<tr><td>&amp;yen;</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yen</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yena</td><td>&yen;a</td><td>&amp;yena</td></tr>
-<tr><td>&amp;yen=</td><td>&yen;=</td><td>&amp;yen=</td></tr>
-</table>
-<p>
-    This flag reverts back to pre-HTML Purifier 4.9.0 behavior.
-</p>
---# vim: et sw=4 sts=4
+Core.LegacyEntityDecoder
+TYPE: bool
+VERSION: 4.9.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Prior to HTML Purifier 4.9.0, entities were decoded by performing
+    a global search replace for all entities whose decoded versions
+    did not have special meanings under HTML, and replaced them with
+    their decoded versions.  We would match all entities, even if they did
+    not have a trailing semicolon, but only if there weren't any trailing
+    alphanumeric characters.
+</p>
+<table>
+<tr><th>Original</th><th>Text</th><th>Attribute</th></tr>
+<tr><td>&amp;yen;</td><td>&yen;</td><td>&yen;</td></tr>
+<tr><td>&amp;yen</td><td>&yen;</td><td>&yen;</td></tr>
+<tr><td>&amp;yena</td><td>&amp;yena</td><td>&amp;yena</td></tr>
+<tr><td>&amp;yen=</td><td>&yen;=</td><td>&yen;=</td></tr>
+</table>
+<p>
+    In HTML Purifier 4.9.0, we changed the behavior of entity parsing
+    to match entities that had missing trailing semicolons in less
+    cases, to more closely match HTML5 parsing behavior:
+</p>
+<table>
+<tr><th>Original</th><th>Text</th><th>Attribute</th></tr>
+<tr><td>&amp;yen;</td><td>&yen;</td><td>&yen;</td></tr>
+<tr><td>&amp;yen</td><td>&yen;</td><td>&yen;</td></tr>
+<tr><td>&amp;yena</td><td>&yen;a</td><td>&amp;yena</td></tr>
+<tr><td>&amp;yen=</td><td>&yen;=</td><td>&amp;yen=</td></tr>
+</table>
+<p>
+    This flag reverts back to pre-HTML Purifier 4.9.0 behavior.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
index 8983e2cca..e11c0152c 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
@@ -1,34 +1,34 @@
-Core.LexerImpl
-TYPE: mixed/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-  This parameter determines what lexer implementation can be used. The
-  valid values are:
-</p>
-<dl>
-  <dt><em>null</em></dt>
-  <dd>
-    Recommended, the lexer implementation will be auto-detected based on
-    your PHP-version and configuration.
-  </dd>
-  <dt><em>string</em> lexer identifier</dt>
-  <dd>
-    This is a slim way of manually overridding the implementation.
-    Currently recognized values are: DOMLex (the default PHP5
-implementation)
-    and DirectLex (the default PHP4 implementation). Only use this if
-    you know what you are doing: usually, the auto-detection will
-    manage things for cases you aren't even aware of.
-  </dd>
-  <dt><em>object</em> lexer instance</dt>
-  <dd>
-    Super-advanced: you can specify your own, custom, implementation that
-    implements the interface defined by <code>HTMLPurifier_Lexer</code>.
-    I may remove this option simply because I don't expect anyone
-    to use it.
-  </dd>
-</dl>
---# vim: et sw=4 sts=4
+Core.LexerImpl
+TYPE: mixed/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+  This parameter determines what lexer implementation can be used. The
+  valid values are:
+</p>
+<dl>
+  <dt><em>null</em></dt>
+  <dd>
+    Recommended, the lexer implementation will be auto-detected based on
+    your PHP-version and configuration.
+  </dd>
+  <dt><em>string</em> lexer identifier</dt>
+  <dd>
+    This is a slim way of manually overridding the implementation.
+    Currently recognized values are: DOMLex (the default PHP5
+implementation)
+    and DirectLex (the default PHP4 implementation). Only use this if
+    you know what you are doing: usually, the auto-detection will
+    manage things for cases you aren't even aware of.
+  </dd>
+  <dt><em>object</em> lexer instance</dt>
+  <dd>
+    Super-advanced: you can specify your own, custom, implementation that
+    implements the interface defined by <code>HTMLPurifier_Lexer</code>.
+    I may remove this option simply because I don't expect anyone
+    to use it.
+  </dd>
+</dl>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
index eb841a759..838f10f61 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
@@ -1,16 +1,16 @@
-Core.MaintainLineNumbers
-TYPE: bool/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-  If true, HTML Purifier will add line number information to all tokens.
-  This is useful when error reporting is turned on, but can result in
-  significant performance degradation and should not be used when
-  unnecessary. This directive must be used with the DirectLex lexer,
-  as the DOMLex lexer does not (yet) support this functionality.
-  If the value is null, an appropriate value will be selected based
-  on other configuration.
-</p>
---# vim: et sw=4 sts=4
+Core.MaintainLineNumbers
+TYPE: bool/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+  If true, HTML Purifier will add line number information to all tokens.
+  This is useful when error reporting is turned on, but can result in
+  significant performance degradation and should not be used when
+  unnecessary. This directive must be used with the DirectLex lexer,
+  as the DOMLex lexer does not (yet) support this functionality.
+  If the value is null, an appropriate value will be selected based
+  on other configuration.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
index d77f5360d..94a88600d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
@@ -1,11 +1,11 @@
-Core.NormalizeNewlines
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    Whether or not to normalize newlines to the operating
-    system default.  When <code>false</code>, HTML Purifier
-    will attempt to preserve mixed newline files.
-</p>
---# vim: et sw=4 sts=4
+Core.NormalizeNewlines
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+    Whether or not to normalize newlines to the operating
+    system default.  When <code>false</code>, HTML Purifier
+    will attempt to preserve mixed newline files.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
index 4070c2a0d..704ac56c8 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
@@ -1,12 +1,12 @@
-Core.RemoveInvalidImg
-TYPE: bool
-DEFAULT: true
-VERSION: 1.3.0
---DESCRIPTION--
-
-<p>
-  This directive enables pre-emptive URI checking in <code>img</code>
-  tags, as the attribute validation strategy is not authorized to
-  remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
-</p>
---# vim: et sw=4 sts=4
+Core.RemoveInvalidImg
+TYPE: bool
+DEFAULT: true
+VERSION: 1.3.0
+--DESCRIPTION--
+
+<p>
+  This directive enables pre-emptive URI checking in <code>img</code>
+  tags, as the attribute validation strategy is not authorized to
+  remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
index 3397d9f71..ed6f13425 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
@@ -1,11 +1,11 @@
-Core.RemoveProcessingInstructions
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-Instead of escaping processing instructions in the form <code>&lt;? ...
-?&gt;</code>, remove it out-right.  This may be useful if the HTML
-you are validating contains XML processing instruction gunk, however,
-it can also be user-unfriendly for people attempting to post PHP
-snippets.
---# vim: et sw=4 sts=4
+Core.RemoveProcessingInstructions
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+Instead of escaping processing instructions in the form <code>&lt;? ...
+?&gt;</code>, remove it out-right.  This may be useful if the HTML
+you are validating contains XML processing instruction gunk, however,
+it can also be user-unfriendly for people attempting to post PHP
+snippets.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
index a4cd966df..efbe994c2 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
@@ -1,12 +1,12 @@
-Core.RemoveScriptContents
-TYPE: bool/null
-DEFAULT: NULL
-VERSION: 2.0.0
-DEPRECATED-VERSION: 2.1.0
-DEPRECATED-USE: Core.HiddenElements
---DESCRIPTION--
-<p>
-  This directive enables HTML Purifier to remove not only script tags
-  but all of their contents.
-</p>
---# vim: et sw=4 sts=4
+Core.RemoveScriptContents
+TYPE: bool/null
+DEFAULT: NULL
+VERSION: 2.0.0
+DEPRECATED-VERSION: 2.1.0
+DEPRECATED-USE: Core.HiddenElements
+--DESCRIPTION--
+<p>
+  This directive enables HTML Purifier to remove not only script tags
+  but all of their contents.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
index 3db50ef20..861ae66c3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
@@ -1,11 +1,11 @@
-Filter.Custom
-TYPE: list
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-  This directive can be used to add custom filters; it is nearly the
-  equivalent of the now deprecated <code>HTMLPurifier-&gt;addFilter()</code>
-  method. Specify an array of concrete implementations.
-</p>
---# vim: et sw=4 sts=4
+Filter.Custom
+TYPE: list
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+  This directive can be used to add custom filters; it is nearly the
+  equivalent of the now deprecated <code>HTMLPurifier-&gt;addFilter()</code>
+  method. Specify an array of concrete implementations.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
index 16829bcda..69602635e 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
@@ -1,14 +1,14 @@
-Filter.ExtractStyleBlocks.Escaping
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: true
-ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
---DESCRIPTION--
-
-<p>
-  Whether or not to escape the dangerous characters &lt;, &gt; and &amp;
-  as \3C, \3E and \26, respectively. This is can be safely set to false
-  if the contents of StyleBlocks will be placed in an external stylesheet,
-  where there is no risk of it being interpreted as HTML.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks.Escaping
+TYPE: bool
+VERSION: 3.0.0
+DEFAULT: true
+ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
+--DESCRIPTION--
+
+<p>
+  Whether or not to escape the dangerous characters &lt;, &gt; and &amp;
+  as \3C, \3E and \26, respectively. This is can be safely set to false
+  if the contents of StyleBlocks will be placed in an external stylesheet,
+  where there is no risk of it being interpreted as HTML.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
index 7f95f54d1..baa81ae06 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
@@ -1,29 +1,29 @@
-Filter.ExtractStyleBlocks.Scope
-TYPE: string/null
-VERSION: 3.0.0
-DEFAULT: NULL
-ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
---DESCRIPTION--
-
-<p>
-  If you would like users to be able to define external stylesheets, but
-  only allow them to specify CSS declarations for a specific node and
-  prevent them from fiddling with other elements, use this directive.
-  It accepts any valid CSS selector, and will prepend this to any
-  CSS declaration extracted from the document. For example, if this
-  directive is set to <code>#user-content</code> and a user uses the
-  selector <code>a:hover</code>, the final selector will be
-  <code>#user-content a:hover</code>.
-</p>
-<p>
-  The comma shorthand may be used; consider the above example, with
-  <code>#user-content, #user-content2</code>, the final selector will
-  be <code>#user-content a:hover, #user-content2 a:hover</code>.
-</p>
-<p>
-  <strong>Warning:</strong> It is possible for users to bypass this measure
-  using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
-  Purifier, and I am working to get it fixed. Until then, HTML Purifier
-  performs a basic check to prevent this.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks.Scope
+TYPE: string/null
+VERSION: 3.0.0
+DEFAULT: NULL
+ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
+--DESCRIPTION--
+
+<p>
+  If you would like users to be able to define external stylesheets, but
+  only allow them to specify CSS declarations for a specific node and
+  prevent them from fiddling with other elements, use this directive.
+  It accepts any valid CSS selector, and will prepend this to any
+  CSS declaration extracted from the document. For example, if this
+  directive is set to <code>#user-content</code> and a user uses the
+  selector <code>a:hover</code>, the final selector will be
+  <code>#user-content a:hover</code>.
+</p>
+<p>
+  The comma shorthand may be used; consider the above example, with
+  <code>#user-content, #user-content2</code>, the final selector will
+  be <code>#user-content a:hover, #user-content2 a:hover</code>.
+</p>
+<p>
+  <strong>Warning:</strong> It is possible for users to bypass this measure
+  using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
+  Purifier, and I am working to get it fixed. Until then, HTML Purifier
+  performs a basic check to prevent this.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
index 6c231b2d7..3b7018917 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
@@ -1,16 +1,16 @@
-Filter.ExtractStyleBlocks.TidyImpl
-TYPE: mixed/null
-VERSION: 3.1.0
-DEFAULT: NULL
-ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
---DESCRIPTION--
-<p>
-  If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
-  class to use for internal cleaning. This will usually be good enough.
-</p>
-<p>
-  However, for trusted user input, you can set this to <code>false</code> to
-  disable cleaning. In addition, you can supply your own concrete implementation
-  of Tidy's interface to use, although I don't know why you'd want to do that.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks.TidyImpl
+TYPE: mixed/null
+VERSION: 3.1.0
+DEFAULT: NULL
+ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
+--DESCRIPTION--
+<p>
+  If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
+  class to use for internal cleaning. This will usually be good enough.
+</p>
+<p>
+  However, for trusted user input, you can set this to <code>false</code> to
+  disable cleaning. In addition, you can supply your own concrete implementation
+  of Tidy's interface to use, although I don't know why you'd want to do that.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
index 078d08741..be0177d4e 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
@@ -1,74 +1,74 @@
-Filter.ExtractStyleBlocks
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
-EXTERNAL: CSSTidy
---DESCRIPTION--
-<p>
-  This directive turns on the style block extraction filter, which removes
-  <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
-  and places them in the <code>StyleBlocks</code> context variable, for further
-  use by you, usually to be placed in an external stylesheet, or a
-  <code>style</code> block in the <code>head</code> of your document.
-</p>
-<p>
-  Sample usage:
-</p>
-<pre><![CDATA[
-<?php
-    header('Content-type: text/html; charset=utf-8');
-    echo '<?xml version="1.0" encoding="UTF-8"?>';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-  <title>Filter.ExtractStyleBlocks</title>
-<?php
-    require_once '/path/to/library/HTMLPurifier.auto.php';
-    require_once '/path/to/csstidy.class.php';
-
-    $dirty = '<style>body {color:#F00;}</style> Some text';
-
-    $config = HTMLPurifier_Config::createDefault();
-    $config->set('Filter', 'ExtractStyleBlocks', true);
-    $purifier = new HTMLPurifier($config);
-
-    $html = $purifier->purify($dirty);
-
-    // This implementation writes the stylesheets to the styles/ directory.
-    // You can also echo the styles inside the document, but it's a bit
-    // more difficult to make sure they get interpreted properly by
-    // browsers; try the usual CSS armoring techniques.
-    $styles = $purifier->context->get('StyleBlocks');
-    $dir = 'styles/';
-    if (!is_dir($dir)) mkdir($dir);
-    $hash = sha1($_GET['html']);
-    foreach ($styles as $i => $style) {
-        file_put_contents($name = $dir . $hash . "_$i");
-        echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
-    }
-?>
-</head>
-<body>
-  <div>
-    <?php echo $html; ?>
-  </div>
-</b]]><![CDATA[ody>
-</html>
-]]></pre>
-<p>
-  <strong>Warning:</strong> It is possible for a user to mount an
-  imagecrash attack using this CSS. Counter-measures are difficult;
-  it is not simply enough to limit the range of CSS lengths (using
-  relative lengths with many nesting levels allows for large values
-  to be attained without actually specifying them in the stylesheet),
-  and the flexible nature of selectors makes it difficult to selectively
-  disable lengths on image tags (HTML Purifier, however, does disable
-  CSS width and height in inline styling). There are probably two effective
-  counter measures: an explicit width and height set to auto in all
-  images in your document (unlikely) or the disabling of width and
-  height (somewhat reasonable). Whether or not these measures should be
-  used is left to the reader.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+EXTERNAL: CSSTidy
+--DESCRIPTION--
+<p>
+  This directive turns on the style block extraction filter, which removes
+  <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
+  and places them in the <code>StyleBlocks</code> context variable, for further
+  use by you, usually to be placed in an external stylesheet, or a
+  <code>style</code> block in the <code>head</code> of your document.
+</p>
+<p>
+  Sample usage:
+</p>
+<pre><![CDATA[
+<?php
+    header('Content-type: text/html; charset=utf-8');
+    echo '<?xml version="1.0" encoding="UTF-8"?>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+  <title>Filter.ExtractStyleBlocks</title>
+<?php
+    require_once '/path/to/library/HTMLPurifier.auto.php';
+    require_once '/path/to/csstidy.class.php';
+
+    $dirty = '<style>body {color:#F00;}</style> Some text';
+
+    $config = HTMLPurifier_Config::createDefault();
+    $config->set('Filter', 'ExtractStyleBlocks', true);
+    $purifier = new HTMLPurifier($config);
+
+    $html = $purifier->purify($dirty);
+
+    // This implementation writes the stylesheets to the styles/ directory.
+    // You can also echo the styles inside the document, but it's a bit
+    // more difficult to make sure they get interpreted properly by
+    // browsers; try the usual CSS armoring techniques.
+    $styles = $purifier->context->get('StyleBlocks');
+    $dir = 'styles/';
+    if (!is_dir($dir)) mkdir($dir);
+    $hash = sha1($_GET['html']);
+    foreach ($styles as $i => $style) {
+        file_put_contents($name = $dir . $hash . "_$i");
+        echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
+    }
+?>
+</head>
+<body>
+  <div>
+    <?php echo $html; ?>
+  </div>
+</b]]><![CDATA[ody>
+</html>
+]]></pre>
+<p>
+  <strong>Warning:</strong> It is possible for a user to mount an
+  imagecrash attack using this CSS. Counter-measures are difficult;
+  it is not simply enough to limit the range of CSS lengths (using
+  relative lengths with many nesting levels allows for large values
+  to be attained without actually specifying them in the stylesheet),
+  and the flexible nature of selectors makes it difficult to selectively
+  disable lengths on image tags (HTML Purifier, however, does disable
+  CSS width and height in inline styling). There are probably two effective
+  counter measures: an explicit width and height set to auto in all
+  images in your document (unlikely) or the disabling of width and
+  height (somewhat reasonable). Whether or not these measures should be
+  used is left to the reader.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
index 321eaa2d8..882218668 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
@@ -1,16 +1,16 @@
-Filter.YouTube
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
-  %Output.FlashCompat (turn both on to allow YouTube videos and other
-  Flash content).
-</p>
-<p>
-  This directive enables YouTube video embedding in HTML Purifier. Check
-  <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
-  on embedding videos</a> for more information on what this filter does.
-</p>
---# vim: et sw=4 sts=4
+Filter.YouTube
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
+  %Output.FlashCompat (turn both on to allow YouTube videos and other
+  Flash content).
+</p>
+<p>
+  This directive enables YouTube video embedding in HTML Purifier. Check
+  <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
+  on embedding videos</a> for more information on what this filter does.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
index 0b2c106da..afd48a0d4 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
@@ -1,25 +1,25 @@
-HTML.Allowed
-TYPE: itext/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    This is a preferred convenience directive that combines
-    %HTML.AllowedElements and %HTML.AllowedAttributes.
-    Specify elements and attributes that are allowed using:
-    <code>element1[attr1|attr2],element2...</code>.  For example,
-    if you would like to only allow paragraphs and links, specify
-    <code>a[href],p</code>.  You can specify attributes that apply
-    to all elements using an asterisk, e.g. <code>*[lang]</code>.
-    You can also use newlines instead of commas to separate elements.
-</p>
-<p>
-    <strong>Warning</strong>:
-    All of the constraints on the component directives are still enforced.
-    The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
-    whitelist: directly copy-pasting it here will probably result in
-    broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
-    are set, this directive has no effect.
-</p>
---# vim: et sw=4 sts=4
+HTML.Allowed
+TYPE: itext/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    This is a preferred convenience directive that combines
+    %HTML.AllowedElements and %HTML.AllowedAttributes.
+    Specify elements and attributes that are allowed using:
+    <code>element1[attr1|attr2],element2...</code>.  For example,
+    if you would like to only allow paragraphs and links, specify
+    <code>a[href],p</code>.  You can specify attributes that apply
+    to all elements using an asterisk, e.g. <code>*[lang]</code>.
+    You can also use newlines instead of commas to separate elements.
+</p>
+<p>
+    <strong>Warning</strong>:
+    All of the constraints on the component directives are still enforced.
+    The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
+    whitelist: directly copy-pasting it here will probably result in
+    broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
+    are set, this directive has no effect.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
index fcf093f17..0e6ec54f3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
@@ -1,19 +1,19 @@
-HTML.AllowedAttributes
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    If HTML Purifier's attribute set is unsatisfactory, overload it!
-    The syntax is "tag.attr" or "*.attr" for the global attributes
-    (style, id, class, dir, lang, xml:lang).
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override. For
-    example, %HTML.EnableAttrID will take precedence over *.id in this
-    directive.  You must set that directive to true before you can use
-    IDs at all.
-</p>
---# vim: et sw=4 sts=4
+HTML.AllowedAttributes
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    If HTML Purifier's attribute set is unsatisfactory, overload it!
+    The syntax is "tag.attr" or "*.attr" for the global attributes
+    (style, id, class, dir, lang, xml:lang).
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override. For
+    example, %HTML.EnableAttrID will take precedence over *.id in this
+    directive.  You must set that directive to true before you can use
+    IDs at all.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
index 140e21423..8440bc39d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
@@ -1,10 +1,10 @@
-HTML.AllowedComments
-TYPE: lookup
-VERSION: 4.4.0
-DEFAULT: array()
---DESCRIPTION--
-A whitelist which indicates what explicit comment bodies should be
-allowed, modulo leading and trailing whitespace.  See also %HTML.AllowedCommentsRegexp
-(these directives are union'ed together, so a comment is considered
-valid if any directive deems it valid.)
---# vim: et sw=4 sts=4
+HTML.AllowedComments
+TYPE: lookup
+VERSION: 4.4.0
+DEFAULT: array()
+--DESCRIPTION--
+A whitelist which indicates what explicit comment bodies should be
+allowed, modulo leading and trailing whitespace.  See also %HTML.AllowedCommentsRegexp
+(these directives are union'ed together, so a comment is considered
+valid if any directive deems it valid.)
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
index f22e977d4..b1e65beb1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
@@ -1,15 +1,15 @@
-HTML.AllowedCommentsRegexp
-TYPE: string/null
-VERSION: 4.4.0
-DEFAULT: NULL
---DESCRIPTION--
-A regexp, which if it matches the body of a comment, indicates that
-it should be allowed. Trailing and leading spaces are removed prior
-to running this regular expression.
-<strong>Warning:</strong> Make sure you specify
-correct anchor metacharacters <code>^regex$</code>, otherwise you may accept
-comments that you did not mean to! In particular, the regex <code>/foo|bar/</code>
-is probably not sufficiently strict, since it also allows <code>foobar</code>.
-See also %HTML.AllowedComments (these directives are union'ed together,
-so a comment is considered valid if any directive deems it valid.)
---# vim: et sw=4 sts=4
+HTML.AllowedCommentsRegexp
+TYPE: string/null
+VERSION: 4.4.0
+DEFAULT: NULL
+--DESCRIPTION--
+A regexp, which if it matches the body of a comment, indicates that
+it should be allowed. Trailing and leading spaces are removed prior
+to running this regular expression.
+<strong>Warning:</strong> Make sure you specify
+correct anchor metacharacters <code>^regex$</code>, otherwise you may accept
+comments that you did not mean to! In particular, the regex <code>/foo|bar/</code>
+is probably not sufficiently strict, since it also allows <code>foobar</code>.
+See also %HTML.AllowedComments (these directives are union'ed together,
+so a comment is considered valid if any directive deems it valid.)
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
index 1d3fa7907..ca3c13ddb 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
@@ -1,23 +1,23 @@
-HTML.AllowedElements
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    If HTML Purifier's tag set is unsatisfactory for your needs, you can
-    overload it with your own list of tags to allow.  If you change
-    this, you probably also want to change %HTML.AllowedAttributes; see
-    also %HTML.Allowed which lets you set allowed elements and
-    attributes at the same time.
-</p>
-<p>
-    If you attempt to allow an element that HTML Purifier does not know
-    about, HTML Purifier will raise an error.  You will need to manually
-    tell HTML Purifier about this element by using the
-    <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
+HTML.AllowedElements
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    If HTML Purifier's tag set is unsatisfactory for your needs, you can
+    overload it with your own list of tags to allow.  If you change
+    this, you probably also want to change %HTML.AllowedAttributes; see
+    also %HTML.Allowed which lets you set allowed elements and
+    attributes at the same time.
+</p>
+<p>
+    If you attempt to allow an element that HTML Purifier does not know
+    about, HTML Purifier will raise an error.  You will need to manually
+    tell HTML Purifier about this element by using the
+    <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
index 5a59a55c0..e373791a5 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
@@ -1,20 +1,20 @@
-HTML.AllowedModules
-TYPE: lookup/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    A doctype comes with a set of usual modules to use. Without having
-    to mucking about with the doctypes, you can quickly activate or
-    disable these modules by specifying which modules you wish to allow
-    with this directive. This is most useful for unit testing specific
-    modules, although end users may find it useful for their own ends.
-</p>
-<p>
-    If you specify a module that does not exist, the manager will silently
-    fail to use it, so be careful! User-defined modules are not affected
-    by this directive. Modules defined in %HTML.CoreModules are not
-    affected by this directive.
-</p>
---# vim: et sw=4 sts=4
+HTML.AllowedModules
+TYPE: lookup/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    A doctype comes with a set of usual modules to use. Without having
+    to mucking about with the doctypes, you can quickly activate or
+    disable these modules by specifying which modules you wish to allow
+    with this directive. This is most useful for unit testing specific
+    modules, although end users may find it useful for their own ends.
+</p>
+<p>
+    If you specify a module that does not exist, the manager will silently
+    fail to use it, so be careful! User-defined modules are not affected
+    by this directive. Modules defined in %HTML.CoreModules are not
+    affected by this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
index 151fb7b82..75d680ee1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
@@ -1,11 +1,11 @@
-HTML.Attr.Name.UseCDATA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.0.0
---DESCRIPTION--
-The W3C specification DTD defines the name attribute to be CDATA, not ID, due
-to limitations of DTD.  In certain documents, this relaxed behavior is desired,
-whether it is to specify duplicate names, or to specify names that would be
-illegal IDs (for example, names that begin with a digit.) Set this configuration
-directive to true to use the relaxed parsing rules.
---# vim: et sw=4 sts=4
+HTML.Attr.Name.UseCDATA
+TYPE: bool
+DEFAULT: false
+VERSION: 4.0.0
+--DESCRIPTION--
+The W3C specification DTD defines the name attribute to be CDATA, not ID, due
+to limitations of DTD.  In certain documents, this relaxed behavior is desired,
+whether it is to specify duplicate names, or to specify names that would be
+illegal IDs (for example, names that begin with a digit.) Set this configuration
+directive to true to use the relaxed parsing rules.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
index 45ae469ec..f32b802c6 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
@@ -1,18 +1,18 @@
-HTML.BlockWrapper
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'p'
---DESCRIPTION--
-
-<p>
-    String name of element to wrap inline elements that are inside a block
-    context.  This only occurs in the children of blockquote in strict mode.
-</p>
-<p>
-    Example: by default value,
-    <code>&lt;blockquote&gt;Foo&lt;/blockquote&gt;</code> would become
-    <code>&lt;blockquote&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/blockquote&gt;</code>.
-    The <code>&lt;p&gt;</code> tags can be replaced with whatever you desire,
-    as long as it is a block level element.
-</p>
---# vim: et sw=4 sts=4
+HTML.BlockWrapper
+TYPE: string
+VERSION: 1.3.0
+DEFAULT: 'p'
+--DESCRIPTION--
+
+<p>
+    String name of element to wrap inline elements that are inside a block
+    context.  This only occurs in the children of blockquote in strict mode.
+</p>
+<p>
+    Example: by default value,
+    <code>&lt;blockquote&gt;Foo&lt;/blockquote&gt;</code> would become
+    <code>&lt;blockquote&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/blockquote&gt;</code>.
+    The <code>&lt;p&gt;</code> tags can be replaced with whatever you desire,
+    as long as it is a block level element.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
index 524618879..fc8e40205 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
@@ -1,23 +1,23 @@
-HTML.CoreModules
-TYPE: lookup
-VERSION: 2.0.0
---DEFAULT--
-array (
-  'Structure' => true,
-  'Text' => true,
-  'Hypertext' => true,
-  'List' => true,
-  'NonXMLCommonAttributes' => true,
-  'XMLCommonAttributes' => true,
-  'CommonAttributes' => true,
-)
---DESCRIPTION--
-
-<p>
-    Certain modularized doctypes (XHTML, namely), have certain modules
-    that must be included for the doctype to be an conforming document
-    type: put those modules here. By default, XHTML's core modules
-    are used. You can set this to a blank array to disable core module
-    protection, but this is not recommended.
-</p>
---# vim: et sw=4 sts=4
+HTML.CoreModules
+TYPE: lookup
+VERSION: 2.0.0
+--DEFAULT--
+array (
+  'Structure' => true,
+  'Text' => true,
+  'Hypertext' => true,
+  'List' => true,
+  'NonXMLCommonAttributes' => true,
+  'XMLCommonAttributes' => true,
+  'CommonAttributes' => true,
+)
+--DESCRIPTION--
+
+<p>
+    Certain modularized doctypes (XHTML, namely), have certain modules
+    that must be included for the doctype to be an conforming document
+    type: put those modules here. By default, XHTML's core modules
+    are used. You can set this to a blank array to disable core module
+    protection, but this is not recommended.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
index 6ed70b599..187c0a0d5 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
@@ -1,9 +1,9 @@
-HTML.CustomDoctype
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-A custom doctype for power-users who defined their own document
-type. This directive only applies when %HTML.Doctype is blank.
---# vim: et sw=4 sts=4
+HTML.CustomDoctype
+TYPE: string/null
+VERSION: 2.0.1
+DEFAULT: NULL
+--DESCRIPTION--
+
+A custom doctype for power-users who defined their own document
+type. This directive only applies when %HTML.Doctype is blank.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
index 103db754a..f5433e3f1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
@@ -1,33 +1,33 @@
-HTML.DefinitionID
-TYPE: string/null
-DEFAULT: NULL
-VERSION: 2.0.0
---DESCRIPTION--
-
-<p>
-    Unique identifier for a custom-built HTML definition. If you edit
-    the raw version of the HTMLDefinition, introducing changes that the
-    configuration object does not reflect, you must specify this variable.
-    If you change your custom edits, you should change this directive, or
-    clear your cache. Example:
-</p>
-<pre>
-$config = HTMLPurifier_Config::createDefault();
-$config->set('HTML', 'DefinitionID', '1');
-$def = $config->getHTMLDefinition();
-$def->addAttribute('a', 'tabindex', 'Number');
-</pre>
-<p>
-    In the above example, the configuration is still at the defaults, but
-    using the advanced API, an extra attribute has been added. The
-    configuration object normally has no way of knowing that this change
-    has taken place, so it needs an extra directive: %HTML.DefinitionID.
-    If someone else attempts to use the default configuration, these two
-    pieces of code will not clobber each other in the cache, since one has
-    an extra directive attached to it.
-</p>
-<p>
-    You <em>must</em> specify a value to this directive to use the
-    advanced API features.
-</p>
---# vim: et sw=4 sts=4
+HTML.DefinitionID
+TYPE: string/null
+DEFAULT: NULL
+VERSION: 2.0.0
+--DESCRIPTION--
+
+<p>
+    Unique identifier for a custom-built HTML definition. If you edit
+    the raw version of the HTMLDefinition, introducing changes that the
+    configuration object does not reflect, you must specify this variable.
+    If you change your custom edits, you should change this directive, or
+    clear your cache. Example:
+</p>
+<pre>
+$config = HTMLPurifier_Config::createDefault();
+$config->set('HTML', 'DefinitionID', '1');
+$def = $config->getHTMLDefinition();
+$def->addAttribute('a', 'tabindex', 'Number');
+</pre>
+<p>
+    In the above example, the configuration is still at the defaults, but
+    using the advanced API, an extra attribute has been added. The
+    configuration object normally has no way of knowing that this change
+    has taken place, so it needs an extra directive: %HTML.DefinitionID.
+    If someone else attempts to use the default configuration, these two
+    pieces of code will not clobber each other in the cache, since one has
+    an extra directive attached to it.
+</p>
+<p>
+    You <em>must</em> specify a value to this directive to use the
+    advanced API features.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
index 229ae0267..0bb5a718d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
@@ -1,16 +1,16 @@
-HTML.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition specified in
-    %HTML.DefinitionID.  This serves the same purpose: uniquely identifying
-    your custom definition, but this one does so in a chronological
-    context: revision 3 is more up-to-date then revision 2.  Thus, when
-    this gets incremented, the cache handling is smart enough to clean
-    up any older revisions of your definition as well as flush the
-    cache.
-</p>
---# vim: et sw=4 sts=4
+HTML.DefinitionRev
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+    Revision identifier for your custom definition specified in
+    %HTML.DefinitionID.  This serves the same purpose: uniquely identifying
+    your custom definition, but this one does so in a chronological
+    context: revision 3 is more up-to-date then revision 2.  Thus, when
+    this gets incremented, the cache handling is smart enough to clean
+    up any older revisions of your definition as well as flush the
+    cache.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
index 9dab497f2..a6969b995 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
@@ -1,11 +1,11 @@
-HTML.Doctype
-TYPE: string/null
-DEFAULT: NULL
---DESCRIPTION--
-Doctype to use during filtering. Technically speaking this is not actually
-a doctype (as it does not identify a corresponding DTD), but we are using
-this name for sake of simplicity. When non-blank, this will override any
-older directives like %HTML.XHTML or %HTML.Strict.
---ALLOWED--
-'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
---# vim: et sw=4 sts=4
+HTML.Doctype
+TYPE: string/null
+DEFAULT: NULL
+--DESCRIPTION--
+Doctype to use during filtering. Technically speaking this is not actually
+a doctype (as it does not identify a corresponding DTD), but we are using
+this name for sake of simplicity. When non-blank, this will override any
+older directives like %HTML.XHTML or %HTML.Strict.
+--ALLOWED--
+'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
index 7878dc0bf..08d641f95 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
@@ -1,11 +1,11 @@
-HTML.FlashAllowFullScreen
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit embedded Flash content from
-    %HTML.SafeObject to expand to the full screen.  Corresponds to
-    the <code>allowFullScreen</code> parameter.
-</p>
---# vim: et sw=4 sts=4
+HTML.FlashAllowFullScreen
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit embedded Flash content from
+    %HTML.SafeObject to expand to the full screen.  Corresponds to
+    the <code>allowFullScreen</code> parameter.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
index 57358f9ba..2b8df97cb 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
@@ -1,21 +1,21 @@
-HTML.ForbiddenAttributes
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    While this directive is similar to %HTML.AllowedAttributes, for
-    forwards-compatibility with XML, this attribute has a different syntax. Instead of
-    <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
-    attributes in <code>a</code> tags, set this directive to
-    <code>a@href</code>. You can also disallow an attribute globally with
-    <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
-    is provided for consistency with %HTML.AllowedAttributes).
-</p>
-<p>
-    <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
-    accordingly, check
-    out that directive for a discussion of why you
-    should think twice before using this directive.
-</p>
---# vim: et sw=4 sts=4
+HTML.ForbiddenAttributes
+TYPE: lookup
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    While this directive is similar to %HTML.AllowedAttributes, for
+    forwards-compatibility with XML, this attribute has a different syntax. Instead of
+    <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
+    attributes in <code>a</code> tags, set this directive to
+    <code>a@href</code>. You can also disallow an attribute globally with
+    <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
+    is provided for consistency with %HTML.AllowedAttributes).
+</p>
+<p>
+    <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
+    accordingly, check
+    out that directive for a discussion of why you
+    should think twice before using this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
index 93a53e14f..40466c463 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
@@ -1,20 +1,20 @@
-HTML.ForbiddenElements
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    This was, perhaps, the most requested feature ever in HTML
-    Purifier. Please don't abuse it! This is the logical inverse of
-    %HTML.AllowedElements, and it will override that directive, or any
-    other directive.
-</p>
-<p>
-    If possible, %HTML.Allowed is recommended over this directive, because it
-    can sometimes be difficult to tell whether or not you've forbidden all of
-    the behavior you would like to disallow. If you forbid <code>img</code>
-    with the expectation of preventing images on your site, you'll be in for
-    a nasty surprise when people start using the <code>background-image</code>
-    CSS property.
-</p>
---# vim: et sw=4 sts=4
+HTML.ForbiddenElements
+TYPE: lookup
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    This was, perhaps, the most requested feature ever in HTML
+    Purifier. Please don't abuse it! This is the logical inverse of
+    %HTML.AllowedElements, and it will override that directive, or any
+    other directive.
+</p>
+<p>
+    If possible, %HTML.Allowed is recommended over this directive, because it
+    can sometimes be difficult to tell whether or not you've forbidden all of
+    the behavior you would like to disallow. If you forbid <code>img</code>
+    with the expectation of preventing images on your site, you'll be in for
+    a nasty surprise when people start using the <code>background-image</code>
+    CSS property.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt
new file mode 100644
index 000000000..4a432d89b
--- /dev/null
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt
@@ -0,0 +1,11 @@
+HTML.Forms
+TYPE: bool
+VERSION: 4.13.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit form elements in the user input, regardless of
+    %HTML.Trusted value. Please be very careful when using this functionality, as
+    enabling forms in untrusted documents may allow for phishing attacks.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
index e424c386e..319747954 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
@@ -1,14 +1,14 @@
-HTML.MaxImgLength
-TYPE: int/null
-DEFAULT: 1200
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This directive controls the maximum number of pixels in the width and
- height attributes in <code>img</code> tags. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %CSS.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the HTML max is an integer).
-</p>
---# vim: et sw=4 sts=4
+HTML.MaxImgLength
+TYPE: int/null
+DEFAULT: 1200
+VERSION: 3.1.1
+--DESCRIPTION--
+<p>
+ This directive controls the maximum number of pixels in the width and
+ height attributes in <code>img</code> tags. This is
+ in place to prevent imagecrash attacks, disable with null at your own risk.
+ This directive is similar to %CSS.MaxImgLength, and both should be
+ concurrently edited, although there are
+ subtle differences in the input format (the HTML max is an integer).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
index 700b30924..7aa356353 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
@@ -1,7 +1,7 @@
-HTML.Nofollow
-TYPE: bool
-VERSION: 4.3.0
-DEFAULT: FALSE
---DESCRIPTION--
-If enabled, nofollow rel attributes are added to all outgoing links.
---# vim: et sw=4 sts=4
+HTML.Nofollow
+TYPE: bool
+VERSION: 4.3.0
+DEFAULT: FALSE
+--DESCRIPTION--
+If enabled, nofollow rel attributes are added to all outgoing links.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
index 62e8e160c..2d2fbd117 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
@@ -1,12 +1,12 @@
-HTML.Parent
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'div'
---DESCRIPTION--
-
-<p>
-    String name of element that HTML fragment passed to library will be
-    inserted in.  An interesting variation would be using span as the
-    parent element, meaning that only inline tags would be allowed.
-</p>
---# vim: et sw=4 sts=4
+HTML.Parent
+TYPE: string
+VERSION: 1.3.0
+DEFAULT: 'div'
+--DESCRIPTION--
+
+<p>
+    String name of element that HTML fragment passed to library will be
+    inserted in.  An interesting variation would be using span as the
+    parent element, meaning that only inline tags would be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
index dfb720496..b3c45e190 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
@@ -1,12 +1,12 @@
-HTML.Proprietary
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to allow proprietary elements and attributes in your
-    documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
-    <strong>Warning:</strong> This can cause your documents to stop
-    validating!
-</p>
---# vim: et sw=4 sts=4
+HTML.Proprietary
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to allow proprietary elements and attributes in your
+    documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
+    <strong>Warning:</strong> This can cause your documents to stop
+    validating!
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
index cdda09a4c..556fa674f 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
@@ -1,13 +1,13 @@
-HTML.SafeEmbed
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit embed tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to embed tags. Embed is a proprietary
-    element and will cause your website to stop validating; you should
-    see if you can use %Output.FlashCompat with %HTML.SafeObject instead
-    first.</p>
---# vim: et sw=4 sts=4
+HTML.SafeEmbed
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit embed tags in documents, with a number of extra
+    security features added to prevent script execution. This is similar to
+    what websites like MySpace do to embed tags. Embed is a proprietary
+    element and will cause your website to stop validating; you should
+    see if you can use %Output.FlashCompat with %HTML.SafeObject instead
+    first.</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
index 5eb6ec2b5..295a8cf66 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
@@ -1,13 +1,13 @@
-HTML.SafeIframe
-TYPE: bool
-VERSION: 4.4.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit iframe tags in untrusted documents.  This
-    directive must be accompanied by a whitelist of permitted iframes,
-    such as %URI.SafeIframeRegexp, otherwise it will fatally error.
-    This directive has no effect on strict doctypes, as iframes are not
-    valid.
-</p>
---# vim: et sw=4 sts=4
+HTML.SafeIframe
+TYPE: bool
+VERSION: 4.4.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit iframe tags in untrusted documents.  This
+    directive must be accompanied by a whitelist of permitted iframes,
+    such as %URI.SafeIframeRegexp, otherwise it will fatally error.
+    This directive has no effect on strict doctypes, as iframes are not
+    valid.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
index ceb342e22..07f6e536e 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
@@ -1,13 +1,13 @@
-HTML.SafeObject
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit object tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to object tags.  You should also enable
-    %Output.FlashCompat in order to generate Internet Explorer
-    compatibility code for your object tags.
-</p>
---# vim: et sw=4 sts=4
+HTML.SafeObject
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit object tags in documents, with a number of extra
+    security features added to prevent script execution. This is similar to
+    what websites like MySpace do to object tags.  You should also enable
+    %Output.FlashCompat in order to generate Internet Explorer
+    compatibility code for your object tags.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
index 5ebc7a19d..641b4a8d6 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
@@ -1,10 +1,10 @@
-HTML.SafeScripting
-TYPE: lookup
-VERSION: 4.5.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    Whether or not to permit script tags to external scripts in documents.
-    Inline scripting is not allowed, and the script must match an explicit whitelist.
-</p>
---# vim: et sw=4 sts=4
+HTML.SafeScripting
+TYPE: lookup
+VERSION: 4.5.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    Whether or not to permit script tags to external scripts in documents.
+    Inline scripting is not allowed, and the script must match an explicit whitelist.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
index a8b1de56b..d99663a5e 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
@@ -1,9 +1,9 @@
-HTML.Strict
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not to use Transitional (loose) or Strict rulesets.
---# vim: et sw=4 sts=4
+HTML.Strict
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
+--DESCRIPTION--
+Determines whether or not to use Transitional (loose) or Strict rulesets.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
index 587a16778..d65f0d041 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
@@ -1,8 +1,8 @@
-HTML.TargetBlank
-TYPE: bool
-VERSION: 4.4.0
-DEFAULT: FALSE
---DESCRIPTION--
-If enabled, <code>target=blank</code> attributes are added to all outgoing links.
-(This includes links from an HTTPS version of a page to an HTTP version.)
---# vim: et sw=4 sts=4
+HTML.TargetBlank
+TYPE: bool
+VERSION: 4.4.0
+DEFAULT: FALSE
+--DESCRIPTION--
+If enabled, <code>target=blank</code> attributes are added to all outgoing links.
+(This includes links from an HTTPS version of a page to an HTTP version.)
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
index dd514c0de..05cb3424f 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
@@ -1,10 +1,10 @@
---# vim: et sw=4 sts=4
-HTML.TargetNoopener
-TYPE: bool
-VERSION: 4.8.0
-DEFAULT: TRUE
---DESCRIPTION--
-If enabled, noopener rel attributes are added to links which have
-a target attribute associated with them.  This prevents malicious
-destinations from overwriting the original window.
---# vim: et sw=4 sts=4
+--# vim: et sw=4 sts=4
+HTML.TargetNoopener
+TYPE: bool
+VERSION: 4.8.0
+DEFAULT: TRUE
+--DESCRIPTION--
+If enabled, noopener rel attributes are added to links which have
+a target attribute associated with them.  This prevents malicious
+destinations from overwriting the original window.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
index cb5a0b0e5..993a81704 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
@@ -1,9 +1,9 @@
-HTML.TargetNoreferrer
-TYPE: bool
-VERSION: 4.8.0
-DEFAULT: TRUE
---DESCRIPTION--
-If enabled, noreferrer rel attributes are added to links which have
-a target attribute associated with them.  This prevents malicious
-destinations from overwriting the original window.
---# vim: et sw=4 sts=4
+HTML.TargetNoreferrer
+TYPE: bool
+VERSION: 4.8.0
+DEFAULT: TRUE
+--DESCRIPTION--
+If enabled, noreferrer rel attributes are added to links which have
+a target attribute associated with them.  This prevents malicious
+destinations from overwriting the original window.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
index b4c271b7f..602453f6e 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
@@ -1,8 +1,8 @@
-HTML.TidyAdd
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to add to the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
+HTML.TidyAdd
+TYPE: lookup
+VERSION: 2.0.0
+DEFAULT: array()
+--DESCRIPTION--
+
+Fixes to add to the default set of Tidy fixes as per your level.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
index 4186ccd0d..bf943e8f0 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
@@ -1,24 +1,24 @@
-HTML.TidyLevel
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'medium'
---DESCRIPTION--
-
-<p>General level of cleanliness the Tidy module should enforce.
-There are four allowed values:</p>
-<dl>
-    <dt>none</dt>
-    <dd>No extra tidying should be done</dd>
-    <dt>light</dt>
-    <dd>Only fix elements that would be discarded otherwise due to
-    lack of support in doctype</dd>
-    <dt>medium</dt>
-    <dd>Enforce best practices</dd>
-    <dt>heavy</dt>
-    <dd>Transform all deprecated elements and attributes to standards
-    compliant equivalents</dd>
-</dl>
-
---ALLOWED--
-'none', 'light', 'medium', 'heavy'
---# vim: et sw=4 sts=4
+HTML.TidyLevel
+TYPE: string
+VERSION: 2.0.0
+DEFAULT: 'medium'
+--DESCRIPTION--
+
+<p>General level of cleanliness the Tidy module should enforce.
+There are four allowed values:</p>
+<dl>
+    <dt>none</dt>
+    <dd>No extra tidying should be done</dd>
+    <dt>light</dt>
+    <dd>Only fix elements that would be discarded otherwise due to
+    lack of support in doctype</dd>
+    <dt>medium</dt>
+    <dd>Enforce best practices</dd>
+    <dt>heavy</dt>
+    <dd>Transform all deprecated elements and attributes to standards
+    compliant equivalents</dd>
+</dl>
+
+--ALLOWED--
+'none', 'light', 'medium', 'heavy'
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
index 996762bd1..92cca2a43 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
@@ -1,8 +1,8 @@
-HTML.TidyRemove
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to remove from the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
+HTML.TidyRemove
+TYPE: lookup
+VERSION: 2.0.0
+DEFAULT: array()
+--DESCRIPTION--
+
+Fixes to remove from the default set of Tidy fixes as per your level.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
index 1db9237e9..bc8e65499 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
@@ -1,9 +1,9 @@
-HTML.Trusted
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user input is trusted or not. If the input is
-trusted, a more expansive set of allowed tags and attributes will be used.
-See also %CSS.Trusted.
---# vim: et sw=4 sts=4
+HTML.Trusted
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: false
+--DESCRIPTION--
+Indicates whether or not the user input is trusted or not. If the input is
+trusted, a more expansive set of allowed tags and attributes will be used.
+See also %CSS.Trusted.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
index 2a47e384f..a3c2f42c3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
@@ -1,11 +1,11 @@
-HTML.XHTML
-TYPE: bool
-DEFAULT: true
-VERSION: 1.1.0
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
---ALIASES--
-Core.XHTML
---# vim: et sw=4 sts=4
+HTML.XHTML
+TYPE: bool
+DEFAULT: true
+VERSION: 1.1.0
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
+--DESCRIPTION--
+Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
+--ALIASES--
+Core.XHTML
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
index 08921fde7..2a1370470 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
@@ -1,10 +1,10 @@
-Output.CommentScriptContents
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: true
---DESCRIPTION--
-Determines whether or not HTML Purifier should attempt to fix up the
-contents of script tags for legacy browsers with comments.
---ALIASES--
-Core.CommentScriptContents
---# vim: et sw=4 sts=4
+Output.CommentScriptContents
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: true
+--DESCRIPTION--
+Determines whether or not HTML Purifier should attempt to fix up the
+contents of script tags for legacy browsers with comments.
+--ALIASES--
+Core.CommentScriptContents
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
index d6f0d9f29..d215ba2d3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
@@ -1,15 +1,15 @@
-Output.FixInnerHTML
-TYPE: bool
-VERSION: 4.3.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will protect against Internet Explorer's
-  mishandling of the <code>innerHTML</code> attribute by appending
-  a space to any attribute that does not contain angled brackets, spaces
-  or quotes, but contains a backtick.  This slightly changes the
-  semantics of any given attribute, so if this is unacceptable and
-  you do not use <code>innerHTML</code> on any of your pages, you can
-  turn this directive off.
-</p>
---# vim: et sw=4 sts=4
+Output.FixInnerHTML
+TYPE: bool
+VERSION: 4.3.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+  If true, HTML Purifier will protect against Internet Explorer's
+  mishandling of the <code>innerHTML</code> attribute by appending
+  a space to any attribute that does not contain angled brackets, spaces
+  or quotes, but contains a backtick.  This slightly changes the
+  semantics of any given attribute, so if this is unacceptable and
+  you do not use <code>innerHTML</code> on any of your pages, you can
+  turn this directive off.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
index 93398e859..e58f91aa8 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
@@ -1,11 +1,11 @@
-Output.FlashCompat
-TYPE: bool
-VERSION: 4.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will generate Internet Explorer compatibility
-  code for all object code.  This is highly recommended if you enable
-  %HTML.SafeObject.
-</p>
---# vim: et sw=4 sts=4
+Output.FlashCompat
+TYPE: bool
+VERSION: 4.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  If true, HTML Purifier will generate Internet Explorer compatibility
+  code for all object code.  This is highly recommended if you enable
+  %HTML.SafeObject.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
index 79f8ad82c..4bb902523 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
@@ -1,13 +1,13 @@
-Output.Newline
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Newline string to format final output with. If left null, HTML Purifier
-    will auto-detect the default newline type of the system and use that;
-    you can manually override it here. Remember, \r\n is Windows, \r
-    is Mac, and \n is Unix.
-</p>
---# vim: et sw=4 sts=4
+Output.Newline
+TYPE: string/null
+VERSION: 2.0.1
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Newline string to format final output with. If left null, HTML Purifier
+    will auto-detect the default newline type of the system and use that;
+    you can manually override it here. Remember, \r\n is Windows, \r
+    is Mac, and \n is Unix.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
index 232b02362..322310651 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
@@ -1,14 +1,14 @@
-Output.SortAttr
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will sort attributes by name before writing them back
-  to the document, converting a tag like: <code>&lt;el b="" a="" c="" /&gt;</code>
-  to <code>&lt;el a="" b="" c="" /&gt;</code>. This is a workaround for
-  a bug in FCKeditor which causes it to swap attributes order, adding noise
-  to text diffs. If you're not seeing this bug, chances are, you don't need
-  this directive.
-</p>
---# vim: et sw=4 sts=4
+Output.SortAttr
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  If true, HTML Purifier will sort attributes by name before writing them back
+  to the document, converting a tag like: <code>&lt;el b="" a="" c="" /&gt;</code>
+  to <code>&lt;el a="" b="" c="" /&gt;</code>. This is a workaround for
+  a bug in FCKeditor which causes it to swap attributes order, adding noise
+  to text diffs. If you're not seeing this bug, chances are, you don't need
+  this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
index 06bab00a0..23dd4d3d5 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
@@ -1,25 +1,25 @@
-Output.TidyFormat
-TYPE: bool
-VERSION: 1.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Determines whether or not to run Tidy on the final output for pretty
-    formatting reasons, such as indentation and wrap.
-</p>
-<p>
-    This can greatly improve readability for editors who are hand-editing
-    the HTML, but is by no means necessary as HTML Purifier has already
-    fixed all major errors the HTML may have had. Tidy is a non-default
-    extension, and this directive will silently fail if Tidy is not
-    available.
-</p>
-<p>
-    If you are looking to make the overall look of your page's source
-    better, I recommend running Tidy on the entire page rather than just
-    user-content (after all, the indentation relative to the containing
-    blocks will be incorrect).
-</p>
---ALIASES--
-Core.TidyFormat
---# vim: et sw=4 sts=4
+Output.TidyFormat
+TYPE: bool
+VERSION: 1.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Determines whether or not to run Tidy on the final output for pretty
+    formatting reasons, such as indentation and wrap.
+</p>
+<p>
+    This can greatly improve readability for editors who are hand-editing
+    the HTML, but is by no means necessary as HTML Purifier has already
+    fixed all major errors the HTML may have had. Tidy is a non-default
+    extension, and this directive will silently fail if Tidy is not
+    available.
+</p>
+<p>
+    If you are looking to make the overall look of your page's source
+    better, I recommend running Tidy on the entire page rather than just
+    user-content (after all, the indentation relative to the containing
+    blocks will be incorrect).
+</p>
+--ALIASES--
+Core.TidyFormat
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
index 071bc0295..d1820cdbd 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
@@ -1,7 +1,7 @@
-Test.ForceNoIconv
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
-and use only pure PHP implementations.
---# vim: et sw=4 sts=4
+Test.ForceNoIconv
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
+and use only pure PHP implementations.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
index eb97307e2..0b0533a77 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
@@ -1,18 +1,18 @@
-URI.AllowedSchemes
-TYPE: lookup
---DEFAULT--
-array (
-  'http' => true,
-  'https' => true,
-  'mailto' => true,
-  'ftp' => true,
-  'nntp' => true,
-  'news' => true,
-  'tel' => true,
-)
---DESCRIPTION--
-Whitelist that defines the schemes that a URI is allowed to have.  This
-prevents XSS attacks from using pseudo-schemes like javascript or mocha.
-There is also support for the <code>data</code> and <code>file</code>
-URI schemes, but they are not enabled by default.
---# vim: et sw=4 sts=4
+URI.AllowedSchemes
+TYPE: lookup
+--DEFAULT--
+array (
+  'http' => true,
+  'https' => true,
+  'mailto' => true,
+  'ftp' => true,
+  'nntp' => true,
+  'news' => true,
+  'tel' => true,
+)
+--DESCRIPTION--
+Whitelist that defines the schemes that a URI is allowed to have.  This
+prevents XSS attacks from using pseudo-schemes like javascript or mocha.
+There is also support for the <code>data</code> and <code>file</code>
+URI schemes, but they are not enabled by default.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
index 876f0680c..ba4730808 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
@@ -1,17 +1,17 @@
-URI.Base
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    The base URI is the URI of the document this purified HTML will be
-    inserted into.  This information is important if HTML Purifier needs
-    to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
-    is on.  You may use a non-absolute URI for this value, but behavior
-    may vary (%URI.MakeAbsolute deals nicely with both absolute and
-    relative paths, but forwards-compatibility is not guaranteed).
-    <strong>Warning:</strong> If set, the scheme on this URI
-    overrides the one specified by %URI.DefaultScheme.
-</p>
---# vim: et sw=4 sts=4
+URI.Base
+TYPE: string/null
+VERSION: 2.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    The base URI is the URI of the document this purified HTML will be
+    inserted into.  This information is important if HTML Purifier needs
+    to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
+    is on.  You may use a non-absolute URI for this value, but behavior
+    may vary (%URI.MakeAbsolute deals nicely with both absolute and
+    relative paths, but forwards-compatibility is not guaranteed).
+    <strong>Warning:</strong> If set, the scheme on this URI
+    overrides the one specified by %URI.DefaultScheme.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
index 834bc08c0..981e44325 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
@@ -1,15 +1,15 @@
-URI.DefaultScheme
-TYPE: string/null
-DEFAULT: 'http'
---DESCRIPTION--
-
-<p>
-    Defines through what scheme the output will be served, in order to
-    select the proper object validator when no scheme information is present.
-</p>
-
-<p>
-    Starting with HTML Purifier 4.9.0, the default scheme can be null, in
-    which case we reject all URIs which do not have explicit schemes.
-</p>
---# vim: et sw=4 sts=4
+URI.DefaultScheme
+TYPE: string/null
+DEFAULT: 'http'
+--DESCRIPTION--
+
+<p>
+    Defines through what scheme the output will be served, in order to
+    select the proper object validator when no scheme information is present.
+</p>
+
+<p>
+    Starting with HTML Purifier 4.9.0, the default scheme can be null, in
+    which case we reject all URIs which do not have explicit schemes.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
index f05312ba8..523204c08 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
@@ -1,11 +1,11 @@
-URI.DefinitionID
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Unique identifier for a custom-built URI definition. If you  want
-    to add custom URIFilters, you must specify this value.
-</p>
---# vim: et sw=4 sts=4
+URI.DefinitionID
+TYPE: string/null
+VERSION: 2.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Unique identifier for a custom-built URI definition. If you  want
+    to add custom URIFilters, you must specify this value.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
index 80cfea93f..a9c07b1a3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
@@ -1,11 +1,11 @@
-URI.DefinitionRev
-TYPE: int
-VERSION: 2.1.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition. See
-    %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
+URI.DefinitionRev
+TYPE: int
+VERSION: 2.1.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+    Revision identifier for your custom definition. See
+    %HTML.DefinitionRev for details.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
index 71ce025a2..b19ca1d5b 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
@@ -1,14 +1,14 @@
-URI.Disable
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Disables all URIs in all forms. Not sure why you'd want to do that
-    (after all, the Internet's founded on the notion of a hyperlink).
-</p>
-
---ALIASES--
-Attr.DisableURI
---# vim: et sw=4 sts=4
+URI.Disable
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Disables all URIs in all forms. Not sure why you'd want to do that
+    (after all, the Internet's founded on the notion of a hyperlink).
+</p>
+
+--ALIASES--
+Attr.DisableURI
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
index 13c122c8c..9132ea4f5 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
@@ -1,11 +1,11 @@
-URI.DisableExternal
-TYPE: bool
-VERSION: 1.2.0
-DEFAULT: false
---DESCRIPTION--
-Disables links to external websites.  This is a highly effective anti-spam
-and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
-images outside of your domain will be allowed.  Non-linkified URIs will
-still be preserved.  If you want to be able to link to subdomains or use
-absolute URIs, specify %URI.Host for your website.
---# vim: et sw=4 sts=4
+URI.DisableExternal
+TYPE: bool
+VERSION: 1.2.0
+DEFAULT: false
+--DESCRIPTION--
+Disables links to external websites.  This is a highly effective anti-spam
+and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
+images outside of your domain will be allowed.  Non-linkified URIs will
+still be preserved.  If you want to be able to link to subdomains or use
+absolute URIs, specify %URI.Host for your website.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
index abcc1efd6..d74bc1e3d 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
@@ -1,13 +1,13 @@
-URI.DisableExternalResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-Disables the embedding of external resources, preventing users from
-embedding things like images from other hosts. This prevents access
-tracking (good for email viewers), bandwidth leeching, cross-site request
-forging, goatse.cx posting, and other nasties, but also results in a loss
-of end-user functionality (they can't directly post a pic they posted from
-Flickr anymore). Use it if you don't have a robust user-content moderation
-team.
---# vim: et sw=4 sts=4
+URI.DisableExternalResources
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+Disables the embedding of external resources, preventing users from
+embedding things like images from other hosts. This prevents access
+tracking (good for email viewers), bandwidth leeching, cross-site request
+forging, goatse.cx posting, and other nasties, but also results in a loss
+of end-user functionality (they can't directly post a pic they posted from
+Flickr anymore). Use it if you don't have a robust user-content moderation
+team.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
index f891de499..6c106144a 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
@@ -1,15 +1,15 @@
-URI.DisableResources
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Disables embedding resources, essentially meaning no pictures. You can
-    still link to them though. See %URI.DisableExternalResources for why
-    this might be a good idea.
-</p>
-<p>
-    <em>Note:</em> While this directive has been available since 1.3.0,
-    it didn't actually start doing anything until 4.2.0.
-</p>
---# vim: et sw=4 sts=4
+URI.DisableResources
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Disables embedding resources, essentially meaning no pictures. You can
+    still link to them though. See %URI.DisableExternalResources for why
+    this might be a good idea.
+</p>
+<p>
+    <em>Note:</em> While this directive has been available since 1.3.0,
+    it didn't actually start doing anything until 4.2.0.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
index ee83b121d..ba0e6bce1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
@@ -1,19 +1,19 @@
-URI.Host
-TYPE: string/null
-VERSION: 1.2.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Defines the domain name of the server, so we can determine whether or
-    an absolute URI is from your website or not.  Not strictly necessary,
-    as users should be using relative URIs to reference resources on your
-    website.  It will, however, let you use absolute URIs to link to
-    subdomains of the domain you post here: i.e. example.com will allow
-    sub.example.com.  However, higher up domains will still be excluded:
-    if you set %URI.Host to sub.example.com, example.com will be blocked.
-    <strong>Note:</strong> This directive overrides %URI.Base because
-    a given page may be on a sub-domain, but you wish HTML Purifier to be
-    more relaxed and allow some of the parent domains too.
-</p>
---# vim: et sw=4 sts=4
+URI.Host
+TYPE: string/null
+VERSION: 1.2.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Defines the domain name of the server, so we can determine whether or
+    an absolute URI is from your website or not.  Not strictly necessary,
+    as users should be using relative URIs to reference resources on your
+    website.  It will, however, let you use absolute URIs to link to
+    subdomains of the domain you post here: i.e. example.com will allow
+    sub.example.com.  However, higher up domains will still be excluded:
+    if you set %URI.Host to sub.example.com, example.com will be blocked.
+    <strong>Note:</strong> This directive overrides %URI.Base because
+    a given page may be on a sub-domain, but you wish HTML Purifier to be
+    more relaxed and allow some of the parent domains too.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
index 0b6df7625..825fef276 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
@@ -1,9 +1,9 @@
-URI.HostBlacklist
-TYPE: list
-VERSION: 1.3.0
-DEFAULT: array()
---DESCRIPTION--
-List of strings that are forbidden in the host of any URI. Use it to kill
-domain names of spam, etc. Note that it will catch anything in the domain,
-so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
---# vim: et sw=4 sts=4
+URI.HostBlacklist
+TYPE: list
+VERSION: 1.3.0
+DEFAULT: array()
+--DESCRIPTION--
+List of strings that are forbidden in the host of any URI. Use it to kill
+domain names of spam, etc. Note that it will catch anything in the domain,
+so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
index 4214900a5..eb58c7f1a 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
@@ -1,13 +1,13 @@
-URI.MakeAbsolute
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Converts all URIs into absolute forms. This is useful when the HTML
-    being filtered assumes a specific base path, but will actually be
-    viewed in a different context (and setting an alternate base URI is
-    not possible). %URI.Base must be set for this directive to work.
-</p>
---# vim: et sw=4 sts=4
+URI.MakeAbsolute
+TYPE: bool
+VERSION: 2.1.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Converts all URIs into absolute forms. This is useful when the HTML
+    being filtered assumes a specific base path, but will actually be
+    viewed in a different context (and setting an alternate base URI is
+    not possible). %URI.Base must be set for this directive to work.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
index 58c81dcc4..bedd610d6 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
@@ -1,83 +1,83 @@
-URI.Munge
-TYPE: string/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Munges all browsable (usually http, https and ftp)
-    absolute URIs into another URI, usually a URI redirection service.
-    This directive accepts a URI, formatted with a <code>%s</code> where
-    the url-encoded original URI should be inserted (sample:
-    <code>http://www.google.com/url?q=%s</code>).
-</p>
-<p>
-    Uses for this directive:
-</p>
-<ul>
-    <li>
-        Prevent PageRank leaks, while being fairly transparent
-        to users (you may also want to add some client side JavaScript to
-        override the text in the statusbar). <strong>Notice</strong>:
-        Many security experts believe that this form of protection does not deter spam-bots.
-    </li>
-    <li>
-        Redirect users to a splash page telling them they are leaving your
-        website. While this is poor usability practice, it is often mandated
-        in corporate environments.
-    </li>
-</ul>
-<p>
-    Prior to HTML Purifier 3.1.1, this directive also enabled the munging
-    of browsable external resources, which could break things if your redirection
-    script was a splash page or used <code>meta</code> tags. To revert to
-    previous behavior, please use %URI.MungeResources.
-</p>
-<p>
-    You may want to also use %URI.MungeSecretKey along with this directive
-    in order to enforce what URIs your redirector script allows. Open
-    redirector scripts can be a security risk and negatively affect the
-    reputation of your domain name.
-</p>
-<p>
-    Starting with HTML Purifier 3.1.1, there is also these substitutions:
-</p>
-<table>
-    <thead>
-        <tr>
-            <th>Key</th>
-            <th>Description</th>
-            <th>Example <code>&lt;a href=""&gt;</code></th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td>%r</td>
-            <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
-            <td></td>
-        </tr>
-        <tr>
-            <td>%n</td>
-            <td>The name of the tag this URI came from</td>
-            <td>a</td>
-        </tr>
-        <tr>
-            <td>%m</td>
-            <td>The name of the attribute this URI came from</td>
-            <td>href</td>
-        </tr>
-        <tr>
-            <td>%p</td>
-            <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
-            <td></td>
-        </tr>
-    </tbody>
-</table>
-<p>
-    Admittedly, these letters are somewhat arbitrary; the only stipulation
-    was that they couldn't be a through f. r is for resource (I would have preferred
-    e, but you take what you can get), n is for name, m
-    was picked because it came after n (and I couldn't use a), p is for
-    property.
-</p>
---# vim: et sw=4 sts=4
+URI.Munge
+TYPE: string/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Munges all browsable (usually http, https and ftp)
+    absolute URIs into another URI, usually a URI redirection service.
+    This directive accepts a URI, formatted with a <code>%s</code> where
+    the url-encoded original URI should be inserted (sample:
+    <code>http://www.google.com/url?q=%s</code>).
+</p>
+<p>
+    Uses for this directive:
+</p>
+<ul>
+    <li>
+        Prevent PageRank leaks, while being fairly transparent
+        to users (you may also want to add some client side JavaScript to
+        override the text in the statusbar). <strong>Notice</strong>:
+        Many security experts believe that this form of protection does not deter spam-bots.
+    </li>
+    <li>
+        Redirect users to a splash page telling them they are leaving your
+        website. While this is poor usability practice, it is often mandated
+        in corporate environments.
+    </li>
+</ul>
+<p>
+    Prior to HTML Purifier 3.1.1, this directive also enabled the munging
+    of browsable external resources, which could break things if your redirection
+    script was a splash page or used <code>meta</code> tags. To revert to
+    previous behavior, please use %URI.MungeResources.
+</p>
+<p>
+    You may want to also use %URI.MungeSecretKey along with this directive
+    in order to enforce what URIs your redirector script allows. Open
+    redirector scripts can be a security risk and negatively affect the
+    reputation of your domain name.
+</p>
+<p>
+    Starting with HTML Purifier 3.1.1, there is also these substitutions:
+</p>
+<table>
+    <thead>
+        <tr>
+            <th>Key</th>
+            <th>Description</th>
+            <th>Example <code>&lt;a href=""&gt;</code></th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>%r</td>
+            <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td>%n</td>
+            <td>The name of the tag this URI came from</td>
+            <td>a</td>
+        </tr>
+        <tr>
+            <td>%m</td>
+            <td>The name of the attribute this URI came from</td>
+            <td>href</td>
+        </tr>
+        <tr>
+            <td>%p</td>
+            <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
+            <td></td>
+        </tr>
+    </tbody>
+</table>
+<p>
+    Admittedly, these letters are somewhat arbitrary; the only stipulation
+    was that they couldn't be a through f. r is for resource (I would have preferred
+    e, but you take what you can get), n is for name, m
+    was picked because it came after n (and I couldn't use a), p is for
+    property.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
index 6fce0fdc3..ed4b5b0d0 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
@@ -1,17 +1,17 @@
-URI.MungeResources
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    If true, any URI munging directives like %URI.Munge
-    will also apply to embedded resources, such as <code>&lt;img src=""&gt;</code>.
-    Be careful enabling this directive if you have a redirector script
-    that does not use the <code>Location</code> HTTP header; all of your images
-    and other embedded resources will break.
-</p>
-<p>
-    <strong>Warning:</strong> It is strongly advised you use this in conjunction
-    %URI.MungeSecretKey to mitigate the security risk of an open redirector.
-</p>
---# vim: et sw=4 sts=4
+URI.MungeResources
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    If true, any URI munging directives like %URI.Munge
+    will also apply to embedded resources, such as <code>&lt;img src=""&gt;</code>.
+    Be careful enabling this directive if you have a redirector script
+    that does not use the <code>Location</code> HTTP header; all of your images
+    and other embedded resources will break.
+</p>
+<p>
+    <strong>Warning:</strong> It is strongly advised you use this in conjunction
+    %URI.MungeSecretKey to mitigate the security risk of an open redirector.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
index 1e17c1d46..123b6e26b 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
@@ -1,30 +1,30 @@
-URI.MungeSecretKey
-TYPE: string/null
-VERSION: 3.1.1
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    This directive enables secure checksum generation along with %URI.Munge.
-    It should be set to a secure key that is not shared with anyone else.
-    The checksum can be placed in the URI using %t. Use of this checksum
-    affords an additional level of protection by allowing a redirector
-    to check if a URI has passed through HTML Purifier with this line:
-</p>
-
-<pre>$checksum === hash_hmac("sha256", $url, $secret_key)</pre>
-
-<p>
-    If the output is TRUE, the redirector script should accept the URI.
-</p>
-
-<p>
-    Please note that it would still be possible for an attacker to procure
-    secure hashes en-mass by abusing your website's Preview feature or the
-    like, but this service affords an additional level of protection
-    that should be combined with website blacklisting.
-</p>
-
-<p>
-    Remember this has no effect if %URI.Munge is not on.
-</p>
---# vim: et sw=4 sts=4
+URI.MungeSecretKey
+TYPE: string/null
+VERSION: 3.1.1
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    This directive enables secure checksum generation along with %URI.Munge.
+    It should be set to a secure key that is not shared with anyone else.
+    The checksum can be placed in the URI using %t. Use of this checksum
+    affords an additional level of protection by allowing a redirector
+    to check if a URI has passed through HTML Purifier with this line:
+</p>
+
+<pre>$checksum === hash_hmac("sha256", $url, $secret_key)</pre>
+
+<p>
+    If the output is TRUE, the redirector script should accept the URI.
+</p>
+
+<p>
+    Please note that it would still be possible for an attacker to procure
+    secure hashes en-mass by abusing your website's Preview feature or the
+    like, but this service affords an additional level of protection
+    that should be combined with website blacklisting.
+</p>
+
+<p>
+    Remember this has no effect if %URI.Munge is not on.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
index 23331a4e7..8b387dea3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
@@ -1,9 +1,9 @@
-URI.OverrideAllowedSchemes
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-If this is set to true (which it is by default), you can override
-%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
-registry.  If false, you will also have to update that directive in order
-to add more schemes.
---# vim: et sw=4 sts=4
+URI.OverrideAllowedSchemes
+TYPE: bool
+DEFAULT: true
+--DESCRIPTION--
+If this is set to true (which it is by default), you can override
+%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
+registry.  If false, you will also have to update that directive in order
+to add more schemes.
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
index 79084832b..7e1f227f7 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
@@ -1,22 +1,22 @@
-URI.SafeIframeRegexp
-TYPE: string/null
-VERSION: 4.4.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    A PCRE regular expression that will be matched against an iframe URI.  This is
-    a relatively inflexible scheme, but works well enough for the most common
-    use-case of iframes: embedded video.  This directive only has an effect if
-    %HTML.SafeIframe is enabled.  Here are some example values:
-</p>
-<ul>
-    <li><code>%^http://www.youtube.com/embed/%</code> - Allow YouTube videos</li>
-    <li><code>%^http://player.vimeo.com/video/%</code> - Allow Vimeo videos</li>
-    <li><code>%^http://(www.youtube.com/embed/|player.vimeo.com/video/)%</code> - Allow both</li>
-</ul>
-<p>
-    Note that this directive does not give you enough granularity to, say, disable
-    all <code>autoplay</code> videos.  Pipe up on the HTML Purifier forums if this
-    is a capability you want.
-</p>
---# vim: et sw=4 sts=4
+URI.SafeIframeRegexp
+TYPE: string/null
+VERSION: 4.4.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    A PCRE regular expression that will be matched against an iframe URI.  This is
+    a relatively inflexible scheme, but works well enough for the most common
+    use-case of iframes: embedded video.  This directive only has an effect if
+    %HTML.SafeIframe is enabled.  Here are some example values:
+</p>
+<ul>
+    <li><code>%^http://www.youtube.com/embed/%</code> - Allow YouTube videos</li>
+    <li><code>%^http://player.vimeo.com/video/%</code> - Allow Vimeo videos</li>
+    <li><code>%^http://(www.youtube.com/embed/|player.vimeo.com/video/)%</code> - Allow both</li>
+</ul>
+<p>
+    Note that this directive does not give you enough granularity to, say, disable
+    all <code>autoplay</code> videos.  Pipe up on the HTML Purifier forums if this
+    is a capability you want.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/info.ini b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/info.ini
index 5de4505e1..58e0ce4a1 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/info.ini
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/info.ini
@@ -1,3 +1,3 @@
-name = "HTML Purifier"
-
-; vim: et sw=4 sts=4
+name = "HTML Purifier"
+
+; vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php
index 66f70b0fc..5af24c202 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php
@@ -1,341 +1,341 @@
-<?php
-
-// why is this a top level function? Because PHP 5.2.0 doesn't seem to
-// understand how to interpret this filter if it's a static method.
-// It's all really silly, but if we go this route it might be reasonable
-// to coalesce all of these methods into one.
-function htmlpurifier_filter_extractstyleblocks_muteerrorhandler()
-{
-}
-
-/**
- * This filter extracts <style> blocks from input HTML, cleans them up
- * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
- * so they can be used elsewhere in the document.
- *
- * @note
- *      See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
- *      sample usage.
- *
- * @note
- *      This filter can also be used on stylesheets not included in the
- *      document--something purists would probably prefer. Just directly
- *      call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
- */
-class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
-{
-    /**
-     * @type string
-     */
-    public $name = 'ExtractStyleBlocks';
-
-    /**
-     * @type array
-     */
-    private $_styleMatches = array();
-
-    /**
-     * @type csstidy
-     */
-    private $_tidy;
-
-    /**
-     * @type HTMLPurifier_AttrDef_HTML_ID
-     */
-    private $_id_attrdef;
-
-    /**
-     * @type HTMLPurifier_AttrDef_CSS_Ident
-     */
-    private $_class_attrdef;
-
-    /**
-     * @type HTMLPurifier_AttrDef_Enum
-     */
-    private $_enum_attrdef;
-
-    public function __construct()
-    {
-        $this->_tidy = new csstidy();
-        $this->_tidy->set_cfg('lowercase_s', false);
-        $this->_id_attrdef = new HTMLPurifier_AttrDef_HTML_ID(true);
-        $this->_class_attrdef = new HTMLPurifier_AttrDef_CSS_Ident();
-        $this->_enum_attrdef = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'first-child',
-                'link',
-                'visited',
-                'active',
-                'hover',
-                'focus'
-            )
-        );
-    }
-
-    /**
-     * Save the contents of CSS blocks to style matches
-     * @param array $matches preg_replace style $matches array
-     */
-    protected function styleCallback($matches)
-    {
-        $this->_styleMatches[] = $matches[1];
-    }
-
-    /**
-     * Removes inline <style> tags from HTML, saves them for later use
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     * @todo Extend to indicate non-text/css style blocks
-     */
-    public function preFilter($html, $config, $context)
-    {
-        $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
-        if ($tidy !== null) {
-            $this->_tidy = $tidy;
-        }
-        // NB: this must be NON-greedy because if we have
-        // <style>foo</style>  <style>bar</style>
-        // we must not grab foo</style>  <style>bar
-        $html = preg_replace_callback('#<style(?:\s.*)?>(.*)<\/style>#isU', array($this, 'styleCallback'), $html);
-        $style_blocks = $this->_styleMatches;
-        $this->_styleMatches = array(); // reset
-        $context->register('StyleBlocks', $style_blocks); // $context must not be reused
-        if ($this->_tidy) {
-            foreach ($style_blocks as &$style) {
-                $style = $this->cleanCSS($style, $config, $context);
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * Takes CSS (the stuff found in <style>) and cleans it.
-     * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
-     * @param string $css CSS styling to clean
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @throws HTMLPurifier_Exception
-     * @return string Cleaned CSS
-     */
-    public function cleanCSS($css, $config, $context)
-    {
-        // prepare scope
-        $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
-        if ($scope !== null) {
-            $scopes = array_map('trim', explode(',', $scope));
-        } else {
-            $scopes = array();
-        }
-        // remove comments from CSS
-        $css = trim($css);
-        if (strncmp('<!--', $css, 4) === 0) {
-            $css = substr($css, 4);
-        }
-        if (strlen($css) > 3 && substr($css, -3) == '-->') {
-            $css = substr($css, 0, -3);
-        }
-        $css = trim($css);
-        set_error_handler('htmlpurifier_filter_extractstyleblocks_muteerrorhandler');
-        $this->_tidy->parse($css);
-        restore_error_handler();
-        $css_definition = $config->getDefinition('CSS');
-        $html_definition = $config->getDefinition('HTML');
-        $new_css = array();
-        foreach ($this->_tidy->css as $k => $decls) {
-            // $decls are all CSS declarations inside an @ selector
-            $new_decls = array();
-            foreach ($decls as $selector => $style) {
-                $selector = trim($selector);
-                if ($selector === '') {
-                    continue;
-                } // should not happen
-                // Parse the selector
-                // Here is the relevant part of the CSS grammar:
-                //
-                // ruleset
-                //   : selector [ ',' S* selector ]* '{' ...
-                // selector
-                //   : simple_selector [ combinator selector | S+ [ combinator? selector ]? ]?
-                // combinator
-                //   : '+' S*
-                //   : '>' S*
-                // simple_selector
-                //   : element_name [ HASH | class | attrib | pseudo ]*
-                //   | [ HASH | class | attrib | pseudo ]+
-                // element_name
-                //   : IDENT | '*'
-                //   ;
-                // class
-                //   : '.' IDENT
-                //   ;
-                // attrib
-                //   : '[' S* IDENT S* [ [ '=' | INCLUDES | DASHMATCH ] S*
-                //     [ IDENT | STRING ] S* ]? ']'
-                //   ;
-                // pseudo
-                //   : ':' [ IDENT | FUNCTION S* [IDENT S*]? ')' ]
-                //   ;
-                //
-                // For reference, here are the relevant tokens:
-                //
-                // HASH         #{name}
-                // IDENT        {ident}
-                // INCLUDES     ==
-                // DASHMATCH    |=
-                // STRING       {string}
-                // FUNCTION     {ident}\(
-                //
-                // And the lexical scanner tokens
-                //
-                // name         {nmchar}+
-                // nmchar       [_a-z0-9-]|{nonascii}|{escape}
-                // nonascii     [\240-\377]
-                // escape       {unicode}|\\[^\r\n\f0-9a-f]
-                // unicode      \\{h}}{1,6}(\r\n|[ \t\r\n\f])?
-                // ident        -?{nmstart}{nmchar*}
-                // nmstart      [_a-z]|{nonascii}|{escape}
-                // string       {string1}|{string2}
-                // string1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\"
-                // string2      \'([^\n\r\f\\"]|\\{nl}|{escape})*\'
-                //
-                // We'll implement a subset (in order to reduce attack
-                // surface); in particular:
-                //
-                //      - No Unicode support
-                //      - No escapes support
-                //      - No string support (by proxy no attrib support)
-                //      - element_name is matched against allowed
-                //        elements (some people might find this
-                //        annoying...)
-                //      - Pseudo-elements one of :first-child, :link,
-                //        :visited, :active, :hover, :focus
-
-                // handle ruleset
-                $selectors = array_map('trim', explode(',', $selector));
-                $new_selectors = array();
-                foreach ($selectors as $sel) {
-                    // split on +, > and spaces
-                    $basic_selectors = preg_split('/\s*([+> ])\s*/', $sel, -1, PREG_SPLIT_DELIM_CAPTURE);
-                    // even indices are chunks, odd indices are
-                    // delimiters
-                    $nsel = null;
-                    $delim = null; // guaranteed to be non-null after
-                    // two loop iterations
-                    for ($i = 0, $c = count($basic_selectors); $i < $c; $i++) {
-                        $x = $basic_selectors[$i];
-                        if ($i % 2) {
-                            // delimiter
-                            if ($x === ' ') {
-                                $delim = ' ';
-                            } else {
-                                $delim = ' ' . $x . ' ';
-                            }
-                        } else {
-                            // simple selector
-                            $components = preg_split('/([#.:])/', $x, -1, PREG_SPLIT_DELIM_CAPTURE);
-                            $sdelim = null;
-                            $nx = null;
-                            for ($j = 0, $cc = count($components); $j < $cc; $j++) {
-                                $y = $components[$j];
-                                if ($j === 0) {
-                                    if ($y === '*' || isset($html_definition->info[$y = strtolower($y)])) {
-                                        $nx = $y;
-                                    } else {
-                                        // $nx stays null; this matters
-                                        // if we don't manage to find
-                                        // any valid selector content,
-                                        // in which case we ignore the
-                                        // outer $delim
-                                    }
-                                } elseif ($j % 2) {
-                                    // set delimiter
-                                    $sdelim = $y;
-                                } else {
-                                    $attrdef = null;
-                                    if ($sdelim === '#') {
-                                        $attrdef = $this->_id_attrdef;
-                                    } elseif ($sdelim === '.') {
-                                        $attrdef = $this->_class_attrdef;
-                                    } elseif ($sdelim === ':') {
-                                        $attrdef = $this->_enum_attrdef;
-                                    } else {
-                                        throw new HTMLPurifier_Exception('broken invariant sdelim and preg_split');
-                                    }
-                                    $r = $attrdef->validate($y, $config, $context);
-                                    if ($r !== false) {
-                                        if ($r !== true) {
-                                            $y = $r;
-                                        }
-                                        if ($nx === null) {
-                                            $nx = '';
-                                        }
-                                        $nx .= $sdelim . $y;
-                                    }
-                                }
-                            }
-                            if ($nx !== null) {
-                                if ($nsel === null) {
-                                    $nsel = $nx;
-                                } else {
-                                    $nsel .= $delim . $nx;
-                                }
-                            } else {
-                                // delimiters to the left of invalid
-                                // basic selector ignored
-                            }
-                        }
-                    }
-                    if ($nsel !== null) {
-                        if (!empty($scopes)) {
-                            foreach ($scopes as $s) {
-                                $new_selectors[] = "$s $nsel";
-                            }
-                        } else {
-                            $new_selectors[] = $nsel;
-                        }
-                    }
-                }
-                if (empty($new_selectors)) {
-                    continue;
-                }
-                $selector = implode(', ', $new_selectors);
-                foreach ($style as $name => $value) {
-                    if (!isset($css_definition->info[$name])) {
-                        unset($style[$name]);
-                        continue;
-                    }
-                    $def = $css_definition->info[$name];
-                    $ret = $def->validate($value, $config, $context);
-                    if ($ret === false) {
-                        unset($style[$name]);
-                    } else {
-                        $style[$name] = $ret;
-                    }
-                }
-                $new_decls[$selector] = $style;
-            }
-            $new_css[$k] = $new_decls;
-        }
-        // remove stuff that shouldn't be used, could be reenabled
-        // after security risks are analyzed
-        $this->_tidy->css = $new_css;
-        $this->_tidy->import = array();
-        $this->_tidy->charset = null;
-        $this->_tidy->namespace = null;
-        $css = $this->_tidy->print->plain();
-        // we are going to escape any special characters <>& to ensure
-        // that no funny business occurs (i.e. </style> in a font-family prop).
-        if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
-            $css = str_replace(
-                array('<', '>', '&'),
-                array('\3C ', '\3E ', '\26 '),
-                $css
-            );
-        }
-        return $css;
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// why is this a top level function? Because PHP 5.2.0 doesn't seem to
+// understand how to interpret this filter if it's a static method.
+// It's all really silly, but if we go this route it might be reasonable
+// to coalesce all of these methods into one.
+function htmlpurifier_filter_extractstyleblocks_muteerrorhandler()
+{
+}
+
+/**
+ * This filter extracts <style> blocks from input HTML, cleans them up
+ * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
+ * so they can be used elsewhere in the document.
+ *
+ * @note
+ *      See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
+ *      sample usage.
+ *
+ * @note
+ *      This filter can also be used on stylesheets not included in the
+ *      document--something purists would probably prefer. Just directly
+ *      call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
+ */
+class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
+{
+    /**
+     * @type string
+     */
+    public $name = 'ExtractStyleBlocks';
+
+    /**
+     * @type array
+     */
+    private $_styleMatches = array();
+
+    /**
+     * @type csstidy
+     */
+    private $_tidy;
+
+    /**
+     * @type HTMLPurifier_AttrDef_HTML_ID
+     */
+    private $_id_attrdef;
+
+    /**
+     * @type HTMLPurifier_AttrDef_CSS_Ident
+     */
+    private $_class_attrdef;
+
+    /**
+     * @type HTMLPurifier_AttrDef_Enum
+     */
+    private $_enum_attrdef;
+
+    public function __construct()
+    {
+        $this->_tidy = new csstidy();
+        $this->_tidy->set_cfg('lowercase_s', false);
+        $this->_id_attrdef = new HTMLPurifier_AttrDef_HTML_ID(true);
+        $this->_class_attrdef = new HTMLPurifier_AttrDef_CSS_Ident();
+        $this->_enum_attrdef = new HTMLPurifier_AttrDef_Enum(
+            array(
+                'first-child',
+                'link',
+                'visited',
+                'active',
+                'hover',
+                'focus'
+            )
+        );
+    }
+
+    /**
+     * Save the contents of CSS blocks to style matches
+     * @param array $matches preg_replace style $matches array
+     */
+    protected function styleCallback($matches)
+    {
+        $this->_styleMatches[] = $matches[1];
+    }
+
+    /**
+     * Removes inline <style> tags from HTML, saves them for later use
+     * @param string $html
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return string
+     * @todo Extend to indicate non-text/css style blocks
+     */
+    public function preFilter($html, $config, $context)
+    {
+        $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
+        if ($tidy !== null) {
+            $this->_tidy = $tidy;
+        }
+        // NB: this must be NON-greedy because if we have
+        // <style>foo</style>  <style>bar</style>
+        // we must not grab foo</style>  <style>bar
+        $html = preg_replace_callback('#<style(?:\s.*)?>(.*)<\/style>#isU', array($this, 'styleCallback'), $html);
+        $style_blocks = $this->_styleMatches;
+        $this->_styleMatches = array(); // reset
+        $context->register('StyleBlocks', $style_blocks); // $context must not be reused
+        if ($this->_tidy) {
+            foreach ($style_blocks as &$style) {
+                $style = $this->cleanCSS($style, $config, $context);
+            }
+        }
+        return $html;
+    }
+
+    /**
+     * Takes CSS (the stuff found in <style>) and cleans it.
+     * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
+     * @param string $css CSS styling to clean
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @throws HTMLPurifier_Exception
+     * @return string Cleaned CSS
+     */
+    public function cleanCSS($css, $config, $context)
+    {
+        // prepare scope
+        $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
+        if ($scope !== null) {
+            $scopes = array_map('trim', explode(',', $scope));
+        } else {
+            $scopes = array();
+        }
+        // remove comments from CSS
+        $css = trim($css);
+        if (strncmp('<!--', $css, 4) === 0) {
+            $css = substr($css, 4);
+        }
+        if (strlen($css) > 3 && substr($css, -3) == '-->') {
+            $css = substr($css, 0, -3);
+        }
+        $css = trim($css);
+        set_error_handler('htmlpurifier_filter_extractstyleblocks_muteerrorhandler');
+        $this->_tidy->parse($css);
+        restore_error_handler();
+        $css_definition = $config->getDefinition('CSS');
+        $html_definition = $config->getDefinition('HTML');
+        $new_css = array();
+        foreach ($this->_tidy->css as $k => $decls) {
+            // $decls are all CSS declarations inside an @ selector
+            $new_decls = array();
+            foreach ($decls as $selector => $style) {
+                $selector = trim($selector);
+                if ($selector === '') {
+                    continue;
+                } // should not happen
+                // Parse the selector
+                // Here is the relevant part of the CSS grammar:
+                //
+                // ruleset
+                //   : selector [ ',' S* selector ]* '{' ...
+                // selector
+                //   : simple_selector [ combinator selector | S+ [ combinator? selector ]? ]?
+                // combinator
+                //   : '+' S*
+                //   : '>' S*
+                // simple_selector
+                //   : element_name [ HASH | class | attrib | pseudo ]*
+                //   | [ HASH | class | attrib | pseudo ]+
+                // element_name
+                //   : IDENT | '*'
+                //   ;
+                // class
+                //   : '.' IDENT
+                //   ;
+                // attrib
+                //   : '[' S* IDENT S* [ [ '=' | INCLUDES | DASHMATCH ] S*
+                //     [ IDENT | STRING ] S* ]? ']'
+                //   ;
+                // pseudo
+                //   : ':' [ IDENT | FUNCTION S* [IDENT S*]? ')' ]
+                //   ;
+                //
+                // For reference, here are the relevant tokens:
+                //
+                // HASH         #{name}
+                // IDENT        {ident}
+                // INCLUDES     ==
+                // DASHMATCH    |=
+                // STRING       {string}
+                // FUNCTION     {ident}\(
+                //
+                // And the lexical scanner tokens
+                //
+                // name         {nmchar}+
+                // nmchar       [_a-z0-9-]|{nonascii}|{escape}
+                // nonascii     [\240-\377]
+                // escape       {unicode}|\\[^\r\n\f0-9a-f]
+                // unicode      \\{h}}{1,6}(\r\n|[ \t\r\n\f])?
+                // ident        -?{nmstart}{nmchar*}
+                // nmstart      [_a-z]|{nonascii}|{escape}
+                // string       {string1}|{string2}
+                // string1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\"
+                // string2      \'([^\n\r\f\\"]|\\{nl}|{escape})*\'
+                //
+                // We'll implement a subset (in order to reduce attack
+                // surface); in particular:
+                //
+                //      - No Unicode support
+                //      - No escapes support
+                //      - No string support (by proxy no attrib support)
+                //      - element_name is matched against allowed
+                //        elements (some people might find this
+                //        annoying...)
+                //      - Pseudo-elements one of :first-child, :link,
+                //        :visited, :active, :hover, :focus
+
+                // handle ruleset
+                $selectors = array_map('trim', explode(',', $selector));
+                $new_selectors = array();
+                foreach ($selectors as $sel) {
+                    // split on +, > and spaces
+                    $basic_selectors = preg_split('/\s*([+> ])\s*/', $sel, -1, PREG_SPLIT_DELIM_CAPTURE);
+                    // even indices are chunks, odd indices are
+                    // delimiters
+                    $nsel = null;
+                    $delim = null; // guaranteed to be non-null after
+                    // two loop iterations
+                    for ($i = 0, $c = count($basic_selectors); $i < $c; $i++) {
+                        $x = $basic_selectors[$i];
+                        if ($i % 2) {
+                            // delimiter
+                            if ($x === ' ') {
+                                $delim = ' ';
+                            } else {
+                                $delim = ' ' . $x . ' ';
+                            }
+                        } else {
+                            // simple selector
+                            $components = preg_split('/([#.:])/', $x, -1, PREG_SPLIT_DELIM_CAPTURE);
+                            $sdelim = null;
+                            $nx = null;
+                            for ($j = 0, $cc = count($components); $j < $cc; $j++) {
+                                $y = $components[$j];
+                                if ($j === 0) {
+                                    if ($y === '*' || isset($html_definition->info[$y = strtolower($y)])) {
+                                        $nx = $y;
+                                    } else {
+                                        // $nx stays null; this matters
+                                        // if we don't manage to find
+                                        // any valid selector content,
+                                        // in which case we ignore the
+                                        // outer $delim
+                                    }
+                                } elseif ($j % 2) {
+                                    // set delimiter
+                                    $sdelim = $y;
+                                } else {
+                                    $attrdef = null;
+                                    if ($sdelim === '#') {
+                                        $attrdef = $this->_id_attrdef;
+                                    } elseif ($sdelim === '.') {
+                                        $attrdef = $this->_class_attrdef;
+                                    } elseif ($sdelim === ':') {
+                                        $attrdef = $this->_enum_attrdef;
+                                    } else {
+                                        throw new HTMLPurifier_Exception('broken invariant sdelim and preg_split');
+                                    }
+                                    $r = $attrdef->validate($y, $config, $context);
+                                    if ($r !== false) {
+                                        if ($r !== true) {
+                                            $y = $r;
+                                        }
+                                        if ($nx === null) {
+                                            $nx = '';
+                                        }
+                                        $nx .= $sdelim . $y;
+                                    }
+                                }
+                            }
+                            if ($nx !== null) {
+                                if ($nsel === null) {
+                                    $nsel = $nx;
+                                } else {
+                                    $nsel .= $delim . $nx;
+                                }
+                            } else {
+                                // delimiters to the left of invalid
+                                // basic selector ignored
+                            }
+                        }
+                    }
+                    if ($nsel !== null) {
+                        if (!empty($scopes)) {
+                            foreach ($scopes as $s) {
+                                $new_selectors[] = "$s $nsel";
+                            }
+                        } else {
+                            $new_selectors[] = $nsel;
+                        }
+                    }
+                }
+                if (empty($new_selectors)) {
+                    continue;
+                }
+                $selector = implode(', ', $new_selectors);
+                foreach ($style as $name => $value) {
+                    if (!isset($css_definition->info[$name])) {
+                        unset($style[$name]);
+                        continue;
+                    }
+                    $def = $css_definition->info[$name];
+                    $ret = $def->validate($value, $config, $context);
+                    if ($ret === false) {
+                        unset($style[$name]);
+                    } else {
+                        $style[$name] = $ret;
+                    }
+                }
+                $new_decls[$selector] = $style;
+            }
+            $new_css[$k] = $new_decls;
+        }
+        // remove stuff that shouldn't be used, could be reenabled
+        // after security risks are analyzed
+        $this->_tidy->css = $new_css;
+        $this->_tidy->import = array();
+        $this->_tidy->charset = null;
+        $this->_tidy->namespace = null;
+        $css = $this->_tidy->print->plain();
+        // we are going to escape any special characters <>& to ensure
+        // that no funny business occurs (i.e. </style> in a font-family prop).
+        if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
+            $css = str_replace(
+                array('<', '>', '&'),
+                array('\3C ', '\3E ', '\26 '),
+                $css
+            );
+        }
+        return $css;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/YouTube.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/YouTube.php
index 276d8362f..b90ddf751 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/YouTube.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Filter/YouTube.php
@@ -1,65 +1,65 @@
-<?php
-
-class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'YouTube';
-
-    /**
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function preFilter($html, $config, $context)
-    {
-        $pre_regex = '#<object[^>]+>.+?' .
-            '(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
-        $pre_replace = '<span class="youtube-embed">\1</span>';
-        return preg_replace($pre_regex, $pre_replace, $html);
-    }
-
-    /**
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function postFilter($html, $config, $context)
-    {
-        $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
-        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
-    }
-
-    /**
-     * @param $url
-     * @return string
-     */
-    protected function armorUrl($url)
-    {
-        return str_replace('--', '-&#45;', $url);
-    }
-
-    /**
-     * @param array $matches
-     * @return string
-     */
-    protected function postFilterCallback($matches)
-    {
-        $url = $this->armorUrl($matches[1]);
-        return '<object width="425" height="350" type="application/x-shockwave-flash" ' .
-        'data="//www.youtube.com/' . $url . '">' .
-        '<param name="movie" value="//www.youtube.com/' . $url . '"></param>' .
-        '<!--[if IE]>' .
-        '<embed src="//www.youtube.com/' . $url . '"' .
-        'type="application/x-shockwave-flash"' .
-        'wmode="transparent" width="425" height="350" />' .
-        '<![endif]-->' .
-        '</object>';
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
+{
+
+    /**
+     * @type string
+     */
+    public $name = 'YouTube';
+
+    /**
+     * @param string $html
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return string
+     */
+    public function preFilter($html, $config, $context)
+    {
+        $pre_regex = '#<object[^>]+>.+?' .
+            '(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
+        $pre_replace = '<span class="youtube-embed">\1</span>';
+        return preg_replace($pre_regex, $pre_replace, $html);
+    }
+
+    /**
+     * @param string $html
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return string
+     */
+    public function postFilter($html, $config, $context)
+    {
+        $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
+        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
+    }
+
+    /**
+     * @param $url
+     * @return string
+     */
+    protected function armorUrl($url)
+    {
+        return str_replace('--', '-&#45;', $url);
+    }
+
+    /**
+     * @param array $matches
+     * @return string
+     */
+    protected function postFilterCallback($matches)
+    {
+        $url = $this->armorUrl($matches[1]);
+        return '<object width="425" height="350" type="application/x-shockwave-flash" ' .
+        'data="//www.youtube.com/' . $url . '">' .
+        '<param name="movie" value="//www.youtube.com/' . $url . '"></param>' .
+        '<!--[if IE]>' .
+        '<embed src="//www.youtube.com/' . $url . '"' .
+        'type="application/x-shockwave-flash"' .
+        'wmode="transparent" width="425" height="350" />' .
+        '<![endif]-->' .
+        '</object>';
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Language/messages/en.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Language/messages/en.php
index c7f197e1e..1fa30bdfe 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Language/messages/en.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Language/messages/en.php
@@ -1,55 +1,55 @@
-<?php
-
-$fallback = false;
-
-$messages = array(
-
-    'HTMLPurifier' => 'HTML Purifier',
-// for unit testing purposes
-    'LanguageFactoryTest: Pizza' => 'Pizza',
-    'LanguageTest: List' => '$1',
-    'LanguageTest: Hash' => '$1.Keys; $1.Values',
-    'Item separator' => ', ',
-    'Item separator last' => ' and ', // non-Harvard style
-
-    'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
-    'ErrorCollector: At line' => ' at line $line',
-    'ErrorCollector: Incidental errors' => 'Incidental errors',
-    'Lexer: Unclosed comment' => 'Unclosed comment',
-    'Lexer: Unescaped lt' => 'Unescaped less-than sign (<) should be &lt;',
-    'Lexer: Missing gt' => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
-    'Lexer: Missing attribute key' => 'Attribute declaration has no key',
-    'Lexer: Missing end quote' => 'Attribute declaration has no end quote',
-    'Lexer: Extracted body' => 'Removed document metadata tags',
-    'Strategy_RemoveForeignElements: Tag transform' => '<$1> element transformed into $CurrentToken.Serialized',
-    'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
-    'Strategy_RemoveForeignElements: Foreign element to text' => 'Unrecognized $CurrentToken.Serialized tag converted to text',
-    'Strategy_RemoveForeignElements: Foreign element removed' => 'Unrecognized $CurrentToken.Serialized tag removed',
-    'Strategy_RemoveForeignElements: Comment removed' => 'Comment containing "$CurrentToken.Data" removed',
-    'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
-    'Strategy_RemoveForeignElements: Token removed to end' => 'Tags and text starting from $1 element where removed to end',
-    'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
-    'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
-    'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
-    'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
-    'Strategy_MakeWellFormed: Tag auto closed' => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
-    'Strategy_MakeWellFormed: Tag carryover' => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
-    'Strategy_MakeWellFormed: Stray end tag removed' => 'Stray $CurrentToken.Serialized tag removed',
-    'Strategy_MakeWellFormed: Stray end tag to text' => 'Stray $CurrentToken.Serialized tag converted to text',
-    'Strategy_MakeWellFormed: Tag closed by element end' => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
-    'Strategy_MakeWellFormed: Tag closed by document end' => '$1.Compact tag started on line $1.Line closed by end of document',
-    'Strategy_FixNesting: Node removed' => '$CurrentToken.Compact node removed',
-    'Strategy_FixNesting: Node excluded' => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
-    'Strategy_FixNesting: Node reorganized' => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
-    'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
-    'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
-    'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
-);
-
-$errorNames = array(
-    E_ERROR => 'Error',
-    E_WARNING => 'Warning',
-    E_NOTICE => 'Notice'
-);
-
-// vim: et sw=4 sts=4
+<?php
+
+$fallback = false;
+
+$messages = array(
+
+    'HTMLPurifier' => 'HTML Purifier',
+// for unit testing purposes
+    'LanguageFactoryTest: Pizza' => 'Pizza',
+    'LanguageTest: List' => '$1',
+    'LanguageTest: Hash' => '$1.Keys; $1.Values',
+    'Item separator' => ', ',
+    'Item separator last' => ' and ', // non-Harvard style
+
+    'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
+    'ErrorCollector: At line' => ' at line $line',
+    'ErrorCollector: Incidental errors' => 'Incidental errors',
+    'Lexer: Unclosed comment' => 'Unclosed comment',
+    'Lexer: Unescaped lt' => 'Unescaped less-than sign (<) should be &lt;',
+    'Lexer: Missing gt' => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
+    'Lexer: Missing attribute key' => 'Attribute declaration has no key',
+    'Lexer: Missing end quote' => 'Attribute declaration has no end quote',
+    'Lexer: Extracted body' => 'Removed document metadata tags',
+    'Strategy_RemoveForeignElements: Tag transform' => '<$1> element transformed into $CurrentToken.Serialized',
+    'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
+    'Strategy_RemoveForeignElements: Foreign element to text' => 'Unrecognized $CurrentToken.Serialized tag converted to text',
+    'Strategy_RemoveForeignElements: Foreign element removed' => 'Unrecognized $CurrentToken.Serialized tag removed',
+    'Strategy_RemoveForeignElements: Comment removed' => 'Comment containing "$CurrentToken.Data" removed',
+    'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
+    'Strategy_RemoveForeignElements: Token removed to end' => 'Tags and text starting from $1 element where removed to end',
+    'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
+    'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
+    'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
+    'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
+    'Strategy_MakeWellFormed: Tag auto closed' => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
+    'Strategy_MakeWellFormed: Tag carryover' => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
+    'Strategy_MakeWellFormed: Stray end tag removed' => 'Stray $CurrentToken.Serialized tag removed',
+    'Strategy_MakeWellFormed: Stray end tag to text' => 'Stray $CurrentToken.Serialized tag converted to text',
+    'Strategy_MakeWellFormed: Tag closed by element end' => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
+    'Strategy_MakeWellFormed: Tag closed by document end' => '$1.Compact tag started on line $1.Line closed by end of document',
+    'Strategy_FixNesting: Node removed' => '$CurrentToken.Compact node removed',
+    'Strategy_FixNesting: Node excluded' => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
+    'Strategy_FixNesting: Node reorganized' => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
+    'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
+    'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
+    'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
+);
+
+$errorNames = array(
+    E_ERROR => 'Error',
+    E_WARNING => 'Warning',
+    E_NOTICE => 'Notice'
+);
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
index 0b452d17f..72476ddf3 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
@@ -1507,7 +1507,7 @@ class HTML5
                 $entity = $this->character($start, $this->char);
                 $cond = strlen($e_name) > 0;
 
-                // The rest of the parsing happens bellow.
+                // The rest of the parsing happens below.
                 break;
 
             // Anything else
@@ -1535,7 +1535,7 @@ class HTML5
                 }
 
                 $cond = isset($entity);
-                // The rest of the parsing happens bellow.
+                // The rest of the parsing happens below.
                 break;
         }
 
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer.php
index 549e4cea1..16acd4157 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer.php
@@ -1,218 +1,218 @@
-<?php
-
-// OUT OF DATE, NEEDS UPDATING!
-// USE XMLWRITER!
-
-class HTMLPurifier_Printer
-{
-
-    /**
-     * For HTML generation convenience funcs.
-     * @type HTMLPurifier_Generator
-     */
-    protected $generator;
-
-    /**
-     * For easy access.
-     * @type HTMLPurifier_Config
-     */
-    protected $config;
-
-    /**
-     * Initialize $generator.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Give generator necessary configuration if possible
-     * @param HTMLPurifier_Config $config
-     */
-    public function prepareGenerator($config)
-    {
-        $all = $config->getAll();
-        $context = new HTMLPurifier_Context();
-        $this->generator = new HTMLPurifier_Generator($config, $context);
-    }
-
-    /**
-     * Main function that renders object or aspect of that object
-     * @note Parameters vary depending on printer
-     */
-    // function render() {}
-
-    /**
-     * Returns a start tag
-     * @param string $tag Tag name
-     * @param array $attr Attribute array
-     * @return string
-     */
-    protected function start($tag, $attr = array())
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
-        );
-    }
-
-    /**
-     * Returns an end tag
-     * @param string $tag Tag name
-     * @return string
-     */
-    protected function end($tag)
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_End($tag)
-        );
-    }
-
-    /**
-     * Prints a complete element with content inside
-     * @param string $tag Tag name
-     * @param string $contents Element contents
-     * @param array $attr Tag attributes
-     * @param bool $escape whether or not to escape contents
-     * @return string
-     */
-    protected function element($tag, $contents, $attr = array(), $escape = true)
-    {
-        return $this->start($tag, $attr) .
-            ($escape ? $this->escape($contents) : $contents) .
-            $this->end($tag);
-    }
-
-    /**
-     * @param string $tag
-     * @param array $attr
-     * @return string
-     */
-    protected function elementEmpty($tag, $attr = array())
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Empty($tag, $attr)
-        );
-    }
-
-    /**
-     * @param string $text
-     * @return string
-     */
-    protected function text($text)
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Text($text)
-        );
-    }
-
-    /**
-     * Prints a simple key/value row in a table.
-     * @param string $name Key
-     * @param mixed $value Value
-     * @return string
-     */
-    protected function row($name, $value)
-    {
-        if (is_bool($value)) {
-            $value = $value ? 'On' : 'Off';
-        }
-        return
-            $this->start('tr') . "\n" .
-            $this->element('th', $name) . "\n" .
-            $this->element('td', $value) . "\n" .
-            $this->end('tr');
-    }
-
-    /**
-     * Escapes a string for HTML output.
-     * @param string $string String to escape
-     * @return string
-     */
-    protected function escape($string)
-    {
-        $string = HTMLPurifier_Encoder::cleanUTF8($string);
-        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
-        return $string;
-    }
-
-    /**
-     * Takes a list of strings and turns them into a single list
-     * @param string[] $array List of strings
-     * @param bool $polite Bool whether or not to add an end before the last
-     * @return string
-     */
-    protected function listify($array, $polite = false)
-    {
-        if (empty($array)) {
-            return 'None';
-        }
-        $ret = '';
-        $i = count($array);
-        foreach ($array as $value) {
-            $i--;
-            $ret .= $value;
-            if ($i > 0 && !($polite && $i == 1)) {
-                $ret .= ', ';
-            }
-            if ($polite && $i == 1) {
-                $ret .= 'and ';
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Retrieves the class of an object without prefixes, as well as metadata
-     * @param object $obj Object to determine class of
-     * @param string $sec_prefix Further prefix to remove
-     * @return string
-     */
-    protected function getClass($obj, $sec_prefix = '')
-    {
-        static $five = null;
-        if ($five === null) {
-            $five = version_compare(PHP_VERSION, '5', '>=');
-        }
-        $prefix = 'HTMLPurifier_' . $sec_prefix;
-        if (!$five) {
-            $prefix = strtolower($prefix);
-        }
-        $class = str_replace($prefix, '', get_class($obj));
-        $lclass = strtolower($class);
-        $class .= '(';
-        switch ($lclass) {
-            case 'enum':
-                $values = array();
-                foreach ($obj->valid_values as $value => $bool) {
-                    $values[] = $value;
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_composite':
-                $values = array();
-                foreach ($obj->defs as $def) {
-                    $values[] = $this->getClass($def, $sec_prefix);
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_multiple':
-                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
-                $class .= $obj->max;
-                break;
-            case 'css_denyelementdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
-                $class .= $obj->element;
-                break;
-            case 'css_importantdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix);
-                if ($obj->allow) {
-                    $class .= ', !important';
-                }
-                break;
-        }
-        $class .= ')';
-        return $class;
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// OUT OF DATE, NEEDS UPDATING!
+// USE XMLWRITER!
+
+class HTMLPurifier_Printer
+{
+
+    /**
+     * For HTML generation convenience funcs.
+     * @type HTMLPurifier_Generator
+     */
+    protected $generator;
+
+    /**
+     * For easy access.
+     * @type HTMLPurifier_Config
+     */
+    protected $config;
+
+    /**
+     * Initialize $generator.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Give generator necessary configuration if possible
+     * @param HTMLPurifier_Config $config
+     */
+    public function prepareGenerator($config)
+    {
+        $all = $config->getAll();
+        $context = new HTMLPurifier_Context();
+        $this->generator = new HTMLPurifier_Generator($config, $context);
+    }
+
+    /**
+     * Main function that renders object or aspect of that object
+     * @note Parameters vary depending on printer
+     */
+    // function render() {}
+
+    /**
+     * Returns a start tag
+     * @param string $tag Tag name
+     * @param array $attr Attribute array
+     * @return string
+     */
+    protected function start($tag, $attr = array())
+    {
+        return $this->generator->generateFromToken(
+            new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
+        );
+    }
+
+    /**
+     * Returns an end tag
+     * @param string $tag Tag name
+     * @return string
+     */
+    protected function end($tag)
+    {
+        return $this->generator->generateFromToken(
+            new HTMLPurifier_Token_End($tag)
+        );
+    }
+
+    /**
+     * Prints a complete element with content inside
+     * @param string $tag Tag name
+     * @param string $contents Element contents
+     * @param array $attr Tag attributes
+     * @param bool $escape whether or not to escape contents
+     * @return string
+     */
+    protected function element($tag, $contents, $attr = array(), $escape = true)
+    {
+        return $this->start($tag, $attr) .
+            ($escape ? $this->escape($contents) : $contents) .
+            $this->end($tag);
+    }
+
+    /**
+     * @param string $tag
+     * @param array $attr
+     * @return string
+     */
+    protected function elementEmpty($tag, $attr = array())
+    {
+        return $this->generator->generateFromToken(
+            new HTMLPurifier_Token_Empty($tag, $attr)
+        );
+    }
+
+    /**
+     * @param string $text
+     * @return string
+     */
+    protected function text($text)
+    {
+        return $this->generator->generateFromToken(
+            new HTMLPurifier_Token_Text($text)
+        );
+    }
+
+    /**
+     * Prints a simple key/value row in a table.
+     * @param string $name Key
+     * @param mixed $value Value
+     * @return string
+     */
+    protected function row($name, $value)
+    {
+        if (is_bool($value)) {
+            $value = $value ? 'On' : 'Off';
+        }
+        return
+            $this->start('tr') . "\n" .
+            $this->element('th', $name) . "\n" .
+            $this->element('td', $value) . "\n" .
+            $this->end('tr');
+    }
+
+    /**
+     * Escapes a string for HTML output.
+     * @param string $string String to escape
+     * @return string
+     */
+    protected function escape($string)
+    {
+        $string = HTMLPurifier_Encoder::cleanUTF8($string);
+        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
+        return $string;
+    }
+
+    /**
+     * Takes a list of strings and turns them into a single list
+     * @param string[] $array List of strings
+     * @param bool $polite Bool whether or not to add an end before the last
+     * @return string
+     */
+    protected function listify($array, $polite = false)
+    {
+        if (empty($array)) {
+            return 'None';
+        }
+        $ret = '';
+        $i = count($array);
+        foreach ($array as $value) {
+            $i--;
+            $ret .= $value;
+            if ($i > 0 && !($polite && $i == 1)) {
+                $ret .= ', ';
+            }
+            if ($polite && $i == 1) {
+                $ret .= 'and ';
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Retrieves the class of an object without prefixes, as well as metadata
+     * @param object $obj Object to determine class of
+     * @param string $sec_prefix Further prefix to remove
+     * @return string
+     */
+    protected function getClass($obj, $sec_prefix = '')
+    {
+        static $five = null;
+        if ($five === null) {
+            $five = version_compare(PHP_VERSION, '5', '>=');
+        }
+        $prefix = 'HTMLPurifier_' . $sec_prefix;
+        if (!$five) {
+            $prefix = strtolower($prefix);
+        }
+        $class = str_replace($prefix, '', get_class($obj));
+        $lclass = strtolower($class);
+        $class .= '(';
+        switch ($lclass) {
+            case 'enum':
+                $values = array();
+                foreach ($obj->valid_values as $value => $bool) {
+                    $values[] = $value;
+                }
+                $class .= implode(', ', $values);
+                break;
+            case 'css_composite':
+                $values = array();
+                foreach ($obj->defs as $def) {
+                    $values[] = $this->getClass($def, $sec_prefix);
+                }
+                $class .= implode(', ', $values);
+                break;
+            case 'css_multiple':
+                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
+                $class .= $obj->max;
+                break;
+            case 'css_denyelementdecorator':
+                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
+                $class .= $obj->element;
+                break;
+            case 'css_importantdecorator':
+                $class .= $this->getClass($obj->def, $sec_prefix);
+                if ($obj->allow) {
+                    $class .= ', !important';
+                }
+                break;
+        }
+        $class .= ')';
+        return $class;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/CSSDefinition.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/CSSDefinition.php
index 29505fe12..afc8c18ab 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/CSSDefinition.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/CSSDefinition.php
@@ -1,44 +1,44 @@
-<?php
-
-class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
-{
-    /**
-     * @type HTMLPurifier_CSSDefinition
-     */
-    protected $def;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return string
-     */
-    public function render($config)
-    {
-        $this->def = $config->getCSSDefinition();
-        $ret = '';
-
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-        $ret .= $this->start('table');
-
-        $ret .= $this->element('caption', 'Properties ($info)');
-
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
-        $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
-
-        ksort($this->def->info);
-        foreach ($this->def->info as $property => $obj) {
-            $name = $this->getClass($obj, 'AttrDef_');
-            $ret .= $this->row($property, $name);
-        }
-
-        $ret .= $this->end('table');
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
+{
+    /**
+     * @type HTMLPurifier_CSSDefinition
+     */
+    protected $def;
+
+    /**
+     * @param HTMLPurifier_Config $config
+     * @return string
+     */
+    public function render($config)
+    {
+        $this->def = $config->getCSSDefinition();
+        $ret = '';
+
+        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+        $ret .= $this->start('table');
+
+        $ret .= $this->element('caption', 'Properties ($info)');
+
+        $ret .= $this->start('thead');
+        $ret .= $this->start('tr');
+        $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
+        $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
+        $ret .= $this->end('tr');
+        $ret .= $this->end('thead');
+
+        ksort($this->def->info);
+        foreach ($this->def->info as $property => $obj) {
+            $name = $this->getClass($obj, 'AttrDef_');
+            $ret .= $this->row($property, $name);
+        }
+
+        $ret .= $this->end('table');
+        $ret .= $this->end('div');
+
+        return $ret;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.css b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.css
index 3ff1a88aa..7af30fc3a 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.css
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.css
@@ -1,10 +1,10 @@
-
-.hp-config {}
-
-.hp-config tbody th {text-align:right; padding-right:0.5em;}
-.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
-.hp-config .namespace th {text-align:center;}
-.hp-config .verbose {display:none;}
-.hp-config .controls {text-align:center;}
-
-/* vim: et sw=4 sts=4 */
+
+.hp-config {}
+
+.hp-config tbody th {text-align:right; padding-right:0.5em;}
+.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
+.hp-config .namespace th {text-align:center;}
+.hp-config .verbose {display:none;}
+.hp-config .controls {text-align:center;}
+
+/* vim: et sw=4 sts=4 */
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.js b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.js
index cba00c9b8..83e065531 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.js
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.js
@@ -1,5 +1,5 @@
-function toggleWriteability(id_of_patient, checked) {
-    document.getElementById(id_of_patient).disabled = checked;
-}
-
-// vim: et sw=4 sts=4
+function toggleWriteability(id_of_patient, checked) {
+    document.getElementById(id_of_patient).disabled = checked;
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php
index 65a777904..33ae11397 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php
@@ -48,7 +48,7 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
         $this->compress = $compress;
         // initialize sub-printers
         $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
+        $this->fields[HTMLPurifier_VarParser::C_BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
     }
 
     /**
@@ -339,7 +339,7 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
                     $value = '';
             }
         }
-        if ($type === HTMLPurifier_VarParser::MIXED) {
+        if ($type === HTMLPurifier_VarParser::C_MIXED) {
             return 'Not supported';
             $value = serialize($value);
         }
diff --git a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/HTMLDefinition.php b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/HTMLDefinition.php
index 5f2f2f8a7..ae8639176 100644
--- a/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/HTMLDefinition.php
+++ b/plugin/htmlpurifier/standalone/HTMLPurifier/Printer/HTMLDefinition.php
@@ -43,8 +43,8 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
         $ret .= $this->element('caption', 'Doctype');
         $ret .= $this->row('Name', $doctype->name);
         $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
-        $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
-        $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
+        $ret .= $this->row('Default Modules', implode(', ', $doctype->modules));
+        $ret .= $this->row('Default Tidy Modules', implode(', ', $doctype->tidyModules));
         $ret .= $this->end('table');
         return $ret;
     }
diff --git a/plugin/kcaptcha/_common.php b/plugin/kcaptcha/_common.php
index 14553420b..03b90f3dd 100644
--- a/plugin/kcaptcha/_common.php
+++ b/plugin/kcaptcha/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/kcaptcha/captcha.lib.php b/plugin/kcaptcha/captcha.lib.php
index a3c8d363d..bcb7a92a2 100644
--- a/plugin/kcaptcha/captcha.lib.php
+++ b/plugin/kcaptcha/captcha.lib.php
@@ -1,3 +1,2 @@
 <?php
-require(dirname(__FILE__).'/kcaptcha.lib.php');
-?>
\ No newline at end of file
+require(dirname(__FILE__).'/kcaptcha.lib.php');
\ No newline at end of file
diff --git a/plugin/kcaptcha/kcaptcha.lib.php b/plugin/kcaptcha/kcaptcha.lib.php
index fc897b5a1..6354399b9 100644
--- a/plugin/kcaptcha/kcaptcha.lib.php
+++ b/plugin/kcaptcha/kcaptcha.lib.php
@@ -75,6 +75,8 @@ class KCAPTCHA{
         $odd=mt_rand(0,1);
         if($odd==0) $odd=-1;
         for($i=0;$i<$length;$i++){
+
+            if( ! isset($this->keystring[$i]) ) continue;
             $m=$font_metrics[$this->keystring[$i]];
 
             $y=(($i%2)*$fluctuation_amplitude - $fluctuation_amplitude/2)*$odd
@@ -240,7 +242,7 @@ function captcha_html($class="captcha")
     if(is_mobile())
         $class .= ' m_captcha';
 
-    $html .= "\n".'<script>var g5_captcha_url  = "'.G5_CAPTCHA_URL.'";</script>';
+    $html = "\n".'<script>var g5_captcha_url  = "'.G5_CAPTCHA_URL.'";</script>';
     //$html .= "\n".'<script>var g5_captcha_path = "'.G5_CAPTCHA_PATH.'";</script>';
     $html .= "\n".'<script src="'.G5_CAPTCHA_URL.'/kcaptcha.js"></script>';
     $html .= "\n".'<fieldset id="captcha" class="'.$class.'">';
@@ -279,5 +281,4 @@ function chk_captcha()
         return false;
     }
     return true;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/kcaptcha/kcaptcha_config.php b/plugin/kcaptcha/kcaptcha_config.php
index cd42a3a46..eaae5440b 100644
--- a/plugin/kcaptcha/kcaptcha_config.php
+++ b/plugin/kcaptcha/kcaptcha_config.php
@@ -48,5 +48,4 @@ $background_color = array(255, 255, 255);
 # JPEG quality of CAPTCHA image (bigger is better quality, but larger file size)
 $jpeg_quality = 90;
 
-$wave = true;
-?>
\ No newline at end of file
+$wave = true;
\ No newline at end of file
diff --git a/plugin/kcaptcha/kcaptcha_image.php b/plugin/kcaptcha/kcaptcha_image.php
index 05337e3f9..37bd3c205 100644
--- a/plugin/kcaptcha/kcaptcha_image.php
+++ b/plugin/kcaptcha/kcaptcha_image.php
@@ -5,5 +5,4 @@ include_once('captcha.lib.php');
 $captcha = new KCAPTCHA();
 $captcha->setKeyString(get_session("ss_captcha_key"));
 $captcha->getKeyString();
-$captcha->image();
-?>
\ No newline at end of file
+$captcha->image();
\ No newline at end of file
diff --git a/plugin/kcaptcha/kcaptcha_mp3.php b/plugin/kcaptcha/kcaptcha_mp3.php
index 48b3744fe..67fa5c114 100644
--- a/plugin/kcaptcha/kcaptcha_mp3.php
+++ b/plugin/kcaptcha/kcaptcha_mp3.php
@@ -40,5 +40,4 @@ function make_mp3()
     return G5_DATA_URL.'/'.$mp3_file;
 }
 
-echo make_mp3();
-?>
\ No newline at end of file
+echo make_mp3();
\ No newline at end of file
diff --git a/plugin/kcaptcha/kcaptcha_result.php b/plugin/kcaptcha/kcaptcha_result.php
index 97c184140..0487fac3f 100644
--- a/plugin/kcaptcha/kcaptcha_result.php
+++ b/plugin/kcaptcha/kcaptcha_result.php
@@ -2,11 +2,12 @@
 // 캡챠 세션값과 비교하여 맞는지? 틀린지? 결과값을 출력합니다.
 include_once("_common.php");
 
+$captcha_key = isset($_POST['captcha_key']) ? $_POST['captcha_key'] : '';
+
 $count = (int)get_session("ss_captcha_count");
 if ($count >= 5) { // 설정값 이상이면 자동등록방지 입력 문자가 맞아도 오류 처리
     echo false;
 } else {
     set_session("ss_captcha_count", $count + 1);
-    echo (get_session("ss_captcha_key") == $_POST['captcha_key']) ? true : false;
-}
-?>
\ No newline at end of file
+    echo (get_session("ss_captcha_key") === $captcha_key) ? true : false;
+}
\ No newline at end of file
diff --git a/plugin/kcaptcha/kcaptcha_session.php b/plugin/kcaptcha/kcaptcha_session.php
index 81ad7efbb..e2cb80362 100644
--- a/plugin/kcaptcha/kcaptcha_session.php
+++ b/plugin/kcaptcha/kcaptcha_session.php
@@ -6,7 +6,7 @@ include_once('captcha.lib.php');
 while(true){
     $keystring='';
     for($i=0;$i<$length;$i++){
-        $keystring.=$allowed_symbols{mt_rand(0,strlen($allowed_symbols)-1)};
+        $keystring.=$allowed_symbols[mt_rand(0,strlen($allowed_symbols)-1)];
     }
     if(!preg_match('/cp|cb|ck|c6|c9|rn|rm|mm|co|do|cl|db|qp|qb|dp|ww/', $keystring)) break;
 }
@@ -14,5 +14,4 @@ while(true){
 set_session("ss_captcha_count", 0);
 set_session("ss_captcha_key", $keystring);
 $captcha = new KCAPTCHA();
-$captcha->setKeyString(get_session("ss_captcha_key"));
-?>
\ No newline at end of file
+$captcha->setKeyString(get_session("ss_captcha_key"));
\ No newline at end of file
diff --git a/plugin/kcpcert/_common.php b/plugin/kcpcert/_common.php
index 14553420b..03b90f3dd 100644
--- a/plugin/kcpcert/_common.php
+++ b/plugin/kcpcert/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/kcpcert/kcpcert_config.php b/plugin/kcpcert/kcpcert_config.php
index e03281bf3..37841e104 100644
--- a/plugin/kcpcert/kcpcert_config.php
+++ b/plugin/kcpcert/kcpcert_config.php
@@ -50,5 +50,4 @@ function f_get_parm_int( $val )
 
     return  $ret_val;
 }
-/* ============================================================================== */
-?>
\ No newline at end of file
+/* ============================================================================== */;
\ No newline at end of file
diff --git a/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php
index 49345f89c..111bbdc15 100644
--- a/plugin/kcpcert/kcpcert_result.php
+++ b/plugin/kcpcert/kcpcert_result.php
@@ -237,5 +237,4 @@ $(function() {
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/kcpcert/lib/ct_cli_lib.php b/plugin/kcpcert/lib/ct_cli_lib.php
index bc29ad013..ffd54d3ca 100644
--- a/plugin/kcpcert/lib/ct_cli_lib.php
+++ b/plugin/kcpcert/lib/ct_cli_lib.php
@@ -109,17 +109,15 @@ class   C_CT_CLI
       if ( is_array( $arg[0] ) )  $arg = $arg[0];
 
       $exec_cmd = array_shift( $arg );
-
-      while ( list(,$i) = each($arg) )
-      {
-        // 일부서버의 경우 빈값일때 '' 결과가 넘어오지 않는 버그가 있다. kagla 150820
-        //$exec_cmd .= " " . escapeshellarg( $i );
-        $exec_cmd .= " " . ( escapeshellarg($i) ? escapeshellarg($i) : "''" );
-      }
+        
+        foreach($arg as $k => $i) {
+            // 일부서버의 경우 빈값일때 '' 결과가 넘어오지 않는 버그가 있다. kagla 150820
+            //$exec_cmd .= " " . escapeshellarg( $i );
+            $exec_cmd .= " " . ( escapeshellarg($i) ? escapeshellarg($i) : "''" );
+        }
 
       $rt = exec( $exec_cmd );
 
       return  $rt;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/lgxpay/AuthOnlyRes.php b/plugin/lgxpay/AuthOnlyRes.php
index c16bfa633..1e0a94489 100644
--- a/plugin/lgxpay/AuthOnlyRes.php
+++ b/plugin/lgxpay/AuthOnlyRes.php
@@ -223,5 +223,4 @@ jQuery(function($) {
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/lgxpay/_common.php b/plugin/lgxpay/_common.php
index bad54a5d7..c7ed3c4ee 100644
--- a/plugin/lgxpay/_common.php
+++ b/plugin/lgxpay/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/lgxpay/lgdacom/JSON.php b/plugin/lgxpay/lgdacom/JSON.php
index c4d7a067d..6af78c7ed 100644
--- a/plugin/lgxpay/lgdacom/JSON.php
+++ b/plugin/lgxpay/lgdacom/JSON.php
@@ -375,7 +375,7 @@ class Services_JSON
                 */
 
                 // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
                     $properties = array_map(array($this, 'name_value'),
                                             array_keys($var),
                                             array_values($var));
@@ -801,6 +801,4 @@ if (class_exists('PEAR_Error')) {
         }
     }
 
-}
-    
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/lgxpay/lgdacom/XPayClient.php b/plugin/lgxpay/lgdacom/XPayClient.php
index 07543e50a..377e2fed2 100644
--- a/plugin/lgxpay/lgdacom/XPayClient.php
+++ b/plugin/lgxpay/lgdacom/XPayClient.php
@@ -1116,5 +1116,4 @@ class XPayClient
 		//close curl session and free up resources
 		curl_close($this->ch);
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/lgxpay/lgdacom/XPayClient4DB.php b/plugin/lgxpay/lgdacom/XPayClient4DB.php
index b330656b1..5ca1a5847 100644
--- a/plugin/lgxpay/lgdacom/XPayClient4DB.php
+++ b/plugin/lgxpay/lgdacom/XPayClient4DB.php
@@ -1114,5 +1114,4 @@ class XPayClient
 		//close curl session and free up resources
 		curl_close($this->ch);
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/lgxpay/lgdacom/patch.php b/plugin/lgxpay/lgdacom/patch.php
index 176d74ce3..4036341f7 100644
--- a/plugin/lgxpay/lgdacom/patch.php
+++ b/plugin/lgxpay/lgdacom/patch.php
@@ -24,5 +24,4 @@
     $xpay = &new XPayClient($configPath, $CST_PLATFORM);
     $xpay->Init_TX($LGD_MID);
 
-    echo "patch result = ".$xpay->Patch("lgdacom.conf");
-?>
+    echo "patch result = ".$xpay->Patch("lgdacom.conf");
\ No newline at end of file
diff --git a/plugin/lgxpay/lgdacom/ping.php b/plugin/lgxpay/lgdacom/ping.php
index f441874e0..5a060a5ed 100644
--- a/plugin/lgxpay/lgdacom/ping.php
+++ b/plugin/lgxpay/lgdacom/ping.php
@@ -44,5 +44,4 @@
         echo "[TX_PING error] <br>";
         echo "response code = " . $xpay->Response_Code() . "<br>";
         echo "response msg = " . $xpay->Response_Msg() . "<p>";
-    }
-?>
+    }
\ No newline at end of file
diff --git a/plugin/lgxpay/returnurl.php b/plugin/lgxpay/returnurl.php
index b40e8940e..ef0f2e2a0 100644
--- a/plugin/lgxpay/returnurl.php
+++ b/plugin/lgxpay/returnurl.php
@@ -38,8 +38,8 @@ $payReqMap = $_SESSION['lgd_certify'];//결제 요청시, Session에 저장했
 </head>
 <body onload="setLGDResult()">
 <?php
-  $LGD_RESPCODE = $_POST['LGD_RESPCODE'];
-  $LGD_RESPMSG 	= iconv("EUC-KR","UTF-8",$_POST['LGD_RESPMSG']);
+  $LGD_RESPCODE = isset($_POST['LGD_RESPCODE']) ? $_POST['LGD_RESPCODE'] : '';
+  $LGD_RESPMSG 	= isset($_POST['LGD_RESPMSG']) ? iconv("EUC-KR", "UTF-8", $_POST['LGD_RESPMSG']) : '';
   $LGD_AUTHONLYKEY		= "";	
   $LGD_PAYTYPE			= "";
 
@@ -51,7 +51,7 @@ $payReqMap = $_SESSION['lgd_certify'];//결제 요청시, Session에 저장했
 	  $payReqMap['LGD_PAYTYPE'] 	= isset($_POST['LGD_PAYTYPE']) ? $_POST['LGD_PAYTYPE'] : '';
   }
   else{
-	  echo "LGD_RESPCODE:" + $LGD_RESPCODE + " ,LGD_RESPMSG:" + $LGD_RESPMSG; //인증 실패에 대한 처리 로직 추가
+	  echo "LGD_RESPCODE:" . $LGD_RESPCODE . " ,LGD_RESPMSG:" . $LGD_RESPMSG; //인증 실패에 대한 처리 로직 추가
   }
 ?>
 <form method="post" name="LGD_RETURNINFO" id="LGD_RETURNINFO">
diff --git a/plugin/okname/_common.php b/plugin/okname/_common.php
index 14553420b..03b90f3dd 100644
--- a/plugin/okname/_common.php
+++ b/plugin/okname/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/okname/hpcert.config.php b/plugin/okname/hpcert.config.php
index 3ccdc0f15..b7040d406 100644
--- a/plugin/okname/hpcert.config.php
+++ b/plugin/okname/hpcert.config.php
@@ -80,5 +80,4 @@ if($config['cf_cert_use'] == 2) {
 // ########################################################################
 // # 리턴 URL 설정
 // ########################################################################
-$returnUrl = escapeshellarg(G5_OKNAME_URL.'/hpcert2.php');          // 본인인증 완료후 리턴될 URL (도메인 포함 full path)
-?>
\ No newline at end of file
+$returnUrl = escapeshellarg(G5_OKNAME_URL.'/hpcert2.php');          // 본인인증 완료후 리턴될 URL (도메인 포함 full path);
\ No newline at end of file
diff --git a/plugin/okname/hpcert1.php b/plugin/okname/hpcert1.php
index a0638ddc4..ece1187ab 100644
--- a/plugin/okname/hpcert1.php
+++ b/plugin/okname/hpcert1.php
@@ -91,5 +91,4 @@ if ($retcode == "B000") {
     echo ("<script>alert(\"$retcode\"); self.close();</script>");
 }
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/okname/hpcert2.php b/plugin/okname/hpcert2.php
index 43c7fd96d..90cc0239d 100644
--- a/plugin/okname/hpcert2.php
+++ b/plugin/okname/hpcert2.php
@@ -23,13 +23,13 @@ require('./hpcert.config.php');
 /* 공통 리턴 항목 */
 //$idcfMbrComCd           =   $_REQUEST['idcf_mbr_com_cd'];      // 고객사코드
 $idcfMbrComCd           =   $memId;
-$hsCertSvcTxSeqno       =   $_REQUEST['hs_cert_svc_tx_seqno']; // 거래번호
-$rqstSiteNm             =   $_REQUEST['rqst_site_nm'];         // 접속도메인
-$hsCertRqstCausCd       =   $_REQUEST['hs_cert_rqst_caus_cd']; // 인증요청사유코드 2byte  (00:회원가입, 01:성인인증, 02:회원정보수정, 03:비밀번호찾기, 04:상품구매, 99:기타)
+$hsCertSvcTxSeqno       =   isset($_REQUEST['hs_cert_svc_tx_seqno']) ? $_REQUEST['hs_cert_svc_tx_seqno'] : ''; // 거래번호
+$rqstSiteNm             =   isset($_REQUEST['rqst_site_nm']) ? $_REQUEST['rqst_site_nm'] : '';         // 접속도메인
+$hsCertRqstCausCd       =   isset($_REQUEST['hs_cert_rqst_caus_cd']) ? $_REQUEST['hs_cert_rqst_caus_cd'] : ''; // 인증요청사유코드 2byte  (00:회원가입, 01:성인인증, 02:회원정보수정, 03:비밀번호찾기, 04:상품구매, 99:기타)
 
-$resultCd               =   $_REQUEST['result_cd'];            // 결과코드
-$resultMsg              =   $_REQUEST['result_msg'];           // 결과메세지
-$certDtTm               =   $_REQUEST['cert_dt_tm'];           // 인증일시
+$resultCd               =   isset($_REQUEST['result_cd']) ? $_REQUEST['result_cd'] : '';            // 결과코드
+$resultMsg              =   isset($_REQUEST['result_msg']) ? $_REQUEST['result_msg'] : '';           // 결과메세지
+$certDtTm               =   isset($_REQUEST['cert_dt_tm']) ? $_REQUEST['cert_dt_tm'] : '';           // 인증일시
 
 if($resultCd != 'B000') {
     alert_close('휴대폰 본인확인 중 오류가 발생했습니다. 오류코드 : '.$resultCd.'\\n\\n문의는 코리아크레딧뷰로 고객센터 02-708-1000 로 해주십시오.');
@@ -38,15 +38,15 @@ if($resultCd != 'B000') {
 /**************************************************************************
  * 모듈 호출    ; 생년월일 본인 확인서비스 결과 데이터를 복호화한다.
  **************************************************************************/
-$encInfo = $_REQUEST['encInfo'];
+$encInfo = isset($_REQUEST['encInfo']) ? $_REQUEST['encInfo'] : '';
 if(preg_match('~[^0-9a-zA-Z+/=]~', $encInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 공개키
-$WEBPUBKEY = trim($_REQUEST['WEBPUBKEY']);
+$WEBPUBKEY = isset($_REQUEST['WEBPUBKEY']) ? trim($_REQUEST['WEBPUBKEY']) : '';
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 서명값
-$WEBSIGNATURE = trim($_REQUEST['WEBSIGNATURE']);
+$WEBSIGNATURE = isset($_REQUEST['WEBSIGNATURE']) ? trim($_REQUEST['WEBSIGNATURE']) : '';
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 // ########################################################################
@@ -154,5 +154,4 @@ $(function() {
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/okname/ipin.config.php b/plugin/okname/ipin.config.php
index 10971f003..c07993ddf 100644
--- a/plugin/okname/ipin.config.php
+++ b/plugin/okname/ipin.config.php
@@ -41,5 +41,4 @@ $keypath = G5_OKNAME_PATH.'/key/okname.key';    // 키파일이 생성될 위치
 $memid = $cpCode;   // 회원사코드
 $reserved1 = '0';   //reserved1
 $reserved2 = '0';   //reserved2
-$logpath = G5_OKNAME_PATH.'/log';   // 로그파일을 남기는 경우 로그파일이 생성될 경로 option에 'L'이 포함된 경우에만 생성
-?>
\ No newline at end of file
+$logpath = G5_OKNAME_PATH.'/log';   // 로그파일을 남기는 경우 로그파일이 생성될 경로 option에 'L'이 포함된 경우에만 생성;
\ No newline at end of file
diff --git a/plugin/okname/ipin1.php b/plugin/okname/ipin1.php
index 3463aa9c0..f721527e5 100644
--- a/plugin/okname/ipin1.php
+++ b/plugin/okname/ipin1.php
@@ -65,5 +65,4 @@ document.kcbInForm.submit();
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/okname/ipin2.php b/plugin/okname/ipin2.php
index 30f664886..a916d1b82 100644
--- a/plugin/okname/ipin2.php
+++ b/plugin/okname/ipin2.php
@@ -14,15 +14,15 @@ foreach($check_arrays as $key){
 require('./ipin.config.php');
 
 //아이핀팝업에서 조회한 PERSONALINFO이다.
-@$encPsnlInfo = $_REQUEST["encPsnlInfo"];
+@$encPsnlInfo = isset($_REQUEST["encPsnlInfo"]) ? $_REQUEST["encPsnlInfo"] : '';
 if(preg_match('~[^0-9a-zA-Z+/=]~', $encPsnlInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 공개키
-@$WEBPUBKEY = trim($_REQUEST["WEBPUBKEY"]);
+@$WEBPUBKEY = isset($_REQUEST["WEBPUBKEY"]) ? trim($_REQUEST["WEBPUBKEY"]) : '';
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 서명값
-@$WEBSIGNATURE = trim($_REQUEST["WEBSIGNATURE"]);
+@$WEBSIGNATURE = isset($_REQUEST["WEBSIGNATURE"]) ? trim($_REQUEST["WEBSIGNATURE"]) : '';
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //아이핀 서버와 통신을 위한 키파일 생성
@@ -120,5 +120,4 @@ $(function() {
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/okname/key_dir_check.php b/plugin/okname/key_dir_check.php
index 91510820c..b17507682 100644
--- a/plugin/okname/key_dir_check.php
+++ b/plugin/okname/key_dir_check.php
@@ -21,5 +21,4 @@ if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
             alert_close($msg);
         }
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/recaptcha/_common.php b/plugin/recaptcha/_common.php
index 14553420b..03b90f3dd 100644
--- a/plugin/recaptcha/_common.php
+++ b/plugin/recaptcha/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/recaptcha/captcha.lib.php b/plugin/recaptcha/captcha.lib.php
index e67ee596c..72aa0f93d 100644
--- a/plugin/recaptcha/captcha.lib.php
+++ b/plugin/recaptcha/captcha.lib.php
@@ -1,4 +1,3 @@
 <?php
 require_once(dirname(__FILE__).'/recaptcha.class.php');
-require_once(dirname(__FILE__).'/recaptcha.user.lib.php');
-?>
\ No newline at end of file
+require_once(dirname(__FILE__).'/recaptcha.user.lib.php');
\ No newline at end of file
diff --git a/plugin/recaptcha/recaptcha.class.php b/plugin/recaptcha/recaptcha.class.php
index 781c13d3c..44ee99373 100644
--- a/plugin/recaptcha/recaptcha.class.php
+++ b/plugin/recaptcha/recaptcha.class.php
@@ -143,5 +143,4 @@ class ReCaptcha_GNU
         }
         return $recaptchaResponse;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/recaptcha/recaptcha.user.lib.php b/plugin/recaptcha/recaptcha.user.lib.php
index 8a5c631ba..3796796d6 100644
--- a/plugin/recaptcha/recaptcha.user.lib.php
+++ b/plugin/recaptcha/recaptcha.user.lib.php
@@ -47,5 +47,4 @@ function chk_captcha(){
     }
 
     return false;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/recaptcha_inv/_common.php b/plugin/recaptcha_inv/_common.php
index bad54a5d7..c7ed3c4ee 100644
--- a/plugin/recaptcha_inv/_common.php
+++ b/plugin/recaptcha_inv/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/recaptcha_inv/captcha.lib.php b/plugin/recaptcha_inv/captcha.lib.php
index 9eec82f03..84d4d8ca6 100644
--- a/plugin/recaptcha_inv/captcha.lib.php
+++ b/plugin/recaptcha_inv/captcha.lib.php
@@ -1,4 +1,3 @@
 <?php
 require_once(dirname(__FILE__).'/recaptcha.class.php');
-require_once(dirname(__FILE__).'/recaptcha.user.lib.php');
-?>
\ No newline at end of file
+require_once(dirname(__FILE__).'/recaptcha.user.lib.php');
\ No newline at end of file
diff --git a/plugin/recaptcha_inv/recaptcha.class.php b/plugin/recaptcha_inv/recaptcha.class.php
index 781c13d3c..44ee99373 100644
--- a/plugin/recaptcha_inv/recaptcha.class.php
+++ b/plugin/recaptcha_inv/recaptcha.class.php
@@ -143,5 +143,4 @@ class ReCaptcha_GNU
         }
         return $recaptchaResponse;
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/recaptcha_inv/recaptcha.user.lib.php b/plugin/recaptcha_inv/recaptcha.user.lib.php
index cd6e6bcc4..507254c49 100644
--- a/plugin/recaptcha_inv/recaptcha.user.lib.php
+++ b/plugin/recaptcha_inv/recaptcha.user.lib.php
@@ -48,5 +48,4 @@ function chk_captcha(){
     }
 
     return false;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/sms5/JSON.php b/plugin/sms5/JSON.php
index 8dc8a6f01..d2a9581c2 100644
--- a/plugin/sms5/JSON.php
+++ b/plugin/sms5/JSON.php
@@ -169,7 +169,7 @@ class Services_JSON
             return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
         }
 
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch(true) {
             case ((0x7F & $bytes) == $bytes):
@@ -222,17 +222,17 @@ class Services_JSON
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
+                return chr(0x07 & (ord($utf8[0]) >> 2))
+                     . chr((0xC0 & (ord($utf8[0]) << 6))
+                         | (0x3F & ord($utf8[1])));
 
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
+                return chr((0xF0 & (ord($utf8[0]) << 4))
+                         | (0x0F & (ord($utf8[1]) >> 2)))
+                     . chr((0xC0 & (ord($utf8[1]) << 6))
+                         | (0x7F & ord($utf8[2])));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -315,7 +315,7 @@ class Services_JSON
                 */
                 for ($c = 0; $c < $strlen_var; ++$c) {
 
-                    $ord_var_c = ord($var{$c});
+                    $ord_var_c = ord($var[$c]);
 
                     switch (true) {
                         case $ord_var_c == 0x08:
@@ -338,12 +338,12 @@ class Services_JSON
                         case $ord_var_c == 0x2F:
                         case $ord_var_c == 0x5C:
                             // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
+                            $ascii .= '\\'.$var[$c];
                             break;
 
                         case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
                             // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
+                            $ascii .= $var[$c];
                             break;
 
                         case (($ord_var_c & 0xE0) == 0xC0):
@@ -355,7 +355,7 @@ class Services_JSON
                                 break;
                             }
                             
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
                             $c += 1;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -370,8 +370,8 @@ class Services_JSON
                             // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         @ord($var{$c + 1}),
-                                         @ord($var{$c + 2}));
+                                         @ord($var[$c + 1]),
+                                         @ord($var[$c + 2]));
                             $c += 2;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -386,9 +386,9 @@ class Services_JSON
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
+                                         ord($var[$c + 1]),
+                                         ord($var[$c + 2]),
+                                         ord($var[$c + 3]));
                             $c += 3;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -403,10 +403,10 @@ class Services_JSON
                                 break;
                             }
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
+                                         ord($var[$c + 1]),
+                                         ord($var[$c + 2]),
+                                         ord($var[$c + 3]),
+                                         ord($var[$c + 4]));
                             $c += 4;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -421,11 +421,11 @@ class Services_JSON
                             // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
+                                         ord($var[$c + 1]),
+                                         ord($var[$c + 2]),
+                                         ord($var[$c + 3]),
+                                         ord($var[$c + 4]),
+                                         ord($var[$c + 5]));
                             $c += 5;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -454,7 +454,7 @@ class Services_JSON
                 */
 
                 // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
                     $properties = array_map(array($this, 'name_value'),
                                             array_keys($var),
                                             array_values($var));
@@ -618,7 +618,7 @@ class Services_JSON
                     for ($c = 0; $c < $strlen_chrs; ++$c) {
 
                         $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
+                        $ord_chrs_c = ord($chrs[$c]);
 
                         switch (true) {
                             case $substr_chrs_c_2 == '\b':
@@ -648,7 +648,7 @@ class Services_JSON
                             case $substr_chrs_c_2 == '\\/':
                                 if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
                                    ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
+                                    $utf8 .= $chrs[++$c];
                                 }
                                 break;
 
@@ -661,7 +661,7 @@ class Services_JSON
                                 break;
 
                             case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
+                                $utf8 .= $chrs[$c];
                                 break;
 
                             case ($ord_chrs_c & 0xE0) == 0xC0:
@@ -708,7 +708,7 @@ class Services_JSON
                 } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
                     // array, or object notation
 
-                    if ($str{0} == '[') {
+                    if ($str[0] == '[') {
                         $stk = array(SERVICES_JSON_IN_ARR);
                         $arr = array();
                     } else {
@@ -747,12 +747,12 @@ class Services_JSON
                         $top = end($stk);
                         $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
 
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+                        if (($c == $strlen_chrs) || (($chrs[$c] == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
                             // found a comma that is not inside a string, array, etc.,
                             // OR we've reached the end of the character list
                             $slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
                             array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found split at [$c]: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                             if (reset($stk) == SERVICES_JSON_IN_ARR) {
                                 // we are in an array, so just push an element onto the stack
@@ -788,48 +788,48 @@ class Services_JSON
 
                             }
 
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+                        } elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
                             // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
+                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
+                            //print("Found start of string at [$c]\n");
 
-                        } elseif (($chrs{$c} == $top['delim']) &&
+                        } elseif (($chrs[$c] == $top['delim']) &&
                                  ($top['what'] == SERVICES_JSON_IN_STR) &&
                                  (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
                             // found a quote, we're in a string, and it's not escaped
                             // we know that it's not escaped becase there is _not_ an
                             // odd number of backslashes at the end of the string so far
                             array_pop($stk);
-                            //print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+                            //print("Found end of string at [$c]: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
 
-                        } elseif (($chrs{$c} == '[') &&
+                        } elseif (($chrs[$c] == '[') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
                             // found a left-bracket, and we are in an array, object, or slice
                             array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
+                            //print("Found start of array at [$c]\n");
 
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+                        } elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
                             // found a right-bracket, and we're in an array
                             array_pop($stk);
-                            //print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found end of array at [$c]: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
-                        } elseif (($chrs{$c} == '{') &&
+                        } elseif (($chrs[$c] == '{') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
                             // found a left-brace, and we are in an array, object, or slice
                             array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
+                            //print("Found start of object at [$c]\n");
 
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+                        } elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
                             // found a right-brace, and we're in an object
                             array_pop($stk);
-                            //print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found end of object at [$c]: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                         } elseif (($substr_chrs_c_2 == '/*') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
                             // found a comment start, and we are in an array, object, or slice
                             array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
                             $c++;
-                            //print("Found start of comment at {$c}\n");
+                            //print("Found start of comment at [$c]\n");
 
                         } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
                             // found a comment end, and we're in one now
@@ -839,7 +839,7 @@ class Services_JSON
                             for ($i = $top['where']; $i <= $c; ++$i)
                                 $chrs = substr_replace($chrs, ' ', $i, 1);
 
-                            //print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found end of comment at [$c]: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                         }
 
diff --git a/plugin/sms5/_common.php b/plugin/sms5/_common.php
index 14553420b..03b90f3dd 100644
--- a/plugin/sms5/_common.php
+++ b/plugin/sms5/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/sms5/ajax.sms_emoticon.php b/plugin/sms5/ajax.sms_emoticon.php
index 12d6431e8..6007718e0 100644
--- a/plugin/sms5/ajax.sms_emoticon.php
+++ b/plugin/sms5/ajax.sms_emoticon.php
@@ -13,13 +13,14 @@ $page_size = 9;
 
 if (!$page) $page = 1;
 
-if (is_numeric($fg_no)) 
+$fg_no = isset($_REQUEST['fg_no']) ? (int) $_REQUEST['fg_no'] : 0;
+$sv = isset($_REQUEST['sv']) ? get_search_string($_REQUEST['sv']) : '';
+
+if ($fg_no) 
     $sql_group = " and fg_no='$fg_no' ";
 else
     $sql_group = "";
 
-$sv = isset($sv) ? get_search_string($sv) : '';
-
 if ($st == 'all') {
     $sql_search = "and (fo_name like '%{$sv}%' or fo_content like '%{$sv}%')";
 } else if ($st == 'name') {
@@ -71,5 +72,4 @@ $arr_ajax_msg = array(
 'total_page'=>$total_page
 );
 
-die( json_encode($arr_ajax_msg) );
-?>
\ No newline at end of file
+die( json_encode($arr_ajax_msg) );
\ No newline at end of file
diff --git a/plugin/sms5/index.php b/plugin/sms5/index.php
index 087803eb5..8979053bd 100644
--- a/plugin/sms5/index.php
+++ b/plugin/sms5/index.php
@@ -7,5 +7,4 @@ include_once(G5_PATH.'/head.sub.php');
 
 include_once("./write.php");
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/sms5/sms5.lib.php b/plugin/sms5/sms5.lib.php
index 2614223aa..1165fa82b 100644
--- a/plugin/sms5/sms5.lib.php
+++ b/plugin/sms5/sms5.lib.php
@@ -47,6 +47,12 @@ function sms5_sub_paging($write_pages, $cur_page, $total_page, $url, $add="", $s
         return "";
 }
 
+// php8 버전 호환 권한 검사 함수
+function ajax_auth_check_menu($auth, $sub_menu, $attr){
+    $check_auth = isset($auth[$sub_menu]) ? $auth[$sub_menu] : '';
+    return ajax_auth_check($check_auth, $attr);
+}
+
 // 권한 검사
 function ajax_auth_check($auth, $attr)
 {
@@ -92,7 +98,7 @@ if ( ! function_exists('get_hp')) {
         $hp = str_replace('-', '', trim($hp));
         $hp = preg_replace("/^(01[016789])([0-9]{3,4})([0-9]{4})$/", $preg, $hp);
 
-        if ($g5['sms5_demo'])
+        if (isset($g5['sms5_demo']) && $g5['sms5_demo'])
             $hp = '0100000000';
 
         return $hp;
@@ -156,10 +162,15 @@ if($config['cf_sms_type'] == 'LMS') {
         var $Log = array();
 
         function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) {
-            // EUC-KR로 변환
-            $strCaller  = iconv_euckr($strCaller);
-            $strSubject = iconv_euckr($strSubject);
-            $strData    = iconv_euckr($strData);
+            global $config;
+
+            // 아이코드 JSON 모듈은 UTF-8 을 사용하며, sms 또는 lms 는 euc-kr 로 사용한다.
+            if(! (isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'])){
+                // EUC-KR로 변환
+                $strCaller  = iconv_euckr($strCaller);
+                $strSubject = iconv_euckr($strSubject);
+                $strData    = iconv_euckr($strData);
+            }
 
             return parent::Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate, $nCount);
         }
@@ -167,7 +178,7 @@ if($config['cf_sms_type'] == 'LMS') {
         function Send() {
             global $g5;
 
-            if ($g5['sms5_demo_send']) {
+            if (isset($g5['sms5_demo_send']) && $g5['sms5_demo_send']) {
                 foreach($this->Data as $puts) {
                     if (rand(0,10)) {
                         $phone = substr($puts,26,11);
@@ -444,5 +455,4 @@ if($config['cf_sms_type'] == 'LMS') {
             return true;
         }
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/sns/_common.php b/plugin/sns/_common.php
index bad54a5d7..c7ed3c4ee 100644
--- a/plugin/sns/_common.php
+++ b/plugin/sns/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/sns/twitter/_common.php b/plugin/sns/twitter/_common.php
index 28c56e92c..dcb0f2d67 100644
--- a/plugin/sns/twitter/_common.php
+++ b/plugin/sns/twitter/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once("../../../common.php");
-?>
\ No newline at end of file
+include_once("../../../common.php");
\ No newline at end of file
diff --git a/plugin/sns/twitter/callback.php b/plugin/sns/twitter/callback.php
index 688d4ede7..d78139b6d 100644
--- a/plugin/sns/twitter/callback.php
+++ b/plugin/sns/twitter/callback.php
@@ -84,5 +84,4 @@ EOT;
 
 }
 
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
diff --git a/plugin/sns/view_comment_list.sns.skin.php b/plugin/sns/view_comment_list.sns.skin.php
index 9082eb1dc..d3df0a74d 100644
--- a/plugin/sns/view_comment_list.sns.skin.php
+++ b/plugin/sns/view_comment_list.sns.skin.php
@@ -12,4 +12,4 @@ if (!$board['bo_use_sns']) return;
 <?php } ?>
 <?php if ($list[$i]['wr_twitter_user']) { ?>
 <a href="https://www.twitter.com/<?php echo $list[$i]['wr_twitter_user']; ?>" target="_blank"><img src="<?php echo G5_SNS_URL; ?>/icon/twitter<?php echo $sns_mc_icon; ?>.png" alt="트위터에도 등록됨"></a>
-<?php } ?>
+<?php }
\ No newline at end of file
diff --git a/plugin/sns/view_comment_write.sns.skin.php b/plugin/sns/view_comment_write.sns.skin.php
index 2e03b4630..1d65b8e29 100644
--- a/plugin/sns/view_comment_write.sns.skin.php
+++ b/plugin/sns/view_comment_write.sns.skin.php
@@ -34,8 +34,10 @@ if ($config['cf_twitter_key']) {
             }
         }
         */
-        $access_token = $_SESSION['access_token'];
-        $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+        $access_token = get_session('access_token');
+        $access_oauth_token = isset($access_token['oauth_token']) ? $access_token['oauth_token'] : '';
+        $access_oauth_token_secret = isset($access_token['oauth_token_secret']) ? $access_token['oauth_token_secret'] : '';
+        $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_oauth_token, $access_oauth_token_secret);
         $content = $connection->get('account/verify_credentials');
 
         switch ($connection->http_code) {
diff --git a/plugin/social/Hybrid/Auth.php b/plugin/social/Hybrid/Auth.php
index 5642b5091..a0fc3cdf5 100644
--- a/plugin/social/Hybrid/Auth.php
+++ b/plugin/social/Hybrid/Auth.php
@@ -21,7 +21,7 @@ class Hybrid_Auth {
 	 * Configuration array
 	 * @var array
 	 */
-	public static $config = array();
+	public static $config = array('providers'=>null);
 
 	/**
 	 * Auth cache
@@ -295,7 +295,7 @@ class Hybrid_Auth {
 	public static function getConnectedProviders() {
 		$idps = array();
 
-		foreach (Hybrid_Auth::$config["providers"] as $idpid => $params) {
+		foreach ((array) Hybrid_Auth::$config["providers"] as $idpid => $params) {
 			if (Hybrid_Auth::isConnectedWith($idpid)) {
 				$idps[] = $idpid;
 			}
diff --git a/plugin/social/Hybrid/Providers/Google.php b/plugin/social/Hybrid/Providers/Google.php
index adb2d5a22..f7e9ac457 100644
--- a/plugin/social/Hybrid/Providers/Google.php
+++ b/plugin/social/Hybrid/Providers/Google.php
@@ -19,7 +19,7 @@ class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2 {
 	 * default permissions
 	 * {@inheritdoc}
 	 */
-	public $scope = "https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/plus.me https://www.googleapis.com/auth/plus.profile.emails.read https://www.google.com/m8/feeds/";
+	public $scope = "https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.google.com/m8/feeds/";
 
 	/**
 	 * {@inheritdoc}
@@ -72,35 +72,22 @@ class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2 {
 		// refresh tokens if needed
 		$this->refreshToken();
 
-		// ask google api for user infos
-		if (strpos($this->scope, '/auth/plus.profile.emails.read') !== false) {
-			$verified = $this->api->api("https://www.googleapis.com/plus/v1/people/me");
-
-			if (!isset($verified->id) || isset($verified->error))
-				$verified = new stdClass();
-		} else {
-			$verified = $this->api->api("https://www.googleapis.com/plus/v1/people/me/openIdConnect");
-
-			if (!isset($verified->sub) || isset($verified->error))
-				$verified = new stdClass();
-		}
-
-		$response = $this->api->api("https://www.googleapis.com/plus/v1/people/me");
-		if (!isset($response->id) || isset($response->error)) {
+		$response = $this->api->api("https://www.googleapis.com/oauth2/v3/userinfo");
+		if (!isset($response->sub) || isset($response->error)) {
 			throw new Exception("User profile request failed! {$this->providerId} returned an invalid response:" . Hybrid_Logger::dumpData( $response ), 6);
 		}
 
-		$this->user->profile->identifier = (property_exists($verified, 'id')) ? $verified->id : ((property_exists($response, 'id')) ? $response->id : "");
-		$this->user->profile->firstName = (property_exists($response, 'name')) ? $response->name->givenName : "";
-		$this->user->profile->lastName = (property_exists($response, 'name')) ? $response->name->familyName : "";
-		$this->user->profile->displayName = (property_exists($response, 'displayName')) ? $response->displayName : "";
-		$this->user->profile->photoURL = (property_exists($response, 'image')) ? ((property_exists($response->image, 'url')) ? substr($response->image->url, 0, -2) . "200" : '') : '';
-		$this->user->profile->profileURL = (property_exists($response, 'url')) ? $response->url : "";
-		$this->user->profile->description = (property_exists($response, 'aboutMe')) ? $response->aboutMe : "";
+		$this->user->profile->identifier = (property_exists($response, 'sub')) ? $response->sub : "";
+		$this->user->profile->firstName = (property_exists($response, 'given_name')) ? $response->given_name : "";
+		$this->user->profile->lastName = (property_exists($response, 'family_name')) ? $response->family_name : "";
+		$this->user->profile->displayName = (property_exists($response, 'name')) ? $response->name : "";
+		$this->user->profile->photoURL = (property_exists($response, 'picture')) ? $response->picture : "";
+		$this->user->profile->profileURL = (property_exists($response, 'profile')) ? $response->profile : "";
 		$this->user->profile->gender = (property_exists($response, 'gender')) ? $response->gender : "";
-		$this->user->profile->language = (property_exists($response, 'locale')) ? $response->locale : ((property_exists($verified, 'locale')) ? $verified->locale : "");
-		$this->user->profile->email = (property_exists($response, 'email')) ? $response->email : ((property_exists($verified, 'email')) ? $verified->email : "");
-		$this->user->profile->emailVerified = (property_exists($verified, 'email')) ? $verified->email : "";
+		$this->user->profile->language = (property_exists($response, 'locale')) ? $response->locale : "";
+		$this->user->profile->email = (property_exists($response, 'email')) ? $response->email : "";
+		$this->user->profile->emailVerified = (property_exists($response, 'email_verified')) ? ($response->email_verified === true || $response->email_verified === 1 ? $response->email : "") : "";
+        
 		if (property_exists($response, 'emails')) {
 			if (count($response->emails) == 1) {
 				$this->user->profile->email = $response->emails[0]->value;
@@ -125,69 +112,6 @@ class Hybrid_Providers_Google extends Hybrid_Provider_Model_OAuth2 {
 				}
 			}
 		}
-		$this->user->profile->phone = (property_exists($response, 'phone')) ? $response->phone : "";
-		$this->user->profile->country = (property_exists($response, 'country')) ? $response->country : "";
-		$this->user->profile->region = (property_exists($response, 'region')) ? $response->region : "";
-		$this->user->profile->zip = (property_exists($response, 'zip')) ? $response->zip : "";
-		if (property_exists($response, 'placesLived')) {
-			$this->user->profile->city = "";
-			$this->user->profile->address = "";
-			foreach ($response->placesLived as $c) {
-				if (property_exists($c, 'primary')) {
-					if ($c->primary == true) {
-						$this->user->profile->address = $c->value;
-						$this->user->profile->city = $c->value;
-						break;
-					}
-				} else {
-					if (property_exists($c, 'value')) {
-						$this->user->profile->address = $c->value;
-						$this->user->profile->city = $c->value;
-					}
-				}
-			}
-		}
-
-		// google API returns multiple urls, but a "website" only if it is verified
-		// see http://support.google.com/plus/answer/1713826?hl=en
-		if (property_exists($response, 'urls')) {
-			foreach ($response->urls as $u) {
-				if (property_exists($u, 'primary') && $u->primary == true)
-					$this->user->profile->webSiteURL = $u->value;
-			}
-		} else {
-			$this->user->profile->webSiteURL = '';
-		}
-		// google API returns age ranges min and/or max as of https://developers.google.com/+/web/api/rest/latest/people#resource
-		if (property_exists($response, 'ageRange')) {
-			if (property_exists($response->ageRange, 'min') && property_exists($response->ageRange, 'max')) {
-				$this->user->profile->age = $response->ageRange->min . ' - ' . $response->ageRange->max;
-			} else {
-				if (property_exists($response->ageRange, 'min')) {
-					$this->user->profile->age = '>= ' . $response->ageRange->min;
-				} else {
-					if (property_exists($response->ageRange, 'max')) {
-						$this->user->profile->age = '<= ' . $response->ageRange->max;
-					} else {
-						$this->user->profile->age = '';
-					}
-				}
-			}
-		} else {
-			$this->user->profile->age = '';
-		}
-		// google API returns birthdays only if a user set 'show in my account'
-		if (property_exists($response, 'birthday')) {
-			list($birthday_year, $birthday_month, $birthday_day) = explode('-', $response->birthday);
-
-			$this->user->profile->birthDay = (int) $birthday_day;
-			$this->user->profile->birthMonth = (int) $birthday_month;
-			$this->user->profile->birthYear = (int) $birthday_year;
-		} else {
-			$this->user->profile->birthDay = 0;
-			$this->user->profile->birthMonth = 0;
-			$this->user->profile->birthYear = 0;
-		}
 
         $this->user->profile->sid         = get_social_convert_id( $this->user->profile->identifier, $this->providerId );
 
diff --git a/plugin/social/Hybrid/Providers/Payco.php b/plugin/social/Hybrid/Providers/Payco.php
index c0bb45480..ffa03301a 100644
--- a/plugin/social/Hybrid/Providers/Payco.php
+++ b/plugin/social/Hybrid/Providers/Payco.php
@@ -13,35 +13,35 @@
  */
 class Hybrid_Providers_Payco extends Hybrid_Provider_Model_OAuth2 {
 
-	private $idNo;
+    private $idNo;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	function initialize() {
+    /**
+     * {@inheritdoc}
+     */
+    function initialize() {
 
         parent::initialize();
 
-		// Provider API end-points
+        // Provider API end-points
         $this->api->api_base_url  = 'https://id.payco.com/oauth2.0/';
         $this->api->authorize_url = 'https://id.payco.com/oauth2.0/authorize';
         $this->api->token_url     = 'https://id.payco.com/oauth2.0/token';
         $this->api->token_info   = 'https://apis3.krp.toastoven.net/payco/friends/getIdNoByFriendsToken.json';
-        $this->api->profile_url   = 'https://apis3.krp.toastoven.net/payco/friends/getMemberProfileByFriendsToken.json';
+        $this->api->profile_url   = 'https://apis-payco.krp.toastoven.net/payco/friends/find_member_v2.json';
 
-		if (!$this->config["keys"]["id"] || !$this->config["keys"]["secret"]) {
-			throw new Exception("Your application id and secret are required in order to connect to {$this->providerId}.", 4);
-		}
+        if (!$this->config["keys"]["id"] || !$this->config["keys"]["secret"]) {
+            throw new Exception("Your application id and secret are required in order to connect to {$this->providerId}.", 4);
+        }
 
-		// redirect uri mismatches when authenticating with Payco.
-		if (isset($this->config['redirect_uri']) && !empty($this->config['redirect_uri'])) {
-			$this->api->redirect_uri = $this->config['redirect_uri'];
-		}
-	}
-	/**
-	 * {@inheritdoc}
-	 */
-	function loginBegin() {
+        // redirect uri mismatches when authenticating with Payco.
+        if (isset($this->config['redirect_uri']) && !empty($this->config['redirect_uri'])) {
+            $this->api->redirect_uri = $this->config['redirect_uri'];
+        }
+    }
+    /**
+     * {@inheritdoc}
+     */
+    function loginBegin() {
         
         $token = md5(uniqid(mt_rand(), true));
         Hybrid_Auth::storage()->set('payco_auth_token', $token);
@@ -59,16 +59,16 @@ class Hybrid_Providers_Payco extends Hybrid_Provider_Model_OAuth2 {
 
         exit;
 
-	}
-	/**
-	 * {@inheritdoc}
-	 */
-	function loginFinish() {
+    }
+    /**
+     * {@inheritdoc}
+     */
+    function loginFinish() {
 
-		// in case we get error_reason=user_denied&error=access_denied
-		if (isset($_REQUEST['error']) && $_REQUEST['error'] == "access_denied") {
-			throw new Exception("Authentication failed! The user denied your request.", 5);
-		}
+        // in case we get error_reason=user_denied&error=access_denied
+        if (isset($_REQUEST['error']) && $_REQUEST['error'] == "access_denied") {
+            throw new Exception("Authentication failed! The user denied your request.", 5);
+        }
         
         // try to authenicate user
         $code = (array_key_exists('code', $_REQUEST)) ? $_REQUEST['code'] : "";
@@ -91,7 +91,7 @@ class Hybrid_Providers_Payco extends Hybrid_Provider_Model_OAuth2 {
         
         $this->setUserConnected();
 
-	}
+    }
 
     function check_valid_access_token(){
 
@@ -121,33 +121,33 @@ class Hybrid_Providers_Payco extends Hybrid_Provider_Model_OAuth2 {
         return false;
     }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	function logout() {
-		parent::logout();
-	}
-	/**
-	 * {@inheritdoc}
-	 */
+    /**
+     * {@inheritdoc}
+     */
+    function logout() {
+        parent::logout();
+    }
+    /**
+     * {@inheritdoc}
+     */
 
     /**
     * set propper headers
     */
-	function getUserProfile() {
+    function getUserProfile() {
 
         $data = null;
 
-		// request user profile
-		try {
-            
+        // request user profile
+        try {
+
             if( $this->check_valid_access_token() ){
                 $params = array(
                     'body' => array(
-                        'client_id'=>$this->api->client_id, 
-                        'access_token'=>$this->api->access_token,
-                        'MemberProfile'=>'idNo,id,name',
-                        'idNo'=>$this->idNo,
+                    'client_id'=>$this->api->client_id, 
+                    'access_token'=>$this->api->access_token,
+                    'MemberProfile'=>'idNo,id,name',
+                    'idNo'=>$this->idNo,
                     ),
                 );
 
@@ -161,52 +161,62 @@ class Hybrid_Providers_Payco extends Hybrid_Provider_Model_OAuth2 {
                 $response = $this->api->api( $this->api->profile_url, 'POST', $params );
             }
 
-		} catch (Exception $e) {
-			throw new Exception("User profile request failed! {$this->providerId} returned an error: {$e->getMessage()}", 6, $e);
-		}
-        
+        } catch (Exception $e) {
+            throw new Exception("User profile request failed! {$this->providerId} returned an error: {$e->getMessage()}", 6, $e);
+        }
+
         if( ! is_object($response) || property_exists($response, 'error_code') ){
             $this->logout();
 
             throw new Exception( "Authentication failed! {$this->providerId} returned an invalid access token.", 5 );
         }
 
+        $data = array();
+
         if( is_object($response) ){
             $result = json_decode(json_encode($response), true);
-            $data = $result['memberProfile'];
+
+            // 성공이면
+            if(isset($result['header']) && isset($result['header']['isSuccessful']) && $result['header']['isSuccessful']){
+            $data = $result['data']['member'];
+            }
         }
 
-		// if the provider identifier is not received, we assume the auth has failed
-		if (!isset($data["id"])) {
+        // if the provider identifier is not received, we assume the auth has failed
+        if (!isset($data["idNo"])) {
             $this->logout();
-			throw new Exception("User profile request failed! {$this->providerId} api returned an invalid response: " . Hybrid_Logger::dumpData( $data ), 6);
-		}
+            throw new Exception("User profile request failed! {$this->providerId} api returned an invalid response: " . Hybrid_Logger::dumpData( $data ), 6);
+        }
 
-		# store the user profile.
-		$this->user->profile->identifier = (array_key_exists('idNo', $data)) ? $data['idNo'] : "";
-		$this->user->profile->username = (array_key_exists('name', $data)) ? $data['name'] : "";
-		$this->user->profile->displayName = (array_key_exists('name', $data)) ? $data['name'] : "";
+        # store the user profile.
+        $this->user->profile->identifier = (array_key_exists('idNo', $data)) ? $data['idNo'] : "";
+        $this->user->profile->username = (array_key_exists('name', $data)) ? $data['name'] : "";
+        $this->user->profile->displayName = (array_key_exists('name', $data)) ? $data['name'] : "";
         $this->user->profile->age = (array_key_exists('ageGroup', $data)) ? $data['ageGroup'] : "";
+        $this->user->profile->hp = (array_key_exists('mobile', $data)) ? $data['mobile'] : "";
 
         include_once(G5_LIB_PATH.'/register.lib.php');
 
         $payco_no = substr(base_convert($this->user->profile->identifier, 16, 36), 0, 16);
-		$email = (array_key_exists('id', $data)) ? $data['id'] : "";
+        //$email = (array_key_exists('id', $data)) ? $data['id'] : "";
 
-		$this->user->profile->gender = (array_key_exists('sexCode', $data)) ? $data['sexCode'] : "";
+        $email = (array_key_exists('email', $data)) ? $data['email'] : "";
 
-		$this->user->profile->email = ! valid_mb_email($email) ? $email : "";
-		$this->user->profile->emailVerified = ! valid_mb_email($email) ? $email : "";
+        //$this->user->profile->gender = (array_key_exists('sexCode', $data)) ? $data['sexCode'] : "";
+
+        $this->user->profile->gender = (array_key_exists('genderCode', $data)) ? strtolower($data['genderCode']) : "";
+        $this->user->profile->email = ! valid_mb_email($email) ? $email : "";
+        $this->user->profile->emailVerified = ! valid_mb_email($email) ? $email : "";
 
 
-		if (array_key_exists('birthdayMMdd', $data)) {
-			$this->user->profile->birthMonth = substr($data['birthdayMMdd'], 0, 2);
-			$this->user->profile->birthDay = substr($data['birthdayMMdd'], 2, 4);
-		}
+        if (array_key_exists('birthdayMMdd', $data)) {
+            $this->user->profile->birthMonth = substr($data['birthdayMMdd'], 0, 2);
+            $this->user->profile->birthDay = substr($data['birthdayMMdd'], 2, 4);
+        }
 
         $this->user->profile->sid         = get_social_convert_id( $this->user->profile->identifier, $this->providerId );
 
-		return $this->user->profile;
-	}   //end function getUserProfile
+        return $this->user->profile;
+    }   //end function getUserProfile
 
 }
\ No newline at end of file
diff --git a/plugin/social/Hybrid/Providers/Twitter.php b/plugin/social/Hybrid/Providers/Twitter.php
index cb1c1706b..f98c577b2 100644
--- a/plugin/social/Hybrid/Providers/Twitter.php
+++ b/plugin/social/Hybrid/Providers/Twitter.php
@@ -2,8 +2,8 @@
 
 /* !
  * HybridAuth
- * http://hybridauth.sourceforge.net | http://github.com/hybridauth/hybridauth
- * (c) 2009-2012, HybridAuth authors | http://hybridauth.sourceforge.net/licenses.html
+ * https://hybridauth.sourceforge.net | https://github.com/hybridauth/hybridauth
+ * (c) 2009-2012, HybridAuth authors | https://hybridauth.sourceforge.net/licenses.html
  */
 
 /**
@@ -127,7 +127,7 @@ class Hybrid_Providers_Twitter extends Hybrid_Provider_Model_OAuth1 {
 		$this->user->profile->description = (property_exists($response, 'description')) ? $response->description : "";
 		$this->user->profile->firstName = (property_exists($response, 'name')) ? $response->name : "";
 		$this->user->profile->photoURL = (property_exists($response, 'profile_image_url')) ? (str_replace('_normal', '', $response->profile_image_url)) : "";
-		$this->user->profile->profileURL = (property_exists($response, 'screen_name')) ? ("http://twitter.com/" . $response->screen_name) : "";
+		$this->user->profile->profileURL = (property_exists($response, 'screen_name')) ? ("https://twitter.com/" . $response->screen_name) : "";
 		$this->user->profile->webSiteURL = (property_exists($response, 'url')) ? $response->url : "";
 		$this->user->profile->region = (property_exists($response, 'location')) ? $response->location : "";
 		if($includeEmail) $this->user->profile->email = (property_exists($response, 'email')) ? $response->email : "";
@@ -174,7 +174,7 @@ class Hybrid_Providers_Twitter extends Hybrid_Provider_Model_OAuth1 {
 
 					$uc->identifier = (property_exists($item, 'id')) ? $item->id : "";
 					$uc->displayName = (property_exists($item, 'name')) ? $item->name : "";
-					$uc->profileURL = (property_exists($item, 'screen_name')) ? ("http://twitter.com/" . $item->screen_name) : "";
+					$uc->profileURL = (property_exists($item, 'screen_name')) ? ("https://twitter.com/" . $item->screen_name) : "";
 					$uc->photoURL = (property_exists($item, 'profile_image_url')) ? $item->profile_image_url : "";
 					$uc->description = (property_exists($item, 'description')) ? $item->description : "";
 
@@ -254,7 +254,7 @@ class Hybrid_Providers_Twitter extends Hybrid_Provider_Model_OAuth1 {
 
 			$ua->user->identifier = (property_exists($item->user, 'id')) ? $item->user->id : "";
 			$ua->user->displayName = (property_exists($item->user, 'name')) ? $item->user->name : "";
-			$ua->user->profileURL = (property_exists($item->user, 'screen_name')) ? ("http://twitter.com/" . $item->user->screen_name) : "";
+			$ua->user->profileURL = (property_exists($item->user, 'screen_name')) ? ("https://twitter.com/" . $item->user->screen_name) : "";
 			$ua->user->photoURL = (property_exists($item->user, 'profile_image_url')) ? $item->user->profile_image_url : "";
 
 			$activities[] = $ua;
diff --git a/plugin/social/Hybrid/thirdparty/OAuth/OAuth.php b/plugin/social/Hybrid/thirdparty/OAuth/OAuth.php
index 876665fae..214784213 100644
--- a/plugin/social/Hybrid/thirdparty/OAuth/OAuth.php
+++ b/plugin/social/Hybrid/thirdparty/OAuth/OAuth.php
@@ -103,7 +103,7 @@ abstract class OAuthSignatureMethod {
     // Avoid a timing leak with a (hopefully) time insensitive compare
     $result = 0;
     for ($i = 0; $i < strlen($signature); $i++) {
-      $result |= ord($built{$i}) ^ ord($signature{$i});
+      $result |= ord($built[$i]) ^ ord($signature[$i]);
     }
 
     return $result == 0;
diff --git a/plugin/social/_common.php b/plugin/social/_common.php
index bad54a5d7..c7ed3c4ee 100644
--- a/plugin/social/_common.php
+++ b/plugin/social/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/social/error.php b/plugin/social/error.php
index 13aa20acf..28a8b11ab 100644
--- a/plugin/social/error.php
+++ b/plugin/social/error.php
@@ -6,7 +6,7 @@ if (!defined('_GNUBOARD_')) exit;
 		<meta name="robots" content="NOINDEX, NOFOLLOW">
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=yes">
-		<title>소셜 로그인 - <?php echo $provider; ?></title>
+		<title>소셜 로그인 - <?php echo isset($provider) ? $provider : ''; ?></title>
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
         <style>
@@ -28,7 +28,7 @@ if (!defined('_GNUBOARD_')) exit;
 	</head>
 	<body>
         <div class="error-container">
-            <h4>Error : <?php echo $code; ?></h4>
+            <h4>Error : <?php echo isset($code) ? $code : ''; ?></h4>
             <div class="alert alert-danger" role="alert">
               <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
               <span class="sr-only">Error:</span>
@@ -64,5 +64,4 @@ if (!defined('_GNUBOARD_')) exit;
     </script>
 </html>
 <?php
-die();
-?>
\ No newline at end of file
+die();
\ No newline at end of file
diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php
index 50fb6af81..fb8b11c4e 100644
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@@ -44,11 +44,11 @@ function get_social_convert_id($identifier, $service)
     return strtolower($service).'_'.hash('adler32', md5($identifier));
 }
 
-function get_social_callbackurl($provider, $no_domain=false){
+function get_social_callbackurl($provider, $no_domain=false, $no_params=false){
 
     $base_url = G5_SOCIAL_LOGIN_BASE_URL;
 
-    if ( $provider === 'twitter' ){
+    if ( $provider === 'twitter' || ($provider === 'payco' && $no_params) ){
         return $base_url;
     }
 
@@ -86,7 +86,7 @@ function social_login_get_provider_adapter( $provider )
 		include_once G5_SOCIAL_LOGIN_PATH . "/Hybrid/Auth.php";
 	}
 
-    if( ! is_object($g5['hybrid_auth']) ){
+    if( ! (isset($g5['hybrid_auth']) && is_object($g5['hybrid_auth'])) ){
         $setting = social_build_provider_config($provider);
         $g5['hybrid_auth'] = new Hybrid_Auth( $setting );
     }
@@ -121,7 +121,7 @@ function social_before_join_check($url=''){
 
             $row = sql_fetch($sql);
 
-            if( $row['provider'] ){
+            if( isset($row['provider']) && $row['provider'] ){
                 $is_exist = true;
 
                 $time = time() - (86400 * (int) G5_SOCIAL_DELETE_DAY);
@@ -322,7 +322,7 @@ function social_extends_get_keys($provider){
                     "keys" => array("id" => $config['cf_facebook_appid'], "secret" => $config['cf_facebook_secret']),
                     "display"   =>  "popup",
                     "redirect_uri" => get_social_callbackurl('facebook'),
-                    "scope"   => array('email'), // optional
+                    "scope"   => 'email', // optional
                     "trustForwarded" => false
                 );
 
@@ -332,9 +332,12 @@ function social_extends_get_keys($provider){
                     "keys" => array("id" => $config['cf_google_clientid'],
                     "secret" => $config['cf_google_secret']),
                     "redirect_uri" => get_social_callbackurl('google'),
+                    "scope"   => "https://www.googleapis.com/auth/userinfo.profile "."https://www.googleapis.com/auth/userinfo.email",
+                    /*
                     "scope"   => "https://www.googleapis.com/auth/plus.login ". // optional
                                     "https://www.googleapis.com/auth/plus.me ". // optional
                                     "https://www.googleapis.com/auth/plus.profile.emails.read", // optional
+                    */
                     //"access_type"     => "offline",   // optional
                     //"approval_prompt" => "force",     // optional
                 );
@@ -356,7 +359,7 @@ function social_extends_get_keys($provider){
                 );
     }
 
-    return $r[$provider];
+    return isset($r[$provider]) ? $r[$provider] : array();
 }
 
 function social_escape_request($request){
@@ -491,7 +494,7 @@ function social_check_login_before($p_service=''){
         {
             $get_error = social_get_error_msg( $e->getCode() );
 
-            if( is_object( $adapter ) ){
+            if( isset($adapter) && is_object( $adapter ) ){
                 $adapter->logout();
             }
 
@@ -1026,7 +1029,7 @@ function social_get_nonce($key=''){
 
         $setting = social_build_provider_config($key);
         try{
-            return sha1($setting['providers'][$key]['secret']);
+            return isset($setting['providers'][$key]['secret']) ? sha1($setting['providers'][$key]['secret']) : '';
         } catch(Exception $e) {
             return '';
         }
@@ -1057,5 +1060,4 @@ function social_nonce_is_valid( $nonce , $action = '' , $user='' , $provider = '
 function social_nonce_generate_hash( $action='' , $user='', $provider = '' ){
     $i = ceil( time() / ( social_get_nonce('d') / 2 ) );
     return md5( $i . $action . $user . social_get_nonce($provider) );
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/social/includes/g5_endpoint.php b/plugin/social/includes/g5_endpoint.php
index 0eda8063a..5a168a683 100644
--- a/plugin/social/includes/g5_endpoint.php
+++ b/plugin/social/includes/g5_endpoint.php
@@ -27,6 +27,4 @@ class G5_Hybrid_Authentication {
         G5_Hybrid_Endpoint::process();
     }
 
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/social/includes/g5_endpoint_class.php b/plugin/social/includes/g5_endpoint_class.php
index 29c8f4304..95d085b8d 100644
--- a/plugin/social/includes/g5_endpoint_class.php
+++ b/plugin/social/includes/g5_endpoint_class.php
@@ -28,5 +28,4 @@ class G5_Hybrid_Endpoint extends Hybrid_Endpoint
         include_once(G5_SOCIAL_LOGIN_PATH.'/error.php');
         die();
     }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/social/includes/loading.php b/plugin/social/includes/loading.php
index 61a428427..df4f234db 100644
--- a/plugin/social/includes/loading.php
+++ b/plugin/social/includes/loading.php
@@ -64,5 +64,4 @@ if (!defined('_GNUBOARD_')) exit;
 	</body>
 </html>
 <?php
-die();
-?>
\ No newline at end of file
+die();
\ No newline at end of file
diff --git a/plugin/social/includes/providers.php b/plugin/social/includes/providers.php
index ce196085b..e3ec2d8be 100644
--- a/plugin/social/includes/providers.php
+++ b/plugin/social/includes/providers.php
@@ -239,6 +239,4 @@ $social_providers_config = array(
 
 		"cat"               => "misc",
 	),
-);
-
-?>
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/plugin/social/popup.php b/plugin/social/popup.php
index 4946df8be..eeb2a4e38 100644
--- a/plugin/social/popup.php
+++ b/plugin/social/popup.php
@@ -40,5 +40,4 @@ if( isset( $_REQUEST["redirect_to_idp"] ) ){
 } else {
     social_login_session_clear(1);
     social_return_from_provider_page( $provider_name, '', '', '', '' );
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/social/register_member.php b/plugin/social/register_member.php
index 60ec6ea8f..45662b631 100644
--- a/plugin/social/register_member.php
+++ b/plugin/social/register_member.php
@@ -26,6 +26,11 @@ $user_nick = social_relace_nick($user_profile->displayName);
 $user_email = isset($user_profile->emailVerified) ? $user_profile->emailVerified : $user_profile->email;
 $user_id = $user_profile->sid ? preg_replace("/[^0-9a-z_]+/i", "", $user_profile->sid) : get_social_convert_id($user_profile->identifier, $provider_name);
 
+if(! $user_nick) {
+    $tmp = explode('_', $user_id);
+    $user_nick = $tmp[1];
+}
+
 //$is_exists_id = exist_mb_id($user_id);
 //$is_exists_name = exist_mb_nick($user_nick, '');
 $user_id = exist_mb_id_recursive($user_id);
@@ -46,8 +51,8 @@ $login_action_url = G5_HTTPS_BBS_URL."/login_check.php";
 $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", G5_SERVER_TIME - ($config['cf_nick_modify'] * 86400)));
 $required = ($w=='') ? 'required' : '';
 $readonly = ($w=='u') ? 'readonly' : '';
+$login_url = '';
 
 include_once(get_social_skin_path().'/social_register_member.skin.php');
 
-include_once(G5_BBS_PATH.'/_tail.php');
-?>
+include_once(G5_BBS_PATH.'/_tail.php');
\ No newline at end of file
diff --git a/plugin/social/register_member_update.php b/plugin/social/register_member_update.php
index 23b412fc9..38e8416bb 100644
--- a/plugin/social/register_member_update.php
+++ b/plugin/social/register_member_update.php
@@ -21,12 +21,12 @@ if( ! $user_profile ){
 $is_exists_social_account = social_before_join_check(G5_URL);
 
 $sm_id = $user_profile->sid;
-$mb_id = trim($_POST['mb_id']);
-$mb_password    = trim($_POST['mb_password']);
-$mb_password_re = trim($_POST['mb_password_re']);
-$mb_nick        = trim(strip_tags($_POST['mb_nick']));
-$mb_email       = trim($_POST['mb_email']);
-$mb_name        = clean_xss_tags(trim(strip_tags($_POST['mb_name'])));
+$mb_id = isset($_POST['mb_id']) ? trim($_POST['mb_id']) : '';
+$mb_password    = isset($_POST['mb_password']) ? trim($_POST['mb_password']) : '';
+$mb_password_re = isset($_POST['mb_password_re']) ? trim($_POST['mb_password_re']) : '';
+$mb_nick        = isset($_POST['mb_nick']) ? trim(strip_tags($_POST['mb_nick'])) : '';
+$mb_email       = isset($_POST['mb_email']) ? trim($_POST['mb_email']) : '';
+$mb_name        = isset($_POST['mb_name']) ? clean_xss_tags(trim(strip_tags($_POST['mb_name']))) : '';
 $mb_email       = get_email_address($mb_email);
 
 // 이름, 닉네임에 utf-8 이외의 문자가 포함됐다면 오류
@@ -193,5 +193,4 @@ if($result) {
 
     alert('회원 가입 오류!', G5_URL );
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/social/unlink.php b/plugin/social/unlink.php
index 5d20bebe4..ca4b4cdfe 100644
--- a/plugin/social/unlink.php
+++ b/plugin/social/unlink.php
@@ -44,5 +44,4 @@ if( $row['mp_no'] ){
 
     die("{\"error\":\"잘못된 요청입니다.\"}");
 
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/plugin/syndi/_common.php b/plugin/syndi/_common.php
index 14553420b..03b90f3dd 100644
--- a/plugin/syndi/_common.php
+++ b/plugin/syndi/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/plugin/syndi/ping.php b/plugin/syndi/ping.php
index ff869b876..ea1e6cfd1 100644
--- a/plugin/syndi/ping.php
+++ b/plugin/syndi/ping.php
@@ -61,5 +61,4 @@ echo "<entry>\n";
     echo "<summary type=\"text\"><![CDATA[{$summary}]]></summary>\n";
     echo "<category term=\"{$bo_table}\" label=\"{$link_title}\" />\n";
 echo "</entry>\n";
-echo "</feed>";
-?>
\ No newline at end of file
+echo "</feed>";
\ No newline at end of file
diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css
index d01e37c74..0cf2d24d8 100644
--- a/skin/board/basic/style.css
+++ b/skin/board/basic/style.css
@@ -1,89 +1,5 @@
 @charset "utf-8";
 
-/* 게시판 버튼 */
-/* 목록 버튼 */
-#bo_list a.btn_b01 {}
-#bo_list a.btn_b01:focus, #bo_list a.btn_b01:hover {}
-#bo_list a.btn_b02 {}
-#bo_list a.btn_b02:focus, #bo_list a.btn_b02:hover {}
-#bo_list a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_list a.btn_admin:focus, #bo_list .btn_admin:hover {}
-
-/* 읽기 버튼 */
-#bo_v a.btn_b01 {}
-#bo_v a.btn_b01:focus, #bo_v a.btn_b01:hover {}
-#bo_v a.btn_b02 {}
-#bo_v a.btn_b02:focus, #bo_v a.btn_b02:hover {}
-#bo_v a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_v a.btn_admin:focus, #bo_v a.btn_admin:hover {}
-
-/* 쓰기 버튼 */
-#bo_w .btn_confirm {} /* 서식단계 진행 */
-#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
-#bo_w button.btn_submit {}
-#bo_w fieldset .btn_submit {}
-#bo_w .btn_cancel {font-size:1.167em;border-radius:3px}
-#bo_w button.btn_cancel {}
-#bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {}
-#bo_w a.btn_frmline, #bo_w button.btn_frmline {} /* 우편번호검색버튼 등 */
-#bo_w button.btn_frmline {}
-
-/* 기본 테이블 */
-/* 목록 테이블 */
-#bo_list .tbl_head01 {}
-#bo_list .tbl_head01 caption {}
-#bo_list .tbl_head01 thead th {}
-#bo_list .tbl_head01 thead a {}
-#bo_list .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-#bo_list .tbl_head01 tfoot th {}
-#bo_list .tbl_head01 tfoot td {}
-#bo_list .tbl_head01 tbody th {}
-#bo_list .tbl_head01 td {}
-#bo_list .tbl_head01 a {}
-#bo_list td.empty_table {}
-#bo_list tbody .even td {background:#fbfbfb}
-
-/* 읽기 내 테이블 */
-#bo_v .tbl_head01 {}
-#bo_v .tbl_head01 caption {}
-#bo_v .tbl_head01 thead th {}
-#bo_v .tbl_head01 thead a {}
-#bo_v .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-#bo_v .tbl_head01 tfoot th {}
-#bo_v .tbl_head01 tfoot td {}
-#bo_v .tbl_head01 tbody th {}
-#bo_v .tbl_head01 td {}
-#bo_v .tbl_head01 a {}
-#bo_v td.empty_table {}
-
-/* 쓰기 테이블 */
-#bo_w table {}
-#bo_w caption {}
-#bo_w .frm_info {}
-#bo_w .frm_address {}
-#bo_w .frm_file {}
-
-#bo_w .tbl_frm01 {}
-#bo_w .tbl_frm01 th {}
-#bo_w .tbl_frm01 td {}
-#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {}
-#bo_w .tbl_frm01 textarea {}
-#bo_w .tbl_frm01 a {}
-
-/* 필수입력 */
-#bo_w .required, #bo_w textarea.required {}
-
-#bo_w .cke_sc {}
-#bo_w button.btn_cke_sc {}
-#bo_w .cke_sc_def {}
-#bo_w .cke_sc_def dl {}
-#bo_w .cke_sc_def dl:after {}
-#bo_w .cke_sc_def dt, #bo_w .cke_sc_def dd {}
-#bo_w .cke_sc_def dt {}
-#bo_w .cke_sc_def dd {}
-
-/* ### 기본 스타일 커스터마이징 끝 ### */
-
 /* 게시판 목록 */
 #bo_list {position:relative;margin-bottom:20px}
 #bo_list:after {display:block;visibility:hidden;clear:both;content:""}
@@ -103,6 +19,7 @@
 #bo_list .txt_expired {color:#ccc}
 #bo_list tbody tr {border-left:2px solid transparent}
 #bo_list tbody tr:hover {border-left:2px solid #253dbe}
+#bo_list tbody .even td {background:#fbfbfb}
 
 #bo_cate {margin:25px 0}
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
@@ -419,4 +336,6 @@ box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1)}
 #bo_w .bo_w_flie .file_wr {position:relative;border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;height:40px;margin:0}
 #bo_w .bo_w_flie .frm_input {margin:10px 0 0}
 #bo_w .bo_w_flie .file_del {position:absolute;top:10px;right:10px;font-size:0.92em;color:#7d7d7d}
-#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
\ No newline at end of file
+#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
+#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
+#bo_w .btn_cancel {border-radius:3px;font-size:1.167em}
\ No newline at end of file
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index 56cf28a20..ffe1ef78f 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -93,8 +93,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
 
             echo "</div>\n";
@@ -161,7 +161,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
             <li>
                	<i class="fa fa-folder-open" aria-hidden="true"></i>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <strong><?php echo $view['file'][$i]['source'] ?></strong> <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
                 </a>
                 <br>
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index a7dea635f..a9c0bf444 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -37,24 +37,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         </div>
 
         <ul class="btn_bo_user">
-        	<?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
+            <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
             <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01 btn" title="RSS"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
             <li>
-            	<button type="button" class="btn_bo_sch btn_b01 btn" title="게시판 검색"><i class="fa fa-search" aria-hidden="true"></i><span class="sound_only">게시판 검색</span></button> 
+                <button type="button" class="btn_bo_sch btn_b01 btn" title="게시판 검색"><i class="fa fa-search" aria-hidden="true"></i><span class="sound_only">게시판 검색</span></button> 
             </li>
             <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01 btn" title="글쓰기"><i class="fa fa-pencil" aria-hidden="true"></i><span class="sound_only">글쓰기</span></a></li><?php } ?>
-        	<?php if ($is_admin == 'super' || $is_auth) {  ?>
-        	<li>
-        		<button type="button" class="btn_more_opt is_list_btn btn_b01 btn" title="게시판 리스트 옵션"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
-        		<?php if ($is_checkbox) { ?>	
-		        <ul class="more_opt is_list_btn">  
-		            <li><button type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"><i class="fa fa-trash-o" aria-hidden="true"></i> 선택삭제</button></li>
-		            <li><button type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"><i class="fa fa-files-o" aria-hidden="true"></i> 선택복사</button></li>
-		            <li><button type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"><i class="fa fa-arrows" aria-hidden="true"></i> 선택이동</button></li>
-		        </ul>
-		        <?php } ?>
-        	</li>
-        	<?php }  ?>
+            <?php if ($is_admin == 'super' || $is_auth) {  ?>
+            <li>
+                <button type="button" class="btn_more_opt is_list_btn btn_b01 btn" title="게시판 리스트 옵션"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
+                <?php if ($is_checkbox) { ?>    
+                <ul class="more_opt is_list_btn">  
+                    <li><button type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"><i class="fa fa-trash-o" aria-hidden="true"></i> 선택삭제</button></li>
+                    <li><button type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"><i class="fa fa-files-o" aria-hidden="true"></i> 선택복사</button></li>
+                    <li><button type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"><i class="fa fa-arrows" aria-hidden="true"></i> 선택이동</button></li>
+                </ul>
+                <?php } ?>
+            </li>
+            <?php }  ?>
         </ul>
     </div>
     <!-- } 게시판 페이지 정보 및 버튼 끝 -->
@@ -62,9 +62,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php if ($is_checkbox) { ?>
     <div id="gall_allchk" class="all_chk chk_box">
         <input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);" class="selec_chk">
-    	<label for="chkall">
-        	<span></span>
-        	<b class="sound_only">현재 페이지 게시물 </b> 전체선택
+        <label for="chkall">
+            <span></span>
+            <b class="sound_only">현재 페이지 게시물 </b> 전체선택
         </label>
     </div>
     <?php } ?>
@@ -84,40 +84,42 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             if( $wr_id && $wr_id == $list[$i]['wr_id'] ){
                 $classes[] = 'gall_now';
             }
+
+            $line_height_style = ($board['bo_gallery_height'] > 0) ? 'line-height:'.$board['bo_gallery_height'].'px' : '';
          ?>
         <li class="<?php echo implode(' ', $classes); ?>">
             <div class="gall_box">
                 <div class="gall_chk chk_box">
-	                <?php if ($is_checkbox) { ?>
-					<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>" class="selec_chk">
-	                <label for="chk_wr_id_<?php echo $i ?>">
-	                	<span></span>
-	                	<b class="sound_only"><?php echo $list[$i]['subject'] ?></b>
-	                </label>
-	                
-	                <?php } ?>
-	                <span class="sound_only">
-	                    <?php
-	                    if ($wr_id == $list[$i]['wr_id'])
-	                        echo "<span class=\"bo_current\">열람중</span>";
-	                    else
-	                        echo $list[$i]['num'];
-	                     ?>
-	                </span>
+                    <?php if ($is_checkbox) { ?>
+                    <input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>" class="selec_chk">
+                    <label for="chk_wr_id_<?php echo $i ?>">
+                        <span></span>
+                        <b class="sound_only"><?php echo $list[$i]['subject'] ?></b>
+                    </label>
+                    
+                    <?php } ?>
+                    <span class="sound_only">
+                        <?php
+                        if ($wr_id == $list[$i]['wr_id'])
+                            echo "<span class=\"bo_current\">열람중</span>";
+                        else
+                            echo $list[$i]['num'];
+                         ?>
+                    </span>
                 </div>
                 <div class="gall_con">
-                    <div class="gall_img">
+                    <div class="gall_img" style="<?php if ($board['bo_gallery_height'] > 0) echo 'height:'.$board['bo_gallery_height'].'px;max-height:'.$board['bo_gallery_height'].'px'; ?>">
                         <a href="<?php echo $list[$i]['href'] ?>">
                         <?php
                         if ($list[$i]['is_notice']) { // 공지사항  ?>
-                            <span class="is_notice">공지</span>
+                            <span class="is_notice" style="<?php echo $line_height_style; ?>">공지</span>
                         <?php } else {
                             $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height'], false, true);
 
                             if($thumb['src']) {
                                 $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" >';
                             } else {
-                                $img_content = '<span class="no_image">no image</span>';
+                                $img_content = '<span class="no_image" style="'.$line_height_style.'">no image</span>';
                             }
 
                             echo run_replace('thumb_image_tag', $img_content, $thumb);
@@ -132,7 +134,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                         <a href="<?php echo $list[$i]['href'] ?>" class="bo_tit">
                             
                             <?php // echo $list[$i]['icon_reply']; ?>
-                        	<!-- 갤러리 댓글기능 사용시 주석을 제거하세요. -->
+                            <!-- 갤러리 댓글기능 사용시 주석을 제거하세요. -->
                         
                             <?php echo $list[$i]['subject'] ?>                      
                             <?php
@@ -142,19 +144,19 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                             //if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
                             //if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
                             if (isset($list[$i]['icon_secret'])) echo rtrim($list[$i]['icon_secret']);
-							?>
-							<?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><span class="cnt_cmt"><?php echo $list[$i]['wr_comment']; ?></span><span class="sound_only">개</span><?php } ?>
+                            ?>
+                            <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><span class="cnt_cmt"><?php echo $list[$i]['wr_comment']; ?></span><span class="sound_only">개</span><?php } ?>
                          </a>
                          <span class="bo_cnt"><?php echo utf8_strcut(strip_tags($list[$i]['wr_content']), 68, '..'); ?></span>
                     </div>
 
                     <div class="gall_info">
-                    	<span class="sound_only">작성자 </span><?php echo $list[$i]['name'] ?>
+                        <span class="sound_only">작성자 </span><?php echo $list[$i]['name'] ?>
                         <span class="gall_date"><span class="sound_only">작성일 </span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
-                    	<span class="gall_view"><span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?></span>
+                        <span class="gall_view"><span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?></span>
                     </div>
                     <div class="gall_option">
-                    	<?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
+                      <?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
                         <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><strong><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?></strong><?php } ?>           
                     </div>
                 </div>
@@ -163,26 +165,26 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
         <?php if (count($list) == 0) { echo "<li class=\"empty_list\">게시물이 없습니다.</li>"; } ?>
     </ul>
-	
-	<!-- 페이지 -->
-	<?php echo $write_pages; ?>
-	<!-- 페이지 -->
-	
-	<?php if ($list_href || $is_checkbox || $write_href) { ?>
+    
+    <!-- 페이지 -->
+    <?php echo $write_pages; ?>
+    <!-- 페이지 -->
+    
+    <?php if ($list_href || $is_checkbox || $write_href) { ?>
     <div class="bo_fx">
         <?php if ($list_href || $write_href) { ?>
         <ul class="btn_bo_user">
-        	<?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
+            <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
             <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01 btn" title="RSS"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
             <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01 btn" title="글쓰기"><i class="fa fa-pencil" aria-hidden="true"></i><span class="sound_only">글쓰기</span></a></li><?php } ?>
-        </ul>	
+        </ul>   
         <?php } ?>
     </div>
     <?php } ?> 
     </form>
 
     <!-- 게시판 검색 시작 { -->
-    <div class="bo_sch_wrap">	
+    <div class="bo_sch_wrap">   
         <fieldset class="bo_sch">
             <h3>검색</h3>
             <form name="fsearch" method="get">
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index e41dc44d1..763ee44d2 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -1,77 +1,5 @@
 @charset "utf-8";
 
-/* ### 기본 스타일 커스터마이징 시작 ### */
-
-/* 게시판 버튼 */
-/* 목록 버튼 */
-#bo_gall a.btn_b01 {}
-#bo_gall a.btn_b01:focus, #bo_gall a.btn_b01:hover {}
-#bo_gall a.btn_b02 {}
-#bo_gall a.btn_b02:focus, #bo_gall a.btn_b02:hover {}
-#bo_gall a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_gall a.btn_admin:focus, #bo_gall .btn_admin:hover {}
-
-/* 읽기 버튼 */
-#bo_v a.btn_b01 {}
-#bo_v a.btn_b01:focus, #bo_v a.btn_b01:hover {}
-#bo_v a.btn_b02 {}
-#bo_v a.btn_b02:focus, #bo_v a.btn_b02:hover {}
-#bo_v a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_v a.btn_admin:focus, #bo_v a.btn_admin:hover {}
-
-/* 쓰기 버튼 */
-#bo_w .btn_confirm {} /* 서식단계 진행 */
-#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
-#bo_w button.btn_submit {}
-#bo_w fieldset .btn_submit {}
-#bo_w .btn_cancel {font-size:1.167em;border-radius:3px}
-#bo_w button.btn_cancel {}
-#bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {}
-#bo_w a.btn_frmline, #bo_w button.btn_frmline {} /* 우편번호검색버튼 등 */
-#bo_w button.btn_frmline {}
-
-/* 기본 테이블 */
-/* 읽기 내 테이블 */
-#bo_v .tbl_head01 {}
-#bo_v .tbl_head01 caption {}
-#bo_v .tbl_head01 thead th {}
-#bo_v .tbl_head01 thead a {}
-#bo_v .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-#bo_v .tbl_head01 tfoot th {}
-#bo_v .tbl_head01 tfoot td {}
-#bo_v .tbl_head01 tbody th {}
-#bo_v .tbl_head01 td {}
-#bo_v .tbl_head01 a {}
-#bo_v td.empty_table {}
-
-/* 쓰기 테이블 */
-#bo_w table {}
-#bo_w caption {}
-#bo_w .frm_info {}
-#bo_w .frm_address {}
-#bo_w .frm_file {}
-
-#bo_w .tbl_frm01 {}
-#bo_w .tbl_frm01 th {}
-#bo_w .tbl_frm01 td {}
-#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {}
-#bo_w .tbl_frm01 textarea {}
-#bo_w .tbl_frm01 a {}
-
-/* 필수입력 */
-#bo_w .required, #bo_w textarea.required {}
-
-#bo_w .cke_sc {}
-#bo_w button.btn_cke_sc {}
-#bo_w .cke_sc_def {}
-#bo_w .cke_sc_def dl {}
-#bo_w .cke_sc_def dl:after {}
-#bo_w .cke_sc_def dt, #bo_w .cke_sc_def dd {}
-#bo_w .cke_sc_def dt {}
-#bo_w .cke_sc_def dd {}
-
-/* ### 기본 스타일 커스터마이징 끝 ### */
-
 /* 게시판 목록 */
 #bo_cate {margin:25px 0}
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
@@ -124,10 +52,10 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_now .gall_text_href a {color:#ff3061}
 
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
-#bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden}
+#bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;overflow:hidden}
 #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block}
 #bo_gall .gall_img img, #bo_gall .gall_img video {max-width:100%;height:auto !important}
-#bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
+#bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
 
 #bo_gall .gall_text_href {margin:10px 0}
 #bo_gall .gall_text_href a {font-weight:bold}
@@ -442,4 +370,6 @@ box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1)}
 #bo_w .bo_w_flie .file_wr {position:relative;border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;height:40px;margin:0}
 #bo_w .bo_w_flie .frm_input {margin:10px 0 0}
 #bo_w .bo_w_flie .file_del {position:absolute;top:10px;right:10px;font-size:0.92em;color:#7d7d7d}
-#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
\ No newline at end of file
+#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
+#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
+#bo_w .btn_cancel {border-radius:3px;font-size:1.167em}
\ No newline at end of file
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index c5af84d3f..e94e3f08b 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -93,8 +93,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
 
             echo "</div>\n";
@@ -161,7 +161,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
             <li>
                	<i class="fa fa-folder-open" aria-hidden="true"></i>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <strong><?php echo $view['file'][$i]['source'] ?></strong> <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
                 </a>
                 <br>
diff --git a/skin/connect/basic/connect.skin.php b/skin/connect/basic/connect.skin.php
index 55849443c..b4623f038 100644
--- a/skin/connect/basic/connect.skin.php
+++ b/skin/connect/basic/connect.skin.php
@@ -6,4 +6,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 add_stylesheet('<link rel="stylesheet" href="'.$connect_skin_url.'/style.css">', 0);
 ?>
 
-<?php echo $row['total_cnt'] ?>
+<?php echo $row['total_cnt'];
\ No newline at end of file
diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php
index 78b3fc128..2f77032a5 100644
--- a/skin/latest/basic/latest.skin.php
+++ b/skin/latest/basic/latest.skin.php
@@ -14,7 +14,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/skin/latest/notice/latest.skin.php b/skin/latest/notice/latest.skin.php
index c59f74c6a..a59e0fb48 100644
--- a/skin/latest/notice/latest.skin.php
+++ b/skin/latest/notice/latest.skin.php
@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/skin/latest/pic_block/latest.skin.php b/skin/latest/pic_block/latest.skin.php
index 58b7f4519..887d56845 100644
--- a/skin/latest/pic_block/latest.skin.php
+++ b/skin/latest/pic_block/latest.skin.php
@@ -23,13 +23,14 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         $thumb['alt'] = '이미지가 없습니다.';
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+    $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
     ?>
         <li class="gallery_li">
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
+            <a href="<?php echo $wr_href; ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".$wr_href."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/skin/latest/pic_block/style.css b/skin/latest/pic_block/style.css
index b76196799..dc059ad04 100644
--- a/skin/latest/pic_block/style.css
+++ b/skin/latest/pic_block/style.css
@@ -15,7 +15,7 @@
 .pic_lt li .lt_img img, .pic_lt li .lt_img video {width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}
 .pic_lt li .fa-heart {color:#ff0000}
-.pic_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
+.pic_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
 .pic_lt li .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin-left:2px;font-weight:bold;vertical-align:middle}
 .pic_lt li .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#ff0000;background:#ffb9b9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_lt li .fa-caret-right {color:#bbb}
diff --git a/skin/latest/pic_list/latest.skin.php b/skin/latest/pic_list/latest.skin.php
index 50ad31951..761cbb72c 100644
--- a/skin/latest/pic_list/latest.skin.php
+++ b/skin/latest/pic_list/latest.skin.php
@@ -17,6 +17,8 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         
         $img_link_html = '';
         
+        $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
+
         if( $i === 0 ) {
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
@@ -27,7 +29,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
                 $thumb['alt'] = '이미지가 없습니다.';
             }
             $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
-            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
+            $img_link_html = '<a href="'.$wr_href.'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
         }
     ?>
         <li>
@@ -35,7 +37,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
  
-            echo "<a href=\"".$list[$i]['href']."\" class=\"pic_li_tit\"> ";
+            echo "<a href=\"".$wr_href."\" class=\"pic_li_tit\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/skin/latest/pic_list/style.css b/skin/latest/pic_list/style.css
index b263aa2f0..576a80cd3 100644
--- a/skin/latest/pic_list/style.css
+++ b/skin/latest/pic_list/style.css
@@ -11,12 +11,12 @@
 .pic_li_lt ul:after {display:block;visibility:hidden;clear:both;content:""}
 .pic_li_lt li {border-bottom:1px solid #e5ecee;margin-bottom:10px}
 .pic_li_lt li .lt_img {display:none}
-.pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;display:block}
+.pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;}
 .pic_li_lt li:first-child .lt_img img, .pic_li_lt li .lt_img video {width:100%;height:auto}
 .pic_li_lt li .pic_li_tit {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
 
 .pic_li_lt li .fa-heart {color:#ff0000}
-.pic_li_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
+.pic_li_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
 .pic_li_lt li .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin-left:2px;font-weight:bold;vertical-align:middle}
 .pic_li_lt li .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#ff0000;background:#ffb9b9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_li_lt li .fa-caret-right {color:#bbb}
diff --git a/skin/member/basic/login_check.skin.php b/skin/member/basic/login_check.skin.php
index 1b182915e..aea2ee5aa 100644
--- a/skin/member/basic/login_check.skin.php
+++ b/skin/member/basic/login_check.skin.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
 
-// 자신만의 코드를 넣어주세요.
-?>
+// 자신만의 코드를 넣어주세요.
\ No newline at end of file
diff --git a/skin/member/basic/point.skin.php b/skin/member/basic/point.skin.php
index b0177dbb7..b0d4e17b9 100644
--- a/skin/member/basic/point.skin.php
+++ b/skin/member/basic/point.skin.php
@@ -18,13 +18,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <ul class="point_list">
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
-
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_li">자료가 없습니다.</li>';
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
index 72b2596e6..e2dc5fd5b 100644
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@@ -189,7 +189,7 @@ gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_
 	                <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
 	                <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
 	                <input type="checkbox" name="del_mb_icon" value="1" id="del_mb_icon">
-	                <label for="del_mb_icon">삭제</label>
+	                <label for="del_mb_icon" class="inline">삭제</label>
 	                <?php }  ?>
 	            
 	            </li>
@@ -208,7 +208,7 @@ gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_
 	                <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
 	                <img src="<?php echo $mb_img_url ?>" alt="회원이미지">
 	                <input type="checkbox" name="del_mb_img" value="1" id="del_mb_img">
-	                <label for="del_mb_img">삭제</label>
+	                <label for="del_mb_img" class="inline">삭제</label>
 	                <?php }  ?>
 	            
 	            </li>
diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css
index efc404d34..97c3ff395 100644
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@@ -131,6 +131,7 @@
 .register_form_inner {background:#f7f7f7;border:1px solid #dde7e9;border-radius:3px}
 .register_form_inner ul {padding:20px}
 .register_form_inner label {display:block;margin-bottom:10px;line-height:24px}
+.register_form_inner label.inline {display:inline}
 
 #fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center}
 #fregisterform .frm_address {margin:5px 0 0}
diff --git a/skin/popular/basic/popular.skin.php b/skin/popular/basic/popular.skin.php
index e9e36f12f..353d53302 100644
--- a/skin/popular/basic/popular.skin.php
+++ b/skin/popular/basic/popular.skin.php
@@ -29,7 +29,7 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/owlcarousel/owl.carou
     </div>
 </section>
 
-<?php if ( $list && is_array($list) ) { //게시물이 있다면 ?>
+<?php if (isset($list) && $list && is_array($list)) { //게시물이 있다면 ?>
 <script>
 jQuery(function($){
     
diff --git a/skin/qa/basic/list.skin.php b/skin/qa/basic/list.skin.php
index d32852783..56df884ee 100644
--- a/skin/qa/basic/list.skin.php
+++ b/skin/qa/basic/list.skin.php
@@ -72,6 +72,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <input type="hidden" name="stx" value="<?php echo $stx; ?>">
     <input type="hidden" name="sca" value="<?php echo $sca; ?>">
     <input type="hidden" name="page" value="<?php echo $page; ?>">
+    <input type="hidden" name="token" value="<?php echo get_text($token); ?>">
             
     <div class="tbl_head01 tbl_wrap">
         <table>
diff --git a/skin/qa/basic/view.answerform.skin.php b/skin/qa/basic/view.answerform.skin.php
index 801fea899..b1d0b459b 100644
--- a/skin/qa/basic/view.answerform.skin.php
+++ b/skin/qa/basic/view.answerform.skin.php
@@ -15,6 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx; ?>">
     <input type="hidden" name="page" value="<?php echo $page; ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -106,6 +107,23 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
             return false;
         }
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/skin/qa/basic/write.skin.php b/skin/qa/basic/write.skin.php
index d1feabb29..9f587c086 100644
--- a/skin/qa/basic/write.skin.php
+++ b/skin/qa/basic/write.skin.php
@@ -14,6 +14,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -166,6 +167,25 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
         }
         <?php } ?>
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/skin/search/basic/search.skin.php b/skin/search/basic/search.skin.php
index ceddef9cc..9ffcff08a 100644
--- a/skin/search/basic/search.skin.php
+++ b/skin/search/basic/search.skin.php
@@ -15,11 +15,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
 
     <label for="sfl" class="sound_only">검색조건</label>
     <select name="sfl" id="sfl">
-        <option value="wr_subject||wr_content"<?php echo get_selected($_GET['sfl'], "wr_subject||wr_content") ?>>제목+내용</option>
-        <option value="wr_subject"<?php echo get_selected($_GET['sfl'], "wr_subject") ?>>제목</option>
-        <option value="wr_content"<?php echo get_selected($_GET['sfl'], "wr_content") ?>>내용</option>
-        <option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id") ?>>회원아이디</option>
-        <option value="wr_name"<?php echo get_selected($_GET['sfl'], "wr_name") ?>>이름</option>
+        <option value="wr_subject||wr_content"<?php echo get_selected($sfl, "wr_subject||wr_content") ?>>제목+내용</option>
+        <option value="wr_subject"<?php echo get_selected($sfl, "wr_subject") ?>>제목</option>
+        <option value="wr_content"<?php echo get_selected($sfl, "wr_content") ?>>내용</option>
+        <option value="mb_id"<?php echo get_selected($sfl, "mb_id") ?>>회원아이디</option>
+        <option value="wr_name"<?php echo get_selected($sfl, "wr_name") ?>>이름</option>
     </select>
 
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
diff --git a/skin/social/img/sns_gp_s.png b/skin/social/img/sns_gp_s.png
index aa0884594..0bf8c73e9 100644
Binary files a/skin/social/img/sns_gp_s.png and b/skin/social/img/sns_gp_s.png differ
diff --git a/skin/social/social_login.skin.php b/skin/social/social_login.skin.php
index f93fd403f..0d96f53ea 100644
--- a/skin/social/social_login.skin.php
+++ b/skin/social/social_login.skin.php
@@ -41,7 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
         <?php if( social_service_check('google') ) {     //구글 로그인을 사용한다면 ?>
         <a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-google" title="구글">
             <span class="ico"></span>
-            <span class="txt">구글+<i> 로그인</i></span>
+            <span class="txt">구글<i> 로그인</i></span>
         </a>
         <?php }     //end if ?>
         <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
diff --git a/skin/social/social_outlogin.skin.1.php b/skin/social/social_outlogin.skin.1.php
index a6a55a2d2..67392f61e 100644
--- a/skin/social/social_outlogin.skin.1.php
+++ b/skin/social/social_outlogin.skin.1.php
@@ -41,7 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
         <?php if( social_service_check('google') ) {     //구글 로그인을 사용한다면 ?>
         <a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-google" title="구글">
             <span class="ico"></span>
-            <span class="txt">구글+<i> 로그인</i></span>
+            <span class="txt">구글<i> 로그인</i></span>
         </a>
         <?php }     //end if ?>
         <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
diff --git a/skin/social/social_register.skin.php b/skin/social/social_register.skin.php
index f2beab376..061d382b6 100644
--- a/skin/social/social_register.skin.php
+++ b/skin/social/social_register.skin.php
@@ -43,7 +43,7 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
             <?php if( social_service_check('google') ) {     //구글 로그인을 사용한다면 ?>
             <a href="<?php echo $self_url;?>?provider=google&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-google" title="구글">
                 <span class="ico"></span>
-                <span class="txt">구글+로 회원가입하기</span>
+                <span class="txt">구글로 회원가입하기</span>
             </a>
             <?php }     //end if ?>
             <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
diff --git a/skin/social/style.css b/skin/social/style.css
index d984ac9b9..75f0951e8 100644
--- a/skin/social/style.css
+++ b/skin/social/style.css
@@ -27,7 +27,7 @@
 
 .sns-wrap-reg .sns-naver {border-color:#18a400;background:#2db400}
 .sns-wrap-reg .sns-naver .ico {background-position:-29px 0; }
-.sns-wrap-reg .sns-google {border-color:#ca2c19;background:#dd5443}
+.sns-wrap-reg .sns-google {border-color:#ca2c19;background:#4285F4}
 .sns-wrap-reg .sns-google .ico {background-position:-58px 0}
 .sns-wrap-reg .sns-facebook {border-color:#2e5393;background:#3a5897}
 .sns-wrap-reg .sns-facebook .ico {background-position:0 0 }
@@ -49,7 +49,7 @@
 
 /* SNS by COLOR */
 .sns-wrap-over .sns-naver {background:url('./img/sns_naver_s.png') no-repeat}
-.sns-wrap-over .sns-google {background:url('./img/sns_gp_s.png') no-repeat}
+.sns-wrap-over .sns-google {}
 .sns-wrap-over .sns-facebook {background:url('./img/sns_fb_s.png') no-repeat}
 .sns-wrap-over .sns-twitter {background:url('./img/sns_twitter_s.png') no-repeat}
 .sns-wrap-over .sns-payco {background:url('./img/sns_payco_s.png') no-repeat}
@@ -67,12 +67,13 @@
 /*로그인 */
 #sns_login {border:0;margin-top:15px;border-top:1px solid #edeaea}
 #sns_login h3 {padding:10px 0 0;text-align:left;font-weight:bold}
-#sns_login .sns-icon {display:block;height:40px;line-height:40px;width:100%;margin:0 0 5px;padding-left:40px;text-align:left;color:#fff;border-radius:2px}
+#sns_login .sns-icon {position:relative;display:block;height:40px;line-height:40px;width:100%;margin:0 0 5px;padding-left:40px;text-align:left;color:#fff;border-radius:2px}
 #sns_login .sns-naver {background-color:#1fc800;background-position:5px 5px;border-bottom:1px solid #1ea505}
 #sns_login .sns-kakao {background-color:#ffeb00;background-position:5px 5px;border-bottom:1px solid #e2c10a}
 #sns_login .sns-kakao {color:#3c1e1e}
 #sns_login .sns-facebook {background-color:#3b579d;background-position:5px 5px;border-bottom:1px solid #28458f}
-#sns_login .sns-google {background-color:#db4a3a;background-position:5px 5px;border-bottom:1px solid #c03121}
+#sns_login .sns-google {background-color:#4285F4;background-position:5px 5px;border-bottom:1px solid #3567c6;letter-spacing:-0.5px}
+#sns_login .sns-google .ico {position:absolute;top:3px;left:3px;width:33px;height:33px;background:url('./img/sns_gp_s.png') no-repeat center center;background-color:#fff;background-size:28px 28px!important;border-radius:2px}
 #sns_login .sns-twitter {background-color:#1ea1f2;background-position:5px 5px;border-bottom:1px solid #1e82c0}
 #sns_login .sns-payco {background-color:#df0b00;background-position:5px 5px;border-bottom:1px solid #9d0800}
 #sns_login .txt {text-align:left;padding-left:10px;border-left:1px solid rgba(0,0,0,0.1);display:block;font-weight:bold}
@@ -88,7 +89,8 @@
 #sns_register .sns-naver {background-color:#1fc800;background-position:0 0}
 #sns_register .sns-kakao {background-color:#ffeb00;background-position:0 0}
 #sns_register .sns-facebook {background-color:#3b579d;background-position:0 0}
-#sns_register .sns-google {background-color:#db4a3a;background-position:0 0}
+#sns_register .sns-google {background-color:#fff;background-position:0 0;border-radius:2px;border:1px solid #999}
+#sns_register .sns-google .ico {background:url('./img/sns_gp_s.png') no-repeat;height:30px}
 #sns_register .sns-twitter {background-color:#1ea1f2;background-position:0 0}
 #sns_register .sns-payco {background-color:#df0b00;background-position:0 0}
 #sns_register .txt {position:absolute;line-height:0;font-size:0;vertical-align:middle;overflow:hidden}
diff --git a/tail.php b/tail.php
index f0cac06b7..dd6627238 100644
--- a/tail.php
+++ b/tail.php
@@ -91,5 +91,4 @@ $(function() {
 </script>
 
 <?php
-include_once(G5_PATH."/tail.sub.php");
-?>
\ No newline at end of file
+include_once(G5_PATH."/tail.sub.php");
\ No newline at end of file
diff --git a/tail.sub.php b/tail.sub.php
index 1d038707b..ec25a8297 100644
--- a/tail.sub.php
+++ b/tail.sub.php
@@ -29,4 +29,4 @@ $(function() {
 
 </body>
 </html>
-<?php echo html_end(); // HTML 마지막 처리 함수 : 반드시 넣어주시기 바랍니다. ?>
\ No newline at end of file
+<?php echo html_end(); // HTML 마지막 처리 함수 : 반드시 넣어주시기 바랍니다.
\ No newline at end of file
diff --git a/theme/basic/_common.php b/theme/basic/_common.php
index bad54a5d7..c7ed3c4ee 100644
--- a/theme/basic/_common.php
+++ b/theme/basic/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../common.php');
-?>
\ No newline at end of file
+include_once('../../common.php');
\ No newline at end of file
diff --git a/theme/basic/css/default.css b/theme/basic/css/default.css
index cb89ff049..3f6107dc7 100644
--- a/theme/basic/css/default.css
+++ b/theme/basic/css/default.css
@@ -80,7 +80,7 @@ border:1px solid #558ab7 !important;
 
 #logo {float:left;padding:30px 0 0}
 
-.hd_sch_wr {float:left;padding:30px 0;;width:445px;margin-left:65px}
+.hd_sch_wr {float:left;padding:30px 0;width:445px;margin-left:65px}
 #hd_sch h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #hd_sch {border-radius:30px;overflow:hidden}
 #hd_sch #sch_stx {float:left;width:385px;height:45px;padding-left:10px;border-radius:30px 0 0 30px;background:#2c2c2c;border:0;border-right:0;font-size:1.25em;color:#fff}
diff --git a/theme/basic/group.php b/theme/basic/group.php
index 5a7736c22..34f9f7325 100644
--- a/theme/basic/group.php
+++ b/theme/basic/group.php
@@ -46,5 +46,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <!-- 메인화면 최신글 끝 -->
 </div>
 <?php
-include_once(G5_THEME_PATH.'/tail.php');
-?>
+include_once(G5_THEME_PATH.'/tail.php');
\ No newline at end of file
diff --git a/theme/basic/head.php b/theme/basic/head.php
index ef2e995ef..098fd18ff 100644
--- a/theme/basic/head.php
+++ b/theme/basic/head.php
@@ -201,5 +201,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
     <div id="container_wr">
    
     <div id="container">
-        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php } ?>
-
+        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php }
\ No newline at end of file
diff --git a/theme/basic/head.sub.php b/theme/basic/head.sub.php
index c808cd204..27b45fc86 100644
--- a/theme/basic/head.sub.php
+++ b/theme/basic/head.sub.php
@@ -9,8 +9,8 @@ if (!isset($g5['title'])) {
     $g5_head_title = $g5['title'];
 }
 else {
-    $g5_head_title = $g5['title']; // 상태바에 표시될 제목
-    $g5_head_title .= " | ".$config['cf_title'];
+    // 상태바에 표시될 제목
+    $g5_head_title = implode(' | ', array_filter(array($g5['title'], $config['cf_title'])));
 }
 
 $g5['title'] = strip_tags($g5['title']);
@@ -91,5 +91,4 @@ if ($is_member) { // 회원이라면 로그인 중이라는 메세지를 출력
 
     echo '<div id="hd_login_msg">'.$sr_admin_msg.get_text($member['mb_nick']).'님 로그인 중 ';
     echo '<a href="'.G5_BBS_URL.'/logout.php">로그아웃</a></div>';
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/theme/basic/index.php b/theme/basic/index.php
index 3ba000464..dcdb8d525 100644
--- a/theme/basic/index.php
+++ b/theme/basic/index.php
@@ -1,5 +1,5 @@
 <?php
-define('_INDEX_', true);
+if (!defined('_INDEX_')) define('_INDEX_', true);
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 if (G5_IS_MOBILE) {
@@ -64,5 +64,4 @@ include_once(G5_THEME_PATH.'/head.php');
 </div>
 
 <?php
-include_once(G5_THEME_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_THEME_PATH.'/tail.php');
\ No newline at end of file
diff --git a/theme/basic/mobile/_common.php b/theme/basic/mobile/_common.php
index 2ce42a3fc..eaf56278e 100644
--- a/theme/basic/mobile/_common.php
+++ b/theme/basic/mobile/_common.php
@@ -1,3 +1,2 @@
 <?php
-include_once('../../../common.php');
-?>
\ No newline at end of file
+include_once('../../../common.php');
\ No newline at end of file
diff --git a/theme/basic/mobile/group.php b/theme/basic/mobile/group.php
index aa9187851..52474da90 100644
--- a/theme/basic/mobile/group.php
+++ b/theme/basic/mobile/group.php
@@ -31,5 +31,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <!-- 메인화면 최신글 끝 -->
 
 <?php
-include_once(G5_THEME_MOBILE_PATH.'/tail.php');
-?>
+include_once(G5_THEME_MOBILE_PATH.'/tail.php');
\ No newline at end of file
diff --git a/theme/basic/mobile/head.php b/theme/basic/mobile/head.php
index 07a937c80..e7a04353a 100644
--- a/theme/basic/mobile/head.php
+++ b/theme/basic/mobile/head.php
@@ -180,4 +180,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
     	<h2 id="container_title" class="top" title="<?php echo get_text($g5['title']); ?>">
     		<a href="javascript:history.back();"><i class="fa fa-chevron-left" aria-hidden="true"></i><span class="sound_only">뒤로가기</span></a> <?php echo get_head_title($g5['title']); ?>
     	</h2>
-    <?php } ?>
+    <?php }
\ No newline at end of file
diff --git a/theme/basic/mobile/index.php b/theme/basic/mobile/index.php
index 2b96f0125..e694b610f 100644
--- a/theme/basic/mobile/index.php
+++ b/theme/basic/mobile/index.php
@@ -27,5 +27,4 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <!-- 메인화면 최신글 끝 -->
 
 <?php
-include_once(G5_THEME_MOBILE_PATH.'/tail.php');
-?>
\ No newline at end of file
+include_once(G5_THEME_MOBILE_PATH.'/tail.php');
\ No newline at end of file
diff --git a/theme/basic/mobile/skin/board/basic/view.skin.php b/theme/basic/mobile/skin/board/basic/view.skin.php
index 1810b6f39..8a3f2dd57 100644
--- a/theme/basic/mobile/skin/board/basic/view.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view.skin.php
@@ -83,8 +83,8 @@ jQuery(function($){
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
             echo "</div>\n";
 		}
@@ -124,8 +124,8 @@ jQuery(function($){
     </section>
     
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -143,7 +143,7 @@ jQuery(function($){
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
          ?>
             <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <i class="fa fa-download" aria-hidden="true"></i>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong>
                     <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
diff --git a/theme/basic/mobile/skin/board/basic/view_comment.skin.php b/theme/basic/mobile/skin/board/basic/view_comment.skin.php
index eda34f3fa..8ddd30dd8 100644
--- a/theme/basic/mobile/skin/board/basic/view_comment.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view_comment.skin.php
@@ -341,4 +341,4 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         });
     });
     </script>
-    <?php } ?>
+    <?php }
\ No newline at end of file
diff --git a/theme/basic/mobile/skin/board/gallery/view.skin.php b/theme/basic/mobile/skin/board/gallery/view.skin.php
index e003a7faf..37237904e 100644
--- a/theme/basic/mobile/skin/board/gallery/view.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view.skin.php
@@ -85,8 +85,8 @@ jQuery(function($){
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
             echo "</div>\n";
 		}
@@ -126,8 +126,8 @@ jQuery(function($){
     </section>
     
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -145,7 +145,7 @@ jQuery(function($){
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
          ?>
             <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <i class="fa fa-download" aria-hidden="true"></i>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong>
                     <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
diff --git a/theme/basic/mobile/skin/board/gallery/view_comment.skin.php b/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
index eda34f3fa..8ddd30dd8 100644
--- a/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
@@ -341,4 +341,4 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         });
     });
     </script>
-    <?php } ?>
+    <?php }
\ No newline at end of file
diff --git a/theme/basic/mobile/skin/connect/basic/connect.skin.php b/theme/basic/mobile/skin/connect/basic/connect.skin.php
index 96d2da394..d1f695a6c 100644
--- a/theme/basic/mobile/skin/connect/basic/connect.skin.php
+++ b/theme/basic/mobile/skin/connect/basic/connect.skin.php
@@ -5,4 +5,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$connect_skin_url.'/style.css">', 0);
 ?>
-<?php echo $row['total_cnt'] ?>
+<?php echo $row['total_cnt'];
\ No newline at end of file
diff --git a/theme/basic/mobile/skin/latest/basic/latest.skin.php b/theme/basic/mobile/skin/latest/basic/latest.skin.php
index 434bbc945..79079ec68 100644
--- a/theme/basic/mobile/skin/latest/basic/latest.skin.php
+++ b/theme/basic/mobile/skin/latest/basic/latest.skin.php
@@ -28,7 +28,8 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
             $img = $thumb['src'] ? $thumb['src'] : '';
             $img_content = $img ? '<img src="'.$img.'" alt="'.$thumb['alt'].'" >' : '';
-            
+            $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
+
             $echo_ul = ( $i && (($i % $divisor_count) === 0) ) ? '</ul><ul class="item">'.PHP_EOL : '';
 
             echo $echo_ul;
@@ -38,10 +39,10 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
                 //echo $list[$i]['icon_reply']." ";
                 
                 if( $img_content ){
-                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
+                    echo "<a href=\"".$wr_href."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
                 }
                 
-                echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
+                echo "<a href=\"".$wr_href."\" class=\"lt_tit\">";
                 if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i> ";
                 if ($list[$i]['is_notice'])
                     echo "<strong>".$list[$i]['subject']."</strong>";
diff --git a/theme/basic/mobile/skin/latest/comment/latest.skin.php b/theme/basic/mobile/skin/latest/comment/latest.skin.php
index 961c48b0c..9ad7b04d9 100644
--- a/theme/basic/mobile/skin/latest/comment/latest.skin.php
+++ b/theme/basic/mobile/skin/latest/comment/latest.skin.php
@@ -15,7 +15,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         <li>
             <span class="cm_lt_nick"><?php echo get_member_profile_img($member['mb_id']); ?></span>
             <div class="cm_lt_info">
-            	<a href="<?php echo $list[$i]['href']; ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
+            	<a href="<?php echo get_pretty_url($bo_table, $list[$i]['wr_id']); ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
 				<br>
 				<span class="lt_nick"><?php echo $list[$i]['name'] ?></span>
             	<span class="lt_date"><?php echo $list[$i]['datetime2'] ?></span>              
diff --git a/theme/basic/mobile/skin/latest/notice/latest.skin.php b/theme/basic/mobile/skin/latest/notice/latest.skin.php
index c59f74c6a..a59e0fb48 100644
--- a/theme/basic/mobile/skin/latest/notice/latest.skin.php
+++ b/theme/basic/mobile/skin/latest/notice/latest.skin.php
@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/theme/basic/mobile/skin/member/basic/login_check.skin.php b/theme/basic/mobile/skin/member/basic/login_check.skin.php
index 1b182915e..aea2ee5aa 100644
--- a/theme/basic/mobile/skin/member/basic/login_check.skin.php
+++ b/theme/basic/mobile/skin/member/basic/login_check.skin.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
 
-// 자신만의 코드를 넣어주세요.
-?>
+// 자신만의 코드를 넣어주세요.
\ No newline at end of file
diff --git a/theme/basic/mobile/skin/member/basic/point.skin.php b/theme/basic/mobile/skin/member/basic/point.skin.php
index 1e7c7e48a..a9de51c16 100644
--- a/theme/basic/mobile/skin/member/basic/point.skin.php
+++ b/theme/basic/mobile/skin/member/basic/point.skin.php
@@ -19,12 +19,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
 
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_list">자료가 없습니다.</li>';
diff --git a/theme/basic/mobile/skin/qa/basic/list.skin.php b/theme/basic/mobile/skin/qa/basic/list.skin.php
index 0bf98e366..6d3b8cd3c 100644
--- a/theme/basic/mobile/skin/qa/basic/list.skin.php
+++ b/theme/basic/mobile/skin/qa/basic/list.skin.php
@@ -5,6 +5,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
 ?>
 
+<form name="fqalist" id="fqalist" action="./qadelete.php" onsubmit="return fqalist_submit(this);" method="post">
+<input type="hidden" name="stx" value="<?php echo $stx; ?>">
+<input type="hidden" name="sca" value="<?php echo $sca; ?>">
+<input type="hidden" name="page" value="<?php echo $page; ?>">
+<input type="hidden" name="token" value="<?php echo get_text($token); ?>">
+
 <?php if ($admin_href || $write_href) { ?>
 <ul class="btn_top top btn_bo_user">
     <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
@@ -41,11 +47,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <!-- } 카테고리 끝 -->
     <?php } ?>
 
-    <form name="fqalist" id="fqalist" action="./qadelete.php" onsubmit="return fqalist_submit(this);" method="post">
-    <input type="hidden" name="stx" value="<?php echo $stx; ?>">
-    <input type="hidden" name="sca" value="<?php echo $sca; ?>">
-    <input type="hidden" name="page" value="<?php echo $page; ?>">
-
     <?php if ($is_checkbox) { ?>
     <div class="all_chk chk_box">
         <input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);" class="selec_chk">
@@ -92,8 +93,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
             <?php if ($i == 0) { echo '<li class="empty_list">게시물이 없습니다.</li>'; } ?>
         </ul>
     </div>
-    </form>
 </div>
+</form>
 
 <?php if($is_checkbox) { ?>
 <noscript>
diff --git a/theme/basic/mobile/skin/qa/basic/style.css b/theme/basic/mobile/skin/qa/basic/style.css
index 83c9c056d..add0d9d45 100644
--- a/theme/basic/mobile/skin/qa/basic/style.css
+++ b/theme/basic/mobile/skin/qa/basic/style.css
@@ -259,6 +259,7 @@
 #bo_v_ans #ans_msg {padding:40px 0;background:#f2f5f9;text-align:center}
 #bo_v_ans .btn_submit {width:100%;height:40px;border-radius:5px}
 #bo_v_ans .btn_confirm {margin:0 10px}
+#bo_v_ans form{padding:1em}
 
 #bo_v_rel {}
 #bo_v_rel h2 {margin:0 10px 10px;font-size:1.2em}
diff --git a/theme/basic/mobile/skin/qa/basic/view.answerform.skin.php b/theme/basic/mobile/skin/qa/basic/view.answerform.skin.php
index 3eea2b9e4..671e97fef 100644
--- a/theme/basic/mobile/skin/qa/basic/view.answerform.skin.php
+++ b/theme/basic/mobile/skin/qa/basic/view.answerform.skin.php
@@ -9,12 +9,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     ?>
     <h2>답변등록</h2>
 
-    <form name="fanswer" method="post" action="./qawrite_update.php" autocomplete="off">
+    <form name="fanswer" method="post" action="./qawrite_update.php" onsubmit="return fwrite_submit(this);" autocomplete="off">
     <input type="hidden" name="qa_id" value="<?php echo $view['qa_id']; ?>">
     <input type="hidden" name="w" value="a">
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx; ?>">
     <input type="hidden" name="page" value="<?php echo $page; ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -104,6 +105,23 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
             return false;
         }
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/theme/basic/mobile/skin/qa/basic/view.skin.php b/theme/basic/mobile/skin/qa/basic/view.skin.php
index 9f1bc742b..cb88e44a0 100644
--- a/theme/basic/mobile/skin/qa/basic/view.skin.php
+++ b/theme/basic/mobile/skin/qa/basic/view.skin.php
@@ -15,15 +15,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <?php } ?>
 	<li>
 		<button type="button" class="btn_more_opt btn_b03 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
-    	<?php ob_start(); ?>
         <ul class="more_opt">
+            <?php if ($update_href) { ?><li><a href="<?php echo $update_href ?>"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 수정</a></li><?php } ?>
         	<?php if ($delete_href) { ?><li><a href="<?php echo $delete_href ?>" onclick="del(this.href); return false;"><i class="fa fa-trash-o" aria-hidden="true"></i> 삭제</a></li><?php } ?>
-			<?php if ($update_href) { ?><li><a href="<?php echo $update_href ?>"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 수정</a></li><?php } ?>
 		</ul>
-		<?php
-        $link_buttons = ob_get_contents();
-        ob_end_flush();
-		?>
 	</li>
 </ul>
 <script>
@@ -44,8 +39,6 @@ $(".btn_more_opt").on("click", function() {
 	        <h2>페이지 정보</h2>
 	        <span class="sound_only">작성자</span><strong><?php echo $view['name'] ?></strong>
 	        <span class="sound_only">작성일</span><strong><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $view['datetime']; ?></strong>
-	    	<span class="sound_only">조회</span><strong><i class="fa fa-eye" aria-hidden="true"></i> <?php echo number_format($view['wr_hit']) ?></strong>
-			<span class="sound_only">댓글</span><strong><i class="fa fa-commenting-o" aria-hidden="true"></i> <?php echo number_format($view['wr_comment']) ?></strong>
 		</div>
 		<?php if($view['email'] || $view['hp']) { ?>
         <div id="bo_v_contact">
@@ -115,8 +108,8 @@ $(".btn_more_opt").on("click", function() {
     
     <?php if ($prev_href || $next_href) { ?>
     <ul class="bo_v_nb">
-        <?php if ($prev_href) { ?><li class="bo_v_prev"><a href="<?php echo $prev_href ?>"><i class="fa fa-chevron-up" aria-hidden="true"></i><span class="sound_only">이전글</span> <?php echo $prev_wr_subject;?></a></li><?php } ?>
-        <?php if ($next_href) { ?><li class="bo_v_next"><a href="<?php echo $next_href ?>"><i class="fa fa-chevron-down" aria-hidden="true"></i><span class="sound_only">다음글</span> <?php echo $next_wr_subject;?></a></li><?php } ?>
+        <?php if ($prev_href) { ?><li class="bo_v_prev"><a href="<?php echo $prev_href ?>"><i class="fa fa-chevron-up" aria-hidden="true"></i><span class="sound_only">이전글</span> <?php echo $prev_qa_subject;?></a></li><?php } ?>
+        <?php if ($next_href) { ?><li class="bo_v_next"><a href="<?php echo $next_href ?>"><i class="fa fa-chevron-down" aria-hidden="true"></i><span class="sound_only">다음글</span> <?php echo $next_qa_subject;?></a></li><?php } ?>
     </ul>
     <?php } ?>
 </article>
diff --git a/theme/basic/mobile/skin/qa/basic/write.skin.php b/theme/basic/mobile/skin/qa/basic/write.skin.php
index e8c8c61b6..4d879f73e 100644
--- a/theme/basic/mobile/skin/qa/basic/write.skin.php
+++ b/theme/basic/mobile/skin/qa/basic/write.skin.php
@@ -13,6 +13,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -173,6 +174,25 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
         }
         <?php } ?>
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/theme/basic/mobile/skin/search/basic/search.skin.php b/theme/basic/mobile/skin/search/basic/search.skin.php
index b4db95436..5993c1c10 100644
--- a/theme/basic/mobile/skin/search/basic/search.skin.php
+++ b/theme/basic/mobile/skin/search/basic/search.skin.php
@@ -31,11 +31,11 @@ if ($stx) {
 
         <label for="sfl" class="sound_only">검색조건</label>
         <select name="sfl" id="sfl">
-            <option value="wr_subject||wr_content"<?php echo get_selected($_GET['sfl'], "wr_subject||wr_content") ?>>제목+내용</option>
-            <option value="wr_subject"<?php echo get_selected($_GET['sfl'], "wr_subject") ?>>제목</option>
-            <option value="wr_content"<?php echo get_selected($_GET['sfl'], "wr_content") ?>>내용</option>
-            <option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id") ?>>회원아이디</option>
-            <option value="wr_name"<?php echo get_selected($_GET['sfl'], "wr_name") ?>>이름</option>
+            <option value="wr_subject||wr_content"<?php echo get_selected($sfl, "wr_subject||wr_content") ?>>제목+내용</option>
+            <option value="wr_subject"<?php echo get_selected($sfl, "wr_subject") ?>>제목</option>
+            <option value="wr_content"<?php echo get_selected($sfl, "wr_content") ?>>내용</option>
+            <option value="mb_id"<?php echo get_selected($sfl, "mb_id") ?>>회원아이디</option>
+            <option value="wr_name"<?php echo get_selected($sfl, "wr_name") ?>>이름</option>
         </select>
 
         <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
diff --git a/theme/basic/mobile/tail.php b/theme/basic/mobile/tail.php
index a4f9495e0..8f413d417 100644
--- a/theme/basic/mobile/tail.php
+++ b/theme/basic/mobile/tail.php
@@ -73,5 +73,4 @@ jQuery(function($) {
 </script>
 
 <?php
-include_once(G5_THEME_PATH."/tail.sub.php");
-?>
\ No newline at end of file
+include_once(G5_THEME_PATH."/tail.sub.php");
\ No newline at end of file
diff --git a/theme/basic/skin/board/basic/style.css b/theme/basic/skin/board/basic/style.css
index d01e37c74..0cf2d24d8 100644
--- a/theme/basic/skin/board/basic/style.css
+++ b/theme/basic/skin/board/basic/style.css
@@ -1,89 +1,5 @@
 @charset "utf-8";
 
-/* 게시판 버튼 */
-/* 목록 버튼 */
-#bo_list a.btn_b01 {}
-#bo_list a.btn_b01:focus, #bo_list a.btn_b01:hover {}
-#bo_list a.btn_b02 {}
-#bo_list a.btn_b02:focus, #bo_list a.btn_b02:hover {}
-#bo_list a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_list a.btn_admin:focus, #bo_list .btn_admin:hover {}
-
-/* 읽기 버튼 */
-#bo_v a.btn_b01 {}
-#bo_v a.btn_b01:focus, #bo_v a.btn_b01:hover {}
-#bo_v a.btn_b02 {}
-#bo_v a.btn_b02:focus, #bo_v a.btn_b02:hover {}
-#bo_v a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_v a.btn_admin:focus, #bo_v a.btn_admin:hover {}
-
-/* 쓰기 버튼 */
-#bo_w .btn_confirm {} /* 서식단계 진행 */
-#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
-#bo_w button.btn_submit {}
-#bo_w fieldset .btn_submit {}
-#bo_w .btn_cancel {font-size:1.167em;border-radius:3px}
-#bo_w button.btn_cancel {}
-#bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {}
-#bo_w a.btn_frmline, #bo_w button.btn_frmline {} /* 우편번호검색버튼 등 */
-#bo_w button.btn_frmline {}
-
-/* 기본 테이블 */
-/* 목록 테이블 */
-#bo_list .tbl_head01 {}
-#bo_list .tbl_head01 caption {}
-#bo_list .tbl_head01 thead th {}
-#bo_list .tbl_head01 thead a {}
-#bo_list .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-#bo_list .tbl_head01 tfoot th {}
-#bo_list .tbl_head01 tfoot td {}
-#bo_list .tbl_head01 tbody th {}
-#bo_list .tbl_head01 td {}
-#bo_list .tbl_head01 a {}
-#bo_list td.empty_table {}
-#bo_list tbody .even td {background:#fbfbfb}
-
-/* 읽기 내 테이블 */
-#bo_v .tbl_head01 {}
-#bo_v .tbl_head01 caption {}
-#bo_v .tbl_head01 thead th {}
-#bo_v .tbl_head01 thead a {}
-#bo_v .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-#bo_v .tbl_head01 tfoot th {}
-#bo_v .tbl_head01 tfoot td {}
-#bo_v .tbl_head01 tbody th {}
-#bo_v .tbl_head01 td {}
-#bo_v .tbl_head01 a {}
-#bo_v td.empty_table {}
-
-/* 쓰기 테이블 */
-#bo_w table {}
-#bo_w caption {}
-#bo_w .frm_info {}
-#bo_w .frm_address {}
-#bo_w .frm_file {}
-
-#bo_w .tbl_frm01 {}
-#bo_w .tbl_frm01 th {}
-#bo_w .tbl_frm01 td {}
-#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {}
-#bo_w .tbl_frm01 textarea {}
-#bo_w .tbl_frm01 a {}
-
-/* 필수입력 */
-#bo_w .required, #bo_w textarea.required {}
-
-#bo_w .cke_sc {}
-#bo_w button.btn_cke_sc {}
-#bo_w .cke_sc_def {}
-#bo_w .cke_sc_def dl {}
-#bo_w .cke_sc_def dl:after {}
-#bo_w .cke_sc_def dt, #bo_w .cke_sc_def dd {}
-#bo_w .cke_sc_def dt {}
-#bo_w .cke_sc_def dd {}
-
-/* ### 기본 스타일 커스터마이징 끝 ### */
-
 /* 게시판 목록 */
 #bo_list {position:relative;margin-bottom:20px}
 #bo_list:after {display:block;visibility:hidden;clear:both;content:""}
@@ -103,6 +19,7 @@
 #bo_list .txt_expired {color:#ccc}
 #bo_list tbody tr {border-left:2px solid transparent}
 #bo_list tbody tr:hover {border-left:2px solid #253dbe}
+#bo_list tbody .even td {background:#fbfbfb}
 
 #bo_cate {margin:25px 0}
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
@@ -419,4 +336,6 @@ box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1)}
 #bo_w .bo_w_flie .file_wr {position:relative;border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;height:40px;margin:0}
 #bo_w .bo_w_flie .frm_input {margin:10px 0 0}
 #bo_w .bo_w_flie .file_del {position:absolute;top:10px;right:10px;font-size:0.92em;color:#7d7d7d}
-#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
\ No newline at end of file
+#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
+#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
+#bo_w .btn_cancel {border-radius:3px;font-size:1.167em}
\ No newline at end of file
diff --git a/theme/basic/skin/board/basic/view.skin.php b/theme/basic/skin/board/basic/view.skin.php
index 56cf28a20..ffe1ef78f 100644
--- a/theme/basic/skin/board/basic/view.skin.php
+++ b/theme/basic/skin/board/basic/view.skin.php
@@ -93,8 +93,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
 
             echo "</div>\n";
@@ -161,7 +161,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
             <li>
                	<i class="fa fa-folder-open" aria-hidden="true"></i>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <strong><?php echo $view['file'][$i]['source'] ?></strong> <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
                 </a>
                 <br>
diff --git a/theme/basic/skin/board/gallery/list.skin.php b/theme/basic/skin/board/gallery/list.skin.php
index a7dea635f..a438cb458 100644
--- a/theme/basic/skin/board/gallery/list.skin.php
+++ b/theme/basic/skin/board/gallery/list.skin.php
@@ -6,7 +6,6 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0);
 ?>
 
-
 <!-- 게시판 목록 시작 { -->
 <div id="bo_gall" style="width:<?php echo $width; ?>">
 
@@ -37,24 +36,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         </div>
 
         <ul class="btn_bo_user">
-        	<?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
+            <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
             <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01 btn" title="RSS"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
             <li>
-            	<button type="button" class="btn_bo_sch btn_b01 btn" title="게시판 검색"><i class="fa fa-search" aria-hidden="true"></i><span class="sound_only">게시판 검색</span></button> 
+                <button type="button" class="btn_bo_sch btn_b01 btn" title="게시판 검색"><i class="fa fa-search" aria-hidden="true"></i><span class="sound_only">게시판 검색</span></button> 
             </li>
             <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01 btn" title="글쓰기"><i class="fa fa-pencil" aria-hidden="true"></i><span class="sound_only">글쓰기</span></a></li><?php } ?>
-        	<?php if ($is_admin == 'super' || $is_auth) {  ?>
-        	<li>
-        		<button type="button" class="btn_more_opt is_list_btn btn_b01 btn" title="게시판 리스트 옵션"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
-        		<?php if ($is_checkbox) { ?>	
-		        <ul class="more_opt is_list_btn">  
-		            <li><button type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"><i class="fa fa-trash-o" aria-hidden="true"></i> 선택삭제</button></li>
-		            <li><button type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"><i class="fa fa-files-o" aria-hidden="true"></i> 선택복사</button></li>
-		            <li><button type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"><i class="fa fa-arrows" aria-hidden="true"></i> 선택이동</button></li>
-		        </ul>
-		        <?php } ?>
-        	</li>
-        	<?php }  ?>
+            <?php if ($is_admin == 'super' || $is_auth) { ?>
+            <li>
+                <button type="button" class="btn_more_opt is_list_btn btn_b01 btn" title="게시판 리스트 옵션"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
+                <?php if ($is_checkbox) { ?>
+                <ul class="more_opt is_list_btn">
+                    <li><button type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"><i class="fa fa-trash-o" aria-hidden="true"></i> 선택삭제</button></li>
+                    <li><button type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"><i class="fa fa-files-o" aria-hidden="true"></i> 선택복사</button></li>
+                    <li><button type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"><i class="fa fa-arrows" aria-hidden="true"></i> 선택이동</button></li>
+                </ul>
+                <?php } ?>
+            </li>
+            <?php }  ?>
         </ul>
     </div>
     <!-- } 게시판 페이지 정보 및 버튼 끝 -->
@@ -62,9 +61,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php if ($is_checkbox) { ?>
     <div id="gall_allchk" class="all_chk chk_box">
         <input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);" class="selec_chk">
-    	<label for="chkall">
-        	<span></span>
-        	<b class="sound_only">현재 페이지 게시물 </b> 전체선택
+        <label for="chkall">
+            <span></span>
+            <b class="sound_only">현재 페이지 게시물 </b> 전체선택
         </label>
     </div>
     <?php } ?>
@@ -84,40 +83,42 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             if( $wr_id && $wr_id == $list[$i]['wr_id'] ){
                 $classes[] = 'gall_now';
             }
+
+            $line_height_style = ($board['bo_gallery_height'] > 0) ? 'line-height:'.$board['bo_gallery_height'].'px' : '';
          ?>
         <li class="<?php echo implode(' ', $classes); ?>">
             <div class="gall_box">
                 <div class="gall_chk chk_box">
-	                <?php if ($is_checkbox) { ?>
-					<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>" class="selec_chk">
-	                <label for="chk_wr_id_<?php echo $i ?>">
-	                	<span></span>
-	                	<b class="sound_only"><?php echo $list[$i]['subject'] ?></b>
-	                </label>
-	                
-	                <?php } ?>
-	                <span class="sound_only">
-	                    <?php
-	                    if ($wr_id == $list[$i]['wr_id'])
-	                        echo "<span class=\"bo_current\">열람중</span>";
-	                    else
-	                        echo $list[$i]['num'];
-	                     ?>
-	                </span>
+                    <?php if ($is_checkbox) { ?>
+                    <input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>" class="selec_chk">
+                    <label for="chk_wr_id_<?php echo $i ?>">
+                        <span></span>
+                        <b class="sound_only"><?php echo $list[$i]['subject'] ?></b>
+                    </label>
+                    
+                    <?php } ?>
+                    <span class="sound_only">
+                        <?php
+                        if ($wr_id == $list[$i]['wr_id'])
+                            echo "<span class=\"bo_current\">열람중</span>";
+                        else
+                            echo $list[$i]['num'];
+                         ?>
+                    </span>
                 </div>
                 <div class="gall_con">
-                    <div class="gall_img">
+                    <div class="gall_img" style="<?php if ($board['bo_gallery_height'] > 0) echo 'height:'.$board['bo_gallery_height'].'px;max-height:'.$board['bo_gallery_height'].'px'; ?>">
                         <a href="<?php echo $list[$i]['href'] ?>">
                         <?php
                         if ($list[$i]['is_notice']) { // 공지사항  ?>
-                            <span class="is_notice">공지</span>
+                            <span class="is_notice" style="<?php echo $line_height_style; ?>">공지</span>
                         <?php } else {
                             $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height'], false, true);
 
                             if($thumb['src']) {
                                 $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" >';
                             } else {
-                                $img_content = '<span class="no_image">no image</span>';
+                                $img_content = '<span class="no_image" style="'.$line_height_style.'">no image</span>';
                             }
 
                             echo run_replace('thumb_image_tag', $img_content, $thumb);
@@ -132,8 +133,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                         <a href="<?php echo $list[$i]['href'] ?>" class="bo_tit">
                             
                             <?php // echo $list[$i]['icon_reply']; ?>
-                        	<!-- 갤러리 댓글기능 사용시 주석을 제거하세요. -->
-                        
+                            <!-- 갤러리 댓글기능 사용시 주석을 제거하세요. -->
+
                             <?php echo $list[$i]['subject'] ?>                      
                             <?php
                             // if ($list[$i]['file']['count']) { echo '<'.$list[$i]['file']['count'].'>'; }
@@ -142,19 +143,19 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                             //if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
                             //if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
                             if (isset($list[$i]['icon_secret'])) echo rtrim($list[$i]['icon_secret']);
-							?>
-							<?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><span class="cnt_cmt"><?php echo $list[$i]['wr_comment']; ?></span><span class="sound_only">개</span><?php } ?>
+                            ?>
+                            <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><span class="cnt_cmt"><?php echo $list[$i]['wr_comment']; ?></span><span class="sound_only">개</span><?php } ?>
                          </a>
                          <span class="bo_cnt"><?php echo utf8_strcut(strip_tags($list[$i]['wr_content']), 68, '..'); ?></span>
                     </div>
 
                     <div class="gall_info">
-                    	<span class="sound_only">작성자 </span><?php echo $list[$i]['name'] ?>
+                        <span class="sound_only">작성자 </span><?php echo $list[$i]['name'] ?>
                         <span class="gall_date"><span class="sound_only">작성일 </span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
-                    	<span class="gall_view"><span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?></span>
+                        <span class="gall_view"><span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?></span>
                     </div>
                     <div class="gall_option">
-                    	<?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
+                      <?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
                         <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><strong><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?></strong><?php } ?>           
                     </div>
                 </div>
@@ -163,26 +164,26 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
         <?php if (count($list) == 0) { echo "<li class=\"empty_list\">게시물이 없습니다.</li>"; } ?>
     </ul>
-	
-	<!-- 페이지 -->
-	<?php echo $write_pages; ?>
-	<!-- 페이지 -->
-	
-	<?php if ($list_href || $is_checkbox || $write_href) { ?>
+
+    <!-- 페이지 -->
+    <?php echo $write_pages; ?>
+    <!-- 페이지 -->
+
+    <?php if ($list_href || $is_checkbox || $write_href) { ?>
     <div class="bo_fx">
         <?php if ($list_href || $write_href) { ?>
         <ul class="btn_bo_user">
-        	<?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
+            <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
             <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01 btn" title="RSS"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
             <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01 btn" title="글쓰기"><i class="fa fa-pencil" aria-hidden="true"></i><span class="sound_only">글쓰기</span></a></li><?php } ?>
-        </ul>	
+        </ul>   
         <?php } ?>
     </div>
     <?php } ?> 
     </form>
 
     <!-- 게시판 검색 시작 { -->
-    <div class="bo_sch_wrap">	
+    <div class="bo_sch_wrap">   
         <fieldset class="bo_sch">
             <h3>검색</h3>
             <form name="fsearch" method="get">
diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css
index e41dc44d1..763ee44d2 100644
--- a/theme/basic/skin/board/gallery/style.css
+++ b/theme/basic/skin/board/gallery/style.css
@@ -1,77 +1,5 @@
 @charset "utf-8";
 
-/* ### 기본 스타일 커스터마이징 시작 ### */
-
-/* 게시판 버튼 */
-/* 목록 버튼 */
-#bo_gall a.btn_b01 {}
-#bo_gall a.btn_b01:focus, #bo_gall a.btn_b01:hover {}
-#bo_gall a.btn_b02 {}
-#bo_gall a.btn_b02:focus, #bo_gall a.btn_b02:hover {}
-#bo_gall a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_gall a.btn_admin:focus, #bo_gall .btn_admin:hover {}
-
-/* 읽기 버튼 */
-#bo_v a.btn_b01 {}
-#bo_v a.btn_b01:focus, #bo_v a.btn_b01:hover {}
-#bo_v a.btn_b02 {}
-#bo_v a.btn_b02:focus, #bo_v a.btn_b02:hover {}
-#bo_v a.btn_admin {} /* 관리자 전용 버튼 */
-#bo_v a.btn_admin:focus, #bo_v a.btn_admin:hover {}
-
-/* 쓰기 버튼 */
-#bo_w .btn_confirm {} /* 서식단계 진행 */
-#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
-#bo_w button.btn_submit {}
-#bo_w fieldset .btn_submit {}
-#bo_w .btn_cancel {font-size:1.167em;border-radius:3px}
-#bo_w button.btn_cancel {}
-#bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {}
-#bo_w a.btn_frmline, #bo_w button.btn_frmline {} /* 우편번호검색버튼 등 */
-#bo_w button.btn_frmline {}
-
-/* 기본 테이블 */
-/* 읽기 내 테이블 */
-#bo_v .tbl_head01 {}
-#bo_v .tbl_head01 caption {}
-#bo_v .tbl_head01 thead th {}
-#bo_v .tbl_head01 thead a {}
-#bo_v .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-#bo_v .tbl_head01 tfoot th {}
-#bo_v .tbl_head01 tfoot td {}
-#bo_v .tbl_head01 tbody th {}
-#bo_v .tbl_head01 td {}
-#bo_v .tbl_head01 a {}
-#bo_v td.empty_table {}
-
-/* 쓰기 테이블 */
-#bo_w table {}
-#bo_w caption {}
-#bo_w .frm_info {}
-#bo_w .frm_address {}
-#bo_w .frm_file {}
-
-#bo_w .tbl_frm01 {}
-#bo_w .tbl_frm01 th {}
-#bo_w .tbl_frm01 td {}
-#bo_w .tbl_frm01 textarea, #bo_w tbl_frm01 .frm_input {}
-#bo_w .tbl_frm01 textarea {}
-#bo_w .tbl_frm01 a {}
-
-/* 필수입력 */
-#bo_w .required, #bo_w textarea.required {}
-
-#bo_w .cke_sc {}
-#bo_w button.btn_cke_sc {}
-#bo_w .cke_sc_def {}
-#bo_w .cke_sc_def dl {}
-#bo_w .cke_sc_def dl:after {}
-#bo_w .cke_sc_def dt, #bo_w .cke_sc_def dd {}
-#bo_w .cke_sc_def dt {}
-#bo_w .cke_sc_def dd {}
-
-/* ### 기본 스타일 커스터마이징 끝 ### */
-
 /* 게시판 목록 */
 #bo_cate {margin:25px 0}
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
@@ -124,10 +52,10 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_now .gall_text_href a {color:#ff3061}
 
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
-#bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden}
+#bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;overflow:hidden}
 #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block}
 #bo_gall .gall_img img, #bo_gall .gall_img video {max-width:100%;height:auto !important}
-#bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
+#bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
 
 #bo_gall .gall_text_href {margin:10px 0}
 #bo_gall .gall_text_href a {font-weight:bold}
@@ -442,4 +370,6 @@ box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1)}
 #bo_w .bo_w_flie .file_wr {position:relative;border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;height:40px;margin:0}
 #bo_w .bo_w_flie .frm_input {margin:10px 0 0}
 #bo_w .bo_w_flie .file_del {position:absolute;top:10px;right:10px;font-size:0.92em;color:#7d7d7d}
-#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
\ No newline at end of file
+#bo_w .bo_w_select select {border:1px solid #d0d3db;width:100%;height:40px;border-radius:3px}
+#bo_w .btn_submit {padding:0 20px;font-size:1.167em}
+#bo_w .btn_cancel {border-radius:3px;font-size:1.167em}
\ No newline at end of file
diff --git a/theme/basic/skin/board/gallery/view.skin.php b/theme/basic/skin/board/gallery/view.skin.php
index c5af84d3f..e94e3f08b 100644
--- a/theme/basic/skin/board/gallery/view.skin.php
+++ b/theme/basic/skin/board/gallery/view.skin.php
@@ -93,8 +93,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         if($v_img_count) {
             echo "<div id=\"bo_v_img\">\n";
 
-            for ($i=0; $i<=count($view['file']); $i++) {
-                echo get_file_thumbnail($view['file'][$i]);
+            foreach($view['file'] as $view_file) {
+                echo get_file_thumbnail($view_file);
             }
 
             echo "</div>\n";
@@ -161,7 +161,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
             <li>
                	<i class="fa fa-folder-open" aria-hidden="true"></i>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
                     <strong><?php echo $view['file'][$i]['source'] ?></strong> <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
                 </a>
                 <br>
diff --git a/theme/basic/skin/connect/basic/connect.skin.php b/theme/basic/skin/connect/basic/connect.skin.php
index 55849443c..b4623f038 100644
--- a/theme/basic/skin/connect/basic/connect.skin.php
+++ b/theme/basic/skin/connect/basic/connect.skin.php
@@ -6,4 +6,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 add_stylesheet('<link rel="stylesheet" href="'.$connect_skin_url.'/style.css">', 0);
 ?>
 
-<?php echo $row['total_cnt'] ?>
+<?php echo $row['total_cnt'];
\ No newline at end of file
diff --git a/theme/basic/skin/latest/basic/latest.skin.php b/theme/basic/skin/latest/basic/latest.skin.php
index 78b3fc128..d55f4556b 100644
--- a/theme/basic/skin/latest/basic/latest.skin.php
+++ b/theme/basic/skin/latest/basic/latest.skin.php
@@ -14,7 +14,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
@@ -28,7 +28,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             // if ($list[$i]['file']['count']) { echo "<{$list[$i]['file']['count']}>"; }
 
             echo $list[$i]['icon_reply']." ";
-           	if ($list[$i]['icon_file']) echo " <i class=\"fa fa-download\" aria-hidden=\"true\"></i>" ;
+           	if (isset($list[$i]['icon_file']) && $list[$i]['icon_file']) echo " <i class=\"fa fa-download\" aria-hidden=\"true\"></i>" ;
             if ($list[$i]['icon_link']) echo " <i class=\"fa fa-link\" aria-hidden=\"true\"></i>" ;
 
             if ($list[$i]['comment_cnt'])  echo "
diff --git a/theme/basic/skin/latest/notice/latest.skin.php b/theme/basic/skin/latest/notice/latest.skin.php
index c59f74c6a..a59e0fb48 100644
--- a/theme/basic/skin/latest/notice/latest.skin.php
+++ b/theme/basic/skin/latest/notice/latest.skin.php
@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/theme/basic/skin/latest/pic_block/latest.skin.php b/theme/basic/skin/latest/pic_block/latest.skin.php
index 2682480e0..43248a2a2 100644
--- a/theme/basic/skin/latest/pic_block/latest.skin.php
+++ b/theme/basic/skin/latest/pic_block/latest.skin.php
@@ -23,13 +23,14 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         $thumb['alt'] = '이미지가 없습니다.';
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+    $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
     ?>
         <li class="galley_li">
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
+            <a href="<?php echo $wr_href; ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".$wr_href."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/theme/basic/skin/latest/pic_list/latest.skin.php b/theme/basic/skin/latest/pic_list/latest.skin.php
index 50ad31951..fc4ab8f47 100644
--- a/theme/basic/skin/latest/pic_list/latest.skin.php
+++ b/theme/basic/skin/latest/pic_list/latest.skin.php
@@ -16,18 +16,20 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
     for ($i=0; $i<$list_count; $i++) {
         
         $img_link_html = '';
+
+        $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
         
         if( $i === 0 ) {
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
-            if($thumb['src']) {
+            if(isset($thumb['src']) && $thumb['src']) {
                 $img = $thumb['src'];
             } else {
                 $img = G5_IMG_URL.'/no_img.png';
                 $thumb['alt'] = '이미지가 없습니다.';
             }
             $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
-            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
+            $img_link_html = '<a href="'.$wr_href.'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
         }
     ?>
         <li>
@@ -35,7 +37,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
  
-            echo "<a href=\"".$list[$i]['href']."\" class=\"pic_li_tit\"> ";
+            echo "<a href=\"".$wr_href."\" class=\"pic_li_tit\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else
diff --git a/theme/basic/skin/member/basic/login_check.skin.php b/theme/basic/skin/member/basic/login_check.skin.php
index 1b182915e..aea2ee5aa 100644
--- a/theme/basic/skin/member/basic/login_check.skin.php
+++ b/theme/basic/skin/member/basic/login_check.skin.php
@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
 
-// 자신만의 코드를 넣어주세요.
-?>
+// 자신만의 코드를 넣어주세요.
\ No newline at end of file
diff --git a/theme/basic/skin/member/basic/point.skin.php b/theme/basic/skin/member/basic/point.skin.php
index b0177dbb7..765441d8b 100644
--- a/theme/basic/skin/member/basic/point.skin.php
+++ b/theme/basic/skin/member/basic/point.skin.php
@@ -19,12 +19,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
 
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_li">자료가 없습니다.</li>';
diff --git a/theme/basic/skin/member/basic/register_form.skin.php b/theme/basic/skin/member/basic/register_form.skin.php
index cbd17aed0..d60d8c8f7 100644
--- a/theme/basic/skin/member/basic/register_form.skin.php
+++ b/theme/basic/skin/member/basic/register_form.skin.php
@@ -188,7 +188,7 @@ gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_
 	                <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
 	                <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
 	                <input type="checkbox" name="del_mb_icon" value="1" id="del_mb_icon">
-	                <label for="del_mb_icon">삭제</label>
+	                <label for="del_mb_icon" class="inline">삭제</label>
 	                <?php }  ?>
 	            
 	            </li>
@@ -207,7 +207,7 @@ gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_
 	                <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
 	                <img src="<?php echo $mb_img_url ?>" alt="회원이미지">
 	                <input type="checkbox" name="del_mb_img" value="1" id="del_mb_img">
-	                <label for="del_mb_img">삭제</label>
+	                <label for="del_mb_img" class="inline">삭제</label>
 	                <?php }  ?>
 	            
 	            </li>
diff --git a/theme/basic/skin/member/basic/style.css b/theme/basic/skin/member/basic/style.css
index e297c9b96..3574d7009 100644
--- a/theme/basic/skin/member/basic/style.css
+++ b/theme/basic/skin/member/basic/style.css
@@ -131,6 +131,7 @@
 .register_form_inner {background:#f7f7f7;border:1px solid #dde7e9;border-radius:3px}
 .register_form_inner ul {padding:20px}
 .register_form_inner label {display:block;margin-bottom:10px;line-height:24px}
+.register_form_inner label.inline {display:inline}
 
 #fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center}
 #fregisterform .frm_address {margin:5px 0 0}
diff --git a/theme/basic/skin/popular/basic/popular.skin.php b/theme/basic/skin/popular/basic/popular.skin.php
index 888fe7a0e..353d53302 100644
--- a/theme/basic/skin/popular/basic/popular.skin.php
+++ b/theme/basic/skin/popular/basic/popular.skin.php
@@ -29,7 +29,7 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/owlcarousel/owl.carou
     </div>
 </section>
 
-<?php if ($list && is_array($list)) { //게시물이 있다면 ?>
+<?php if (isset($list) && $list && is_array($list)) { //게시물이 있다면 ?>
 <script>
 jQuery(function($){
     
diff --git a/theme/basic/skin/qa/basic/list.skin.php b/theme/basic/skin/qa/basic/list.skin.php
index d32852783..56df884ee 100644
--- a/theme/basic/skin/qa/basic/list.skin.php
+++ b/theme/basic/skin/qa/basic/list.skin.php
@@ -72,6 +72,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <input type="hidden" name="stx" value="<?php echo $stx; ?>">
     <input type="hidden" name="sca" value="<?php echo $sca; ?>">
     <input type="hidden" name="page" value="<?php echo $page; ?>">
+    <input type="hidden" name="token" value="<?php echo get_text($token); ?>">
             
     <div class="tbl_head01 tbl_wrap">
         <table>
diff --git a/theme/basic/skin/qa/basic/view.answerform.skin.php b/theme/basic/skin/qa/basic/view.answerform.skin.php
index 801fea899..b1d0b459b 100644
--- a/theme/basic/skin/qa/basic/view.answerform.skin.php
+++ b/theme/basic/skin/qa/basic/view.answerform.skin.php
@@ -15,6 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx; ?>">
     <input type="hidden" name="page" value="<?php echo $page; ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -106,6 +107,23 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
             return false;
         }
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/theme/basic/skin/qa/basic/write.skin.php b/theme/basic/skin/qa/basic/write.skin.php
index d1feabb29..9f587c086 100644
--- a/theme/basic/skin/qa/basic/write.skin.php
+++ b/theme/basic/skin/qa/basic/write.skin.php
@@ -14,6 +14,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
+    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php
     $option = '';
     $option_hidden = '';
@@ -166,6 +167,25 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
         }
         <?php } ?>
 
+        $.ajax({
+            type: "POST",
+            url: g5_bbs_url+"/ajax.write.token.php",
+            data: { 'token_case' : 'qa_write' },
+            cache: false,
+            async: false,
+            dataType: "json",
+            success: function(data) {
+                if (typeof data.token !== "undefined") {
+                    token = data.token;
+
+                    if(typeof f.token === "undefined")
+                        $(f).prepend('<input type="hidden" name="token" value="">');
+
+                    $(f).find("input[name=token]").val(token);
+                }
+            }
+        });
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/theme/basic/skin/search/basic/search.skin.php b/theme/basic/skin/search/basic/search.skin.php
index ceddef9cc..9ffcff08a 100644
--- a/theme/basic/skin/search/basic/search.skin.php
+++ b/theme/basic/skin/search/basic/search.skin.php
@@ -15,11 +15,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
 
     <label for="sfl" class="sound_only">검색조건</label>
     <select name="sfl" id="sfl">
-        <option value="wr_subject||wr_content"<?php echo get_selected($_GET['sfl'], "wr_subject||wr_content") ?>>제목+내용</option>
-        <option value="wr_subject"<?php echo get_selected($_GET['sfl'], "wr_subject") ?>>제목</option>
-        <option value="wr_content"<?php echo get_selected($_GET['sfl'], "wr_content") ?>>내용</option>
-        <option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id") ?>>회원아이디</option>
-        <option value="wr_name"<?php echo get_selected($_GET['sfl'], "wr_name") ?>>이름</option>
+        <option value="wr_subject||wr_content"<?php echo get_selected($sfl, "wr_subject||wr_content") ?>>제목+내용</option>
+        <option value="wr_subject"<?php echo get_selected($sfl, "wr_subject") ?>>제목</option>
+        <option value="wr_content"<?php echo get_selected($sfl, "wr_content") ?>>내용</option>
+        <option value="mb_id"<?php echo get_selected($sfl, "mb_id") ?>>회원아이디</option>
+        <option value="wr_name"<?php echo get_selected($sfl, "wr_name") ?>>이름</option>
     </select>
 
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
diff --git a/theme/basic/tail.php b/theme/basic/tail.php
index fca030de7..78336991c 100644
--- a/theme/basic/tail.php
+++ b/theme/basic/tail.php
@@ -87,5 +87,4 @@ $(function() {
 </script>
 
 <?php
-include_once(G5_THEME_PATH."/tail.sub.php");
-?>
\ No newline at end of file
+include_once(G5_THEME_PATH."/tail.sub.php");
\ No newline at end of file
diff --git a/theme/basic/tail.sub.php b/theme/basic/tail.sub.php
index 1c25b33cd..513656f17 100644
--- a/theme/basic/tail.sub.php
+++ b/theme/basic/tail.sub.php
@@ -24,4 +24,4 @@ $(function() {
 
 </body>
 </html>
-<?php echo html_end(); // HTML 마지막 처리 함수 : 반드시 넣어주시기 바랍니다. ?>
\ No newline at end of file
+<?php echo html_end(); // HTML 마지막 처리 함수 : 반드시 넣어주시기 바랍니다.
\ No newline at end of file
diff --git a/theme/basic/theme.config.php b/theme/basic/theme.config.php
index e73a9894e..866b812a0 100644
--- a/theme/basic/theme.config.php
+++ b/theme/basic/theme.config.php
@@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // 테마가 지원하는 장치 설정 pc, mobile
 // 선언하지 않거나 값을 지정하지 않으면 그누보드5의 설정을 따른다.
 // G5_SET_DEVICE 상수 설정 보다 우선 적용됨
-define('G5_THEME_DEVICE', '');
+if(! defined('G5_THEME_DEVICE')) define('G5_THEME_DEVICE', '');
 
 $theme_config = array();
 
@@ -34,5 +34,4 @@ $theme_config = array(
     'bo_image_width'            => 600,     // 게시판 뷰 이미지 폭
     'qa_skin'                   => 'basic', // 1:1문의 스킨
     'qa_mobile_skin'            => 'basic'  // 1:1문의 모바일 스킨
-);
-?>
\ No newline at end of file
+);
\ No newline at end of file