Iteration 2.
Rafactoring.
Merge branch 'master' of https://github.com/szczepiq/cbe