TPC 08 - 2014-04-03
Code refactoring
TPC 08 - 2014-04-03
Performance improving