Refactoring; Added properties
Merge branch 'table-mix' of https://github.com/Munken/DPC13Marcher into table-mix