[Issue#157]: little refactoring
Merge branch 'develop' of github.com:chocoteam/choco3 into feature-table
Merge branch 'feature-table' into develop