[Issue#157]: little refactoring
Merge branch 'feature-table' into develop