Merge branch 'array-to-table'
Merged ZenGarden/master and resolved conflicts

Conflicts:
src/PdFileParser.cpp
merge
Merge branch 'Kyew-master'